Skip to contentSkip to conversation

stmmac: updating the driver to the Dec 2011 version and add the PCI support

PATCH Applied Giuseppe CAVALLARO 2 participants 7 messages Dec 21, 2011

Subsystems (5)
Networking Network drivers Documentation Arm STM32 +1 more subsystems
lore
Share & tools
lore

Giuseppe CAVALLARO

author
#0 lore raw

Hello.

This patches update the stmmac device driver to the latest version (Dec 2011) adding the experimental PCI support - thanks to the effort on developing and testing done by Rayagond Kokatanur.

I'm sending the patches for both net and net-next repositories.

In the next updates, I hope in January, I will send the EEE and PTP support (always thanks to Rayagond contribution).

In the end, the driver's documentation has been updated too.

Best Regards
Peppe

author
#1 lore raw

PATCH 1/2 stmmac: add the experimental PCI support

This patch adds the PCI support (as EXPERIMENTAL) this has been also tested on XLINX XC2V3000 FF1152AMT0221 D1215994A VIRTEX FPGA board.
To support the PCI bus the main part has been reworked and both the platform and the PCI specific parts have been moved into different files.

Signed-off-by Rayagond Kokatanur <[email protected]>
Signed-off-by Giuseppe Cavallaro <[email protected]>
---
 drivers/net/ethernet/stmicro/stmmac/Kconfig        |   27 ++-
 drivers/net/ethernet/stmicro/stmmac/Makefile       |    2 +
 drivers/net/ethernet/stmicro/stmmac/common.h       |    7 +
 drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c    |   13 +
 drivers/net/ethernet/stmicro/stmmac/stmmac.h       |   13 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  440 ++++++--------------
 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c  |    3 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c   |  221 ++++++++++
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |  217 ++++++++++
 9 files changed, 631 insertions(+), 312 deletions(-)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
drivers/net/ethernet/stmicro/stmmac/Kconfig +26 -1
index 22745d7..0364283 100644
@@ -12,11 +12,36 @@ config STMMAC_ETH
 
 if STMMAC_ETH
 
+config STMMAC_PLATFORM
+	tristate "STMMAC platform bus support"
+	depends on STMMAC_ETH
+	default y
+	---help---
+	  This selects the platform specific bus support for
+	  the stmmac device driver. This is the driver used
+	  on many embedded STM platforms based on ARM and SuperH
+	  processors.
+	  If you have a controller with this interface, say Y or M here.
+
+	  If unsure, say N.
+
+config STMMAC_PCI
+	tristate "STMMAC support on PCI bus (EXPERIMENTAL)"
+	depends on STMMAC_ETH && PCI && EXPERIMENTAL
+	---help---
+	  This is to select the Synopsys DWMAC available on PCI devices,
+	  if you have a controller with this interface, say Y or M here.
+
+	  This PCI support is tested on XLINX XC2V3000 FF1152AMT0221
+	  D1215994A VIRTEX FPGA board.
+
+	  If unsure, say N.
+
 config STMMAC_DEBUG_FS
 	bool "Enable monitoring via sysFS "
 	default n
 	depends on STMMAC_ETH && DEBUG_FS
-	-- help
+	---help---
 	  The stmmac entry in /sys reports DMA TX/RX rings
 	  or (if supported) the HW cap register.
drivers/net/ethernet/stmicro/stmmac/Makefile +2 -0
index d7c4516..bc965ac 100644
@@ -2,6 +2,8 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac.o
 stmmac-$(CONFIG_STMMAC_TIMER) += stmmac_timer.o
 stmmac-$(CONFIG_STMMAC_RING) += ring_mode.o
 stmmac-$(CONFIG_STMMAC_CHAINED) += chain_mode.o
+stmmac-$(CONFIG_STMMAC_PLATFORM) += stmmac_platform.o
+stmmac-$(CONFIG_STMMAC_PCI) += stmmac_pci.o
 stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o	\
 	      dwmac_lib.o dwmac1000_core.o  dwmac1000_dma.o	\
 	      dwmac100_core.o dwmac100_dma.o enh_desc.o  norm_desc.o \
drivers/net/ethernet/stmicro/stmmac/common.h +7 -0
index 2cc1192..d0b814e 100644
@@ -22,7 +22,11 @@
   Author: Giuseppe Cavallaro <[email protected]>
 *******************************************************************************/
 
+#include <linux/etherdevice.h>
 #include <linux/netdevice.h>
+#include <linux/phy.h>
+#include <linux/module.h>
+#include <linux/init.h>
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define STMMAC_VLAN_TAG_USED
 #include <linux/if_vlan.h>

@@ -315,5 +319,8 @@ extern void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6],
 				unsigned int high, unsigned int low);
 extern void stmmac_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,
 				unsigned int high, unsigned int low);
+
+extern void stmmac_set_mac(void __iomem *ioaddr, bool enable);
+
 extern void dwmac_dma_flush_tx_fifo(void __iomem *ioaddr);
 extern const struct stmmac_ring_mode_ops ring_mode_ops;
drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +13 -0
index e250935..f20aa12 100644
@@ -238,6 +238,19 @@ void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6],
 	writel(data, ioaddr + low);
 }
 
+/* Enable disable MAC RX/TX */
+void stmmac_set_mac(void __iomem *ioaddr, bool enable)
+{
+	u32 value = readl(ioaddr + MAC_CTRL_REG);
+
+	if (enable)
+		value |= MAC_RNABLE_RX | MAC_ENABLE_TX;
+	else
+		value &= ~(MAC_ENABLE_TX | MAC_RNABLE_RX);
+
+	writel(value, ioaddr + MAC_CTRL_REG);
+}
+
 void stmmac_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,
 			 unsigned int high, unsigned int low)
 {
drivers/net/ethernet/stmicro/stmmac/stmmac.h +12 -1
index a140a8f..1207400 100644
@@ -20,7 +20,8 @@
   Author: Giuseppe Cavallaro <[email protected]>
 *******************************************************************************/
 
-#define DRV_MODULE_VERSION	"Oct_2011"
+#define STMMAC_RESOURCE_NAME   "stmmaceth"
+#define DRV_MODULE_VERSION	"Dec_2011"
 #include <linux/stmmac.h>
 #include <linux/phy.h>
 #include "common.h"

@@ -82,8 +83,18 @@ struct stmmac_priv {
 	int hw_cap_support;
 };
 
+extern int phyaddr;
+
 extern int stmmac_mdio_unregister(struct net_device *ndev);
 extern int stmmac_mdio_register(struct net_device *ndev);
 extern void stmmac_set_ethtool_ops(struct net_device *netdev);
 extern const struct stmmac_desc_ops enh_desc_ops;
 extern const struct stmmac_desc_ops ndesc_ops;
+
+int stmmac_freeze(struct net_device *ndev);
+int stmmac_restore(struct net_device *ndev);
+int stmmac_resume(struct net_device *ndev);
+int stmmac_suspend(struct net_device *ndev);
+int stmmac_dvr_remove(struct net_device *ndev);
+struct stmmac_priv *stmmac_dvr_probe(struct device *device,
+				struct plat_stmmacenet_data *plat_dat);
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +131 -309

609 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +2 -1
index 9c3b9d5..51f4412 100644
@@ -109,6 +109,7 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
  */
 static int stmmac_mdio_reset(struct mii_bus *bus)
 {
+#if defined(CONFIG_STMMAC_PLATFORM)
 	struct net_device *ndev = bus->priv;
 	struct stmmac_priv *priv = netdev_priv(ndev);
 	unsigned int mii_address = priv->hw->mii.addr;

@@ -123,7 +124,7 @@ static int stmmac_mdio_reset(struct mii_bus *bus)
 	 * on MDC, so perform a dummy mdio read.
 	 */
 	writel(0, priv->ioaddr + mii_address);
-
+#endif
 	return 0;
 }
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c new file +221 -0

221 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c new file +217 -0

217 lines not on this page · raw message

Signature · 1 line
1.7.4.4
author
#2 lore raw

PATCH 1/2 stmmac: add the experimental PCI support

This patch adds the PCI support (as EXPERIMENTAL) this has been also tested on XLINX XC2V3000 FF1152AMT0221 D1215994A VIRTEX FPGA board.
To support the PCI bus the main part has been reworked and both the platform and the PCI specific parts have been moved into different files.

Signed-off-by Rayagond Kokatanur <[email protected]>
Signed-off-by Giuseppe Cavallaro <[email protected]>
---
 drivers/net/ethernet/stmicro/stmmac/Kconfig        |   27 ++-
 drivers/net/ethernet/stmicro/stmmac/Makefile       |    2 +
 drivers/net/ethernet/stmicro/stmmac/common.h       |    7 +
 drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c    |   13 +
 drivers/net/ethernet/stmicro/stmmac/stmmac.h       |   13 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  418 ++++++--------------
 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c  |    3 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c   |  221 +++++++++++
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |  198 +++++++++
 9 files changed, 612 insertions(+), 290 deletions(-)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
drivers/net/ethernet/stmicro/stmmac/Kconfig +26 -1
index 22745d7..0364283 100644
@@ -12,11 +12,36 @@ config STMMAC_ETH
 
 if STMMAC_ETH
 
+config STMMAC_PLATFORM
+	tristate "STMMAC platform bus support"
+	depends on STMMAC_ETH
+	default y
+	---help---
+	  This selects the platform specific bus support for
+	  the stmmac device driver. This is the driver used
+	  on many embedded STM platforms based on ARM and SuperH
+	  processors.
+	  If you have a controller with this interface, say Y or M here.
+
+	  If unsure, say N.
+
+config STMMAC_PCI
+	tristate "STMMAC support on PCI bus (EXPERIMENTAL)"
+	depends on STMMAC_ETH && PCI && EXPERIMENTAL
+	---help---
+	  This is to select the Synopsys DWMAC available on PCI devices,
+	  if you have a controller with this interface, say Y or M here.
+
+	  This PCI support is tested on XLINX XC2V3000 FF1152AMT0221
+	  D1215994A VIRTEX FPGA board.
+
+	  If unsure, say N.
+
 config STMMAC_DEBUG_FS
 	bool "Enable monitoring via sysFS "
 	default n
 	depends on STMMAC_ETH && DEBUG_FS
-	-- help
+	---help---
 	  The stmmac entry in /sys reports DMA TX/RX rings
 	  or (if supported) the HW cap register.
drivers/net/ethernet/stmicro/stmmac/Makefile +2 -0
index d7c4516..bc965ac 100644
@@ -2,6 +2,8 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac.o
 stmmac-$(CONFIG_STMMAC_TIMER) += stmmac_timer.o
 stmmac-$(CONFIG_STMMAC_RING) += ring_mode.o
 stmmac-$(CONFIG_STMMAC_CHAINED) += chain_mode.o
+stmmac-$(CONFIG_STMMAC_PLATFORM) += stmmac_platform.o
+stmmac-$(CONFIG_STMMAC_PCI) += stmmac_pci.o
 stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o	\
 	      dwmac_lib.o dwmac1000_core.o  dwmac1000_dma.o	\
 	      dwmac100_core.o dwmac100_dma.o enh_desc.o  norm_desc.o \
drivers/net/ethernet/stmicro/stmmac/common.h +7 -0
index 2cc1192..d0b814e 100644
@@ -22,7 +22,11 @@
   Author: Giuseppe Cavallaro <[email protected]>
 *******************************************************************************/
 
+#include <linux/etherdevice.h>
 #include <linux/netdevice.h>
+#include <linux/phy.h>
+#include <linux/module.h>
+#include <linux/init.h>
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define STMMAC_VLAN_TAG_USED
 #include <linux/if_vlan.h>

@@ -315,5 +319,8 @@ extern void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6],
 				unsigned int high, unsigned int low);
 extern void stmmac_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,
 				unsigned int high, unsigned int low);
+
+extern void stmmac_set_mac(void __iomem *ioaddr, bool enable);
+
 extern void dwmac_dma_flush_tx_fifo(void __iomem *ioaddr);
 extern const struct stmmac_ring_mode_ops ring_mode_ops;
drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +13 -0
index e250935..f20aa12 100644
@@ -238,6 +238,19 @@ void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6],
 	writel(data, ioaddr + low);
 }
 
+/* Enable disable MAC RX/TX */
+void stmmac_set_mac(void __iomem *ioaddr, bool enable)
+{
+	u32 value = readl(ioaddr + MAC_CTRL_REG);
+
+	if (enable)
+		value |= MAC_RNABLE_RX | MAC_ENABLE_TX;
+	else
+		value &= ~(MAC_ENABLE_TX | MAC_RNABLE_RX);
+
+	writel(value, ioaddr + MAC_CTRL_REG);
+}
+
 void stmmac_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,
 			 unsigned int high, unsigned int low)
 {
drivers/net/ethernet/stmicro/stmmac/stmmac.h +12 -1
index a140a8f..1207400 100644
@@ -20,7 +20,8 @@
   Author: Giuseppe Cavallaro <[email protected]>
 *******************************************************************************/
 
-#define DRV_MODULE_VERSION	"Oct_2011"
+#define STMMAC_RESOURCE_NAME   "stmmaceth"
+#define DRV_MODULE_VERSION	"Dec_2011"
 #include <linux/stmmac.h>
 #include <linux/phy.h>
 #include "common.h"

@@ -82,8 +83,18 @@ struct stmmac_priv {
 	int hw_cap_support;
 };
 
+extern int phyaddr;
+
 extern int stmmac_mdio_unregister(struct net_device *ndev);
 extern int stmmac_mdio_register(struct net_device *ndev);
 extern void stmmac_set_ethtool_ops(struct net_device *netdev);
 extern const struct stmmac_desc_ops enh_desc_ops;
 extern const struct stmmac_desc_ops ndesc_ops;
+
+int stmmac_freeze(struct net_device *ndev);
+int stmmac_restore(struct net_device *ndev);
+int stmmac_resume(struct net_device *ndev);
+int stmmac_suspend(struct net_device *ndev);
+int stmmac_dvr_remove(struct net_device *ndev);
+struct stmmac_priv *stmmac_dvr_probe(struct device *device,
+				struct plat_stmmacenet_data *plat_dat);
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +131 -287

587 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +2 -1
index 9c3b9d5..51f4412 100644
@@ -109,6 +109,7 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
  */
 static int stmmac_mdio_reset(struct mii_bus *bus)
 {
+#if defined(CONFIG_STMMAC_PLATFORM)
 	struct net_device *ndev = bus->priv;
 	struct stmmac_priv *priv = netdev_priv(ndev);
 	unsigned int mii_address = priv->hw->mii.addr;

@@ -123,7 +124,7 @@ static int stmmac_mdio_reset(struct mii_bus *bus)
 	 * on MDC, so perform a dummy mdio read.
 	 */
 	writel(0, priv->ioaddr + mii_address);
-
+#endif
 	return 0;
 }
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c new file +221 -0

221 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c new file +198 -0

198 lines not on this page · raw message

Signature · 1 line
1.7.4.4
maintainer Applied
#3 lore raw

Re: [net-next 1/2] stmmac: add the experimental PCI support

From: Giuseppe CAVALLARO <[email protected]>
Date: Wed, 21 Dec 2011 14:58:19 +0100

Quoted 9 lines

This patch adds the PCI support (as EXPERIMENTAL) this has been also tested on XLINX XC2V3000 FF1152AMT0221 D1215994A VIRTEX FPGA board.
To support the PCI bus the main part has been reworked and both the platform and the PCI specific parts have been moved into different files.

Signed-off-by Rayagond Kokatanur <[email protected]>
Signed-off-by Giuseppe Cavallaro <[email protected]>

Applied.

author
#4 lore raw

PATCH 2/2 stmmac: update the driver's documentation (Dec-2011)

In reply to Giuseppe CAVALLARO
Signed-off-by Giuseppe Cavallaro <[email protected]>
---
 Documentation/networking/stmmac.txt |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
Documentation/networking/stmmac.txt +9 -7
index 8d67980..d0aeead 100644
@@ -4,14 +4,16 @@ Copyright (C) 2007-2010  STMicroelectronics Ltd
 Author: Giuseppe Cavallaro <[email protected]>
 
 This is the driver for the MAC 10/100/1000 on-chip Ethernet controllers
-(Synopsys IP blocks); it has been fully tested on STLinux platforms.
+(Synopsys IP blocks).
 
 Currently this network device driver is for all STM embedded MAC/GMAC
-(i.e. 7xxx/5xxx SoCs) and it's known working on other platforms i.e. ARM SPEAr.
+(i.e. 7xxx/5xxx SoCs), SPEAr (arm), Loongson1B (mips) and XLINX XC2V3000
+FF1152AMT0221 D1215994A VIRTEX FPGA board.
 
-DWC Ether MAC 10/100/1000 Universal version 3.41a and DWC Ether MAC 10/100
-Universal version 4.0 have been used for developing the first code
-implementation.
+DWC Ether MAC 10/100/1000 Universal version 3.60a (and older) and DWC Ether MAC 10/100
+Universal version 4.0 have been used for developing this driver.
+
+This driver supports both the platform bus and PCI.
 
 Please, for more information also visit: www.stlinux.com
 

@@ -277,5 +279,5 @@ In fact, these can generate an huge amount of debug messages.
 
 6) TODO:
  o XGMAC is not supported.
- o Review the timer optimisation code to use an embedded device that will be
-  available in new chip generations.
+ o Add the EEE - Energy Efficient Ethernet
+ o Add the PTP - precision time protocol
Signature · 1 line
1.7.4.4
author
#5 lore raw

PATCH 2/2 stmmac: update the driver's documentation (Dec-2011)

In reply to Giuseppe CAVALLARO
Signed-off-by Giuseppe Cavallaro <[email protected]>
---
 Documentation/networking/stmmac.txt |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
Documentation/networking/stmmac.txt +9 -7
index 8d67980..d0aeead 100644
@@ -4,14 +4,16 @@ Copyright (C) 2007-2010  STMicroelectronics Ltd
 Author: Giuseppe Cavallaro <[email protected]>
 
 This is the driver for the MAC 10/100/1000 on-chip Ethernet controllers
-(Synopsys IP blocks); it has been fully tested on STLinux platforms.
+(Synopsys IP blocks).
 
 Currently this network device driver is for all STM embedded MAC/GMAC
-(i.e. 7xxx/5xxx SoCs) and it's known working on other platforms i.e. ARM SPEAr.
+(i.e. 7xxx/5xxx SoCs), SPEAr (arm), Loongson1B (mips) and XLINX XC2V3000
+FF1152AMT0221 D1215994A VIRTEX FPGA board.
 
-DWC Ether MAC 10/100/1000 Universal version 3.41a and DWC Ether MAC 10/100
-Universal version 4.0 have been used for developing the first code
-implementation.
+DWC Ether MAC 10/100/1000 Universal version 3.60a (and older) and DWC Ether MAC 10/100
+Universal version 4.0 have been used for developing this driver.
+
+This driver supports both the platform bus and PCI.
 
 Please, for more information also visit: www.stlinux.com
 

@@ -277,5 +279,5 @@ In fact, these can generate an huge amount of debug messages.
 
 6) TODO:
  o XGMAC is not supported.
- o Review the timer optimisation code to use an embedded device that will be
-  available in new chip generations.
+ o Add the EEE - Energy Efficient Ethernet
+ o Add the PTP - precision time protocol
Signature · 1 line
1.7.4.4