net: eth: altera: tse: Add PTP and mSGDMA prefetcher
v5 cover net: eth: altera: tse: Add PTP and mSGDMA prefetcher
From: Joyce Ooi <[email protected]>
This patch series cleans up the Altera TSE driver and adds support for the newer msgdma prefetcher as well as ptp support when using the msgdma prefetcher.
v2: Rename altera_ptp to intel_fpga_tod, modify msgdma and sgdma tx_buffer
functions to be of type netdev_tx_t, and minor suggested edits
v3: Modify tx_buffer to stop queue before returning NETDEV_TX_BUSY
v4: Fix build warnings
v5: Rename 'ptp_enable' variable to 'has_ptp' and initialize hardware clock
to 0 in intel_fpga_tod, and make minor suggested changes
Dalon Westergreen (10):
net: eth: altera: tse_start_xmit ignores tx_buffer call response
net: eth: altera: set rx and tx ring size before init_dma call
net: eth: altera: fix altera_dmaops declaration
net: eth: altera: add optional function to start tx dma
net: eth: altera: Move common functions to altera_utils
net: eth: altera: Add missing identifier names to function
declarations
net: eth: altera: change tx functions to type netdev_tx_t
net: eth: altera: add support for ptp and timestamping
net: eth: altera: add msgdma prefetcher
net: eth: altera: update devicetree bindings documentation
.../devicetree/bindings/net/altera_tse.txt | 103 ++++- drivers/net/ethernet/altera/Kconfig | 1 + drivers/net/ethernet/altera/Makefile | 3 +- drivers/net/ethernet/altera/altera_msgdma.c | 5 +- drivers/net/ethernet/altera/altera_msgdma.h | 30 +- .../net/ethernet/altera/altera_msgdma_prefetcher.c | 431 +++++++++++++++++++++ .../net/ethernet/altera/altera_msgdma_prefetcher.h | 30 ++ .../ethernet/altera/altera_msgdmahw_prefetcher.h | 87 +++++ drivers/net/ethernet/altera/altera_sgdma.c | 22 +- drivers/net/ethernet/altera/altera_sgdma.h | 32 +- drivers/net/ethernet/altera/altera_tse.h | 98 ++--- drivers/net/ethernet/altera/altera_tse_ethtool.c | 30 ++ drivers/net/ethernet/altera/altera_tse_main.c | 203 ++++++++-- drivers/net/ethernet/altera/altera_utils.c | 29 ++ drivers/net/ethernet/altera/altera_utils.h | 51 +++ drivers/net/ethernet/altera/intel_fpga_tod.c | 341 ++++++++++++++++ drivers/net/ethernet/altera/intel_fpga_tod.h | 56 +++ 17 files changed, 1399 insertions(+), 153 deletions(-) create mode 100644 drivers/net/ethernet/altera/altera_msgdma_prefetcher.c create mode 100644 drivers/net/ethernet/altera/altera_msgdma_prefetcher.h create mode 100644 drivers/net/ethernet/altera/altera_msgdmahw_prefetcher.h create mode 100644 drivers/net/ethernet/altera/intel_fpga_tod.c create mode 100644 drivers/net/ethernet/altera/intel_fpga_tod.h
Signature · 1 line
2.13.0
PATCH v5 1/10 net: eth: altera: tse_start_xmit ignores tx_buffer call response
From: Dalon Westergreen <[email protected]>
The return from tx_buffer call in tse_start_xmit is inapropriately ignored. tse_buffer calls should return 0 for success or NETDEV_TX_BUSY. tse_start_xmit should return not report a successful transmit when the tse_buffer call returns an error condition.
In addition to the above, the msgdma and sgdma do not return the same value on success or failure. The sgdma_tx_buffer returned 0 on failure and a positive number of transmitted packets on success. Given that it only ever sends 1 packet, this made no sense. The msgdma implementation msgdma_tx_buffer returns 0 on success.
-> Don't ignore the return from tse_buffer calls -> Fix sgdma tse_buffer call to return 0 on success
and NETDEV_TX_BUSY on failure.
---
v2: no change
v3: queue is stopped before returning NETDEV_TX_BUSY
v4: no change
v5: no change
--- drivers/net/ethernet/altera/altera_sgdma.c | 19 ++++++++++++------- drivers/net/ethernet/altera/altera_tse_main.c | 4 +++- 2 files changed, 15 insertions(+), 8 deletions(-)
drivers/net/ethernet/altera/altera_sgdma.c +12 -7
@@ -4,6 +4,7 @@*/ #include <linux/list.h> +#include <linux/netdevice.h> #include "altera_utils.h" #include "altera_tse.h" #include "altera_sgdmahw.h"
@@ -159,10 +160,11 @@ void sgdma_clear_txirq(struct altera_tse_private *priv) SGDMA_CTRLREG_CLRINT); } -/* transmits buffer through SGDMA. Returns number of buffers -* transmitted, 0 if not possible. -* -* tx_lock is held by the caller +/* transmits buffer through SGDMA. +* original behavior returned the number of transmitted packets (always 1) & +* returned 0 on error. This differs from the msgdma. the calling function +* will now actually look at the code, so from now, 0 is good and return +* NETDEV_TX_BUSY when busy. */ int sgdma_tx_buffer (struct altera_tse_private *priv,struct tse_buffer *buffer) {
@@ -173,8 +175,11 @@ int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)struct sgdma_descrip __iomem *ndesc = &descbase[1 ];/* wait 'til the tx sgdma is ready for the next transmit request */ -if (sgdma_txbusy (priv)) -return 0 ; +if (sgdma_txbusy (priv)) { +if (!netif_queue_stopped (priv->dev)) +netif_stop_queue (priv->dev); +return NETDEV_TX_BUSY ; + } sgdma_setup_descrip(cdesc, /* current descriptor */ ndesc, /* next descriptor */
@@ -191,7 +196,7 @@ int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)/* enqueue the request to the pending transmit queue */ queue_tx (priv, buffer); -return 1 ; +return 0 ; }
drivers/net/ethernet/altera/altera_tse_main.c +3 -1
@@ -595,7 +595,9 @@ static netdev_tx_t tse_start_xmit(struct sk_buff *skb, struct net_device *dev) buffer->dma_addr = dma_addr; buffer->len = nopaged_len; - priv->dmaops->tx_buffer (priv, buffer); + ret = priv->dmaops->tx_buffer (priv, buffer); +if (ret) + goto out;skb_tx_timestamp (skb);
Signature · 1 line
2.13.0
PATCH v5 2/10 net: eth: altera: set rx and tx ring size before init_dma call
In reply to Ooi, JoyceFrom: Dalon Westergreen <[email protected]>
It is more appropriate to set the rx and tx ring size before calling the init function for the dma.
---
v2: no change
v3: no change
v4: no change
v5: no change
--- drivers/net/ethernet/altera/altera_tse_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/altera/altera_tse_main.c +4 -2
@@ -1154,6 +1154,10 @@ static int tse_open(struct net_device *dev)int i;unsigned long int flags; +/* set tx and rx ring size */ + priv->rx_ring_size = dma_rx_num; + priv->tx_ring_size = dma_tx_num; +/* Reset and configure TSE MAC and probe associated PHY */ ret = priv->dmaops->init_dma (priv);if (ret !=0 ) {
@@ -1196,8 +1200,6 @@ static int tse_open(struct net_device *dev) priv->dmaops->reset_dma (priv);/* Create and initialize the TX/RX descriptors chains. */ - priv->rx_ring_size = dma_rx_num; - priv->tx_ring_size = dma_tx_num; ret =alloc_init_skbufs (priv);if (ret) {netdev_err (dev,"DMA descriptors initialization failed\n" );
Signature · 1 line
2.13.0
PATCH v5 3/10 net: eth: altera: fix altera_dmaops declaration
In reply to Ooi, JoyceFrom: Dalon Westergreen <[email protected]>
The declaration of struct altera_dmaops does not have identifier names. Add identifier names to confrom with required coding styles.
---
v2: no change
v3: no change
v4: no change
v5: no change
--- drivers/net/ethernet/altera/altera_tse.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
drivers/net/ethernet/altera/altera_tse.h +16 -14
@@ -385,20 +385,22 @@ struct altera_tse_private;struct altera_dmaops {int altera_dtype;int dmamask; -void (*reset_dma)(struct altera_tse_private *); -void (*enable_txirq)(struct altera_tse_private *); -void (*enable_rxirq)(struct altera_tse_private *); -void (*disable_txirq)(struct altera_tse_private *); -void (*disable_rxirq)(struct altera_tse_private *); -void (*clear_txirq)(struct altera_tse_private *); -void (*clear_rxirq)(struct altera_tse_private *); -int (*tx_buffer)(struct altera_tse_private *,struct tse_buffer *); -u32 (*tx_completions)(struct altera_tse_private *); -void (*add_rx_desc)(struct altera_tse_private *,struct tse_buffer *); -u32 (*get_rx_status)(struct altera_tse_private *); -int (*init_dma)(struct altera_tse_private *); -void (*uninit_dma)(struct altera_tse_private *); -void (*start_rxdma)(struct altera_tse_private *); +void (*reset_dma)(struct altera_tse_private *priv); +void (*enable_txirq)(struct altera_tse_private *priv); +void (*enable_rxirq)(struct altera_tse_private *priv); +void (*disable_txirq)(struct altera_tse_private *priv); +void (*disable_rxirq)(struct altera_tse_private *priv); +void (*clear_txirq)(struct altera_tse_private *priv); +void (*clear_rxirq)(struct altera_tse_private *priv); +int (*tx_buffer)(struct altera_tse_private *priv, +struct tse_buffer *buffer); +u32 (*tx_completions)(struct altera_tse_private *priv); +void (*add_rx_desc)(struct altera_tse_private *priv, +struct tse_buffer *buffer); +u32 (*get_rx_status)(struct altera_tse_private *priv); +int (*init_dma)(struct altera_tse_private *priv); +void (*uninit_dma)(struct altera_tse_private *priv); +void (*start_rxdma)(struct altera_tse_private *priv); };/* This structure is private to each device.
Signature · 1 line
2.13.0
PATCH v5 4/10 net: eth: altera: add optional function to start tx dma
In reply to Ooi, JoyceFrom: Dalon Westergreen <[email protected]>
Allow for optional start up of tx dma if the start_txdma function is defined in altera_dmaops.
---
v2: no change
v3: no change
v4: no change
v5: no change
--- drivers/net/ethernet/altera/altera_tse.h | 1 + drivers/net/ethernet/altera/altera_tse_main.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/net/ethernet/altera/altera_tse.h +1 -0
@@ -401,6 +401,7 @@ struct altera_dmaops {int (*init_dma)(struct altera_tse_private *priv);void (*uninit_dma)(struct altera_tse_private *priv);void (*start_rxdma)(struct altera_tse_private *priv); +void (*start_txdma)(struct altera_tse_private *priv); };/* This structure is private to each device.
drivers/net/ethernet/altera/altera_tse_main.c +5 -0
@@ -1244,6 +1244,9 @@ static int tse_open(struct net_device *dev) priv->dmaops->start_rxdma (priv); +if (priv->dmaops->start_txdma) + priv->dmaops->start_txdma (priv); +/* Start MAC Rx/Tx */ spin_lock (&priv->mac_cfg_lock);tse_set_mac (priv, true);
@@ -1646,6 +1649,7 @@ static const struct altera_dmaops altera_dtype_sgdma = { .init_dma = sgdma_initialize, .uninit_dma = sgdma_uninitialize, .start_rxdma = sgdma_start_rxdma, + .start_txdma = NULL, };static const struct altera_dmaops altera_dtype_msgdma = {
@@ -1665,6 +1669,7 @@ static const struct altera_dmaops altera_dtype_msgdma = { .init_dma = msgdma_initialize, .uninit_dma = msgdma_uninitialize, .start_rxdma = msgdma_start_rxdma, + .start_txdma = NULL, };static const struct of_device_id altera_tse_ids[] = {
Signature · 1 line
2.13.0
PATCH v5 5/10 net: eth: altera: Move common functions to altera_utils
In reply to Ooi, JoyceFrom: Dalon Westergreen <[email protected]>
Move request_and_map and other shared functions to altera_utils. This is the first step to moving common code out of tse specific code so that it can be shared with future altera ethernet ip.
---
v2: no change
v3: no change
v4: no change
v5: no change
--- drivers/net/ethernet/altera/altera_tse.h | 45 --------------------- drivers/net/ethernet/altera/altera_tse_ethtool.c | 1 + drivers/net/ethernet/altera/altera_tse_main.c | 32 +-------------- drivers/net/ethernet/altera/altera_utils.c | 29 ++++++++++++++ drivers/net/ethernet/altera/altera_utils.h | 51 ++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 76 deletions(-)
drivers/net/ethernet/altera/altera_tse.h +0 -45
@@ -489,49 +489,4 @@ struct altera_tse_private {*/ void altera_tse_set_ethtool_ops (struct net_device *); -static inline -u32 csrrd32 (void __iomem *mac,size_t offs) -{ -void __iomem *paddr = (void __iomem *)((uintptr_t )mac + offs); -return readl (paddr); -} - -static inline -u16 csrrd16 (void __iomem *mac,size_t offs) -{ -void __iomem *paddr = (void __iomem *)((uintptr_t )mac + offs); -return readw (paddr); -} - -static inline -u8 csrrd8 (void __iomem *mac,size_t offs) -{ -void __iomem *paddr = (void __iomem *)((uintptr_t )mac + offs); -return readb (paddr); -} - -static inline -void csrwr32 (u32 val,void __iomem *mac,size_t offs) -{ -void __iomem *paddr = (void __iomem *)((uintptr_t )mac + offs); - -writel (val, paddr); -} - -static inline -void csrwr16 (u16 val,void __iomem *mac,size_t offs) -{ -void __iomem *paddr = (void __iomem *)((uintptr_t )mac + offs); - -writew (val, paddr); -} - -static inline -void csrwr8 (u8 val,void __iomem *mac,size_t offs) -{ -void __iomem *paddr = (void __iomem *)((uintptr_t )mac + offs); - -writeb (val, paddr); -} -#endif /* __ALTERA_TSE_H__ */
drivers/net/ethernet/altera/altera_tse_ethtool.c +1 -0
@@ -22,6 +22,7 @@#include <linux/phy.h> #include "altera_tse.h" +#include "altera_utils.h" #define TSE_STATS_LEN 31#define TSE_NUM_REGS 128
drivers/net/ethernet/altera/altera_tse_main.c +1 -31
@@ -23,7 +23,6 @@#include <linux/if_vlan.h> #include <linux/init.h> #include <linux/interrupt.h> -#include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/mii.h>
@@ -33,7 +32,7 @@#include <linux/of_net.h> #include <linux/of_platform.h> #include <linux/phy.h> -#include <linux/platform_device.h> +#include <linux/ptp_classify.h> #include <linux/skbuff.h> #include <asm/cacheflush.h>
@@ -1320,35 +1319,6 @@ static struct net_device_ops altera_tse_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; -static int request_and_map (struct platform_device *pdev,const char *name, -struct resource **res,void __iomem **ptr) -{ -struct resource *region; -struct device *device = &pdev->dev; - - *res =platform_get_resource_byname (pdev,IORESOURCE_MEM , name); -if (*res ==NULL ) { -dev_err (device,"resource %s not defined\n" , name); -return -ENODEV ; - } - - region =devm_request_mem_region (device, (*res)->start, -resource_size (*res),dev_name (device)); -if (region ==NULL ) { -dev_err (device,"unable to request %s\n" , name); -return -EBUSY ; - } - - *ptr =devm_ioremap (device, region->start, -resource_size (region)); -if (*ptr ==NULL ) { -dev_err (device,"ioremap of %s failed!" , name); -return -ENOMEM ; - } - -return 0 ; -} -/* Probe Altera TSE MAC device */ static int altera_tse_probe (struct platform_device *pdev)
drivers/net/ethernet/altera/altera_utils.c +29 -0
@@ -31,3 +31,32 @@ int tse_bit_is_clear(void __iomem *ioaddr, size_t offs, u32 bit_mask)u32 value =csrrd32 (ioaddr, offs);return (value & bit_mask) ?0 :1 ; } + +int request_and_map (struct platform_device *pdev,const char *name, +struct resource **res,void __iomem **ptr) +{ +struct resource *region; +struct device *device = &pdev->dev; + + *res =platform_get_resource_byname (pdev,IORESOURCE_MEM , name); +if (!*res) { +dev_err (device,"resource %s not defined\n" , name); +return -ENODEV ; + } + + region =devm_request_mem_region (device, (*res)->start, +resource_size (*res),dev_name (device)); +if (!region) { +dev_err (device,"unable to request %s\n" , name); +return -EBUSY ; + } + + *ptr =devm_ioremap (device, region->start, +resource_size (region)); +if (!*ptr) { +dev_err (device,"ioremap of %s failed!" , name); +return -ENOMEM ; + } + +return 0 ; +}
drivers/net/ethernet/altera/altera_utils.h +51 -0
63 lines not on this page · raw message
Signature · 1 line
2.13.0
PATCH v5 6/10 net: eth: altera: Add missing identifier names to function declarations
In reply to Ooi, JoyceFrom: Dalon Westergreen <[email protected]>
The sgdma and msgdma header files included function declarations without identifier names for pointers. Add appropriate identifier names.
---
v2: this patch is added in patch version 2
v3: no change
v4: no change
v5: no change
--- drivers/net/ethernet/altera/altera_msgdma.h | 30 ++++++++++++++------------- drivers/net/ethernet/altera/altera_sgdma.h | 32 +++++++++++++++-------------- 2 files changed, 33 insertions(+), 29 deletions(-)
drivers/net/ethernet/altera/altera_msgdma.h +16 -14
@@ -6,19 +6,21 @@#ifndef __ALTERA_MSGDMA_H__#define __ALTERA_MSGDMA_H__ -void msgdma_reset (struct altera_tse_private *); -void msgdma_enable_txirq (struct altera_tse_private *); -void msgdma_enable_rxirq (struct altera_tse_private *); -void msgdma_disable_rxirq (struct altera_tse_private *); -void msgdma_disable_txirq (struct altera_tse_private *); -void msgdma_clear_rxirq (struct altera_tse_private *); -void msgdma_clear_txirq (struct altera_tse_private *); -u32 msgdma_tx_completions (struct altera_tse_private *); -void msgdma_add_rx_desc (struct altera_tse_private *,struct tse_buffer *); -int msgdma_tx_buffer (struct altera_tse_private *,struct tse_buffer *); -u32 msgdma_rx_status (struct altera_tse_private *); -int msgdma_initialize (struct altera_tse_private *); -void msgdma_uninitialize (struct altera_tse_private *); -void msgdma_start_rxdma (struct altera_tse_private *); +void msgdma_reset (struct altera_tse_private *priv); +void msgdma_enable_txirq (struct altera_tse_private *priv); +void msgdma_enable_rxirq (struct altera_tse_private *priv); +void msgdma_disable_rxirq (struct altera_tse_private *priv); +void msgdma_disable_txirq (struct altera_tse_private *priv); +void msgdma_clear_rxirq (struct altera_tse_private *priv); +void msgdma_clear_txirq (struct altera_tse_private *priv); +u32 msgdma_tx_completions (struct altera_tse_private *priv); +void msgdma_add_rx_desc (struct altera_tse_private *priv, +struct tse_buffer *buffer); +int msgdma_tx_buffer (struct altera_tse_private *priv, +struct tse_buffer *buffer); +u32 msgdma_rx_status (struct altera_tse_private *priv); +int msgdma_initialize (struct altera_tse_private *priv); +void msgdma_uninitialize (struct altera_tse_private *priv); +void msgdma_start_rxdma (struct altera_tse_private *priv);#endif /* __ALTERA_MSGDMA_H__ */
drivers/net/ethernet/altera/altera_sgdma.h +17 -15
@@ -6,20 +6,22 @@#ifndef __ALTERA_SGDMA_H__#define __ALTERA_SGDMA_H__ -void sgdma_reset (struct altera_tse_private *); -void sgdma_enable_txirq (struct altera_tse_private *); -void sgdma_enable_rxirq (struct altera_tse_private *); -void sgdma_disable_rxirq (struct altera_tse_private *); -void sgdma_disable_txirq (struct altera_tse_private *); -void sgdma_clear_rxirq (struct altera_tse_private *); -void sgdma_clear_txirq (struct altera_tse_private *); -int sgdma_tx_buffer (struct altera_tse_private *priv,struct tse_buffer *); -u32 sgdma_tx_completions (struct altera_tse_private *); -void sgdma_add_rx_desc (struct altera_tse_private *priv,struct tse_buffer *); -void sgdma_status (struct altera_tse_private *); -u32 sgdma_rx_status (struct altera_tse_private *); -int sgdma_initialize (struct altera_tse_private *); -void sgdma_uninitialize (struct altera_tse_private *); -void sgdma_start_rxdma (struct altera_tse_private *); +void sgdma_reset (struct altera_tse_private *priv); +void sgdma_enable_txirq (struct altera_tse_private *priv); +void sgdma_enable_rxirq (struct altera_tse_private *priv); +void sgdma_disable_rxirq (struct altera_tse_private *priv); +void sgdma_disable_txirq (struct altera_tse_private *priv); +void sgdma_clear_rxirq (struct altera_tse_private *priv); +void sgdma_clear_txirq (struct altera_tse_private *priv); +int sgdma_tx_buffer (struct altera_tse_private *priv, +struct tse_buffer *buffer); +u32 sgdma_tx_completions (struct altera_tse_private *priv); +void sgdma_add_rx_desc (struct altera_tse_private *priv, +struct tse_buffer *buffer); +void sgdma_status (struct altera_tse_private *priv); +u32 sgdma_rx_status (struct altera_tse_private *priv); +int sgdma_initialize (struct altera_tse_private *priv); +void sgdma_uninitialize (struct altera_tse_private *priv); +void sgdma_start_rxdma (struct altera_tse_private *priv);#endif /* __ALTERA_SGDMA_H__ */
Signature · 1 line
2.13.0
PATCH v5 7/10 net: eth: altera: change tx functions to type netdev_tx_t
In reply to Ooi, JoyceFrom: Dalon Westergreen <[email protected]>
Modify all msgdma and sgdma tx_buffer functions to be of type netdev_tx_t, and also modify main tx function to be of netdev_tx_t type.
---
v2: this patch is added in patch version 2
v3: no change
v4: no change
v5: no change
--- drivers/net/ethernet/altera/altera_msgdma.c | 5 +++-- drivers/net/ethernet/altera/altera_msgdma.h | 4 ++-- drivers/net/ethernet/altera/altera_sgdma.c | 5 +++-- drivers/net/ethernet/altera/altera_sgdma.h | 4 ++-- drivers/net/ethernet/altera/altera_tse.h | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-)
drivers/net/ethernet/altera/altera_msgdma.c +3 -2
@@ -106,7 +106,8 @@ void msgdma_clear_txirq(struct altera_tse_private *priv) }/* return 0 to indicate transmit is pending */ -int msgdma_tx_buffer (struct altera_tse_private *priv,struct tse_buffer *buffer) +netdev_tx_t +msgdma_tx_buffer (struct altera_tse_private *priv,struct tse_buffer *buffer) {csrwr32 (lower_32_bits (buffer->dma_addr), priv->tx_dma_desc,msgdma_descroffs (read_addr_lo));
@@ -120,7 +121,7 @@ int msgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer) msgdma_descroffs(stride));csrwr32 (MSGDMA_DESC_CTL_TX_SINGLE , priv->tx_dma_desc,msgdma_descroffs (control)); -return 0 ; +return NETDEV_TX_OK ; }u32 msgdma_tx_completions (struct altera_tse_private *priv)
drivers/net/ethernet/altera/altera_msgdma.h +2 -2
@@ -16,8 +16,8 @@ void msgdma_clear_txirq(struct altera_tse_private *priv);u32 msgdma_tx_completions (struct altera_tse_private *priv);void msgdma_add_rx_desc (struct altera_tse_private *priv,struct tse_buffer *buffer); -int msgdma_tx_buffer (struct altera_tse_private *priv, -struct tse_buffer *buffer); +netdev_tx_t msgdma_tx_buffer (struct altera_tse_private *priv, +struct tse_buffer *buffer);u32 msgdma_rx_status (struct altera_tse_private *priv);int msgdma_initialize (struct altera_tse_private *priv);void msgdma_uninitialize (struct altera_tse_private *priv);
drivers/net/ethernet/altera/altera_sgdma.c +3 -2
@@ -166,7 +166,8 @@ void sgdma_clear_txirq(struct altera_tse_private *priv)* will now actually look at the code, so from now, 0 is good and return * NETDEV_TX_BUSY when busy. */ -int sgdma_tx_buffer (struct altera_tse_private *priv,struct tse_buffer *buffer) +netdev_tx_t +sgdma_tx_buffer (struct altera_tse_private *priv,struct tse_buffer *buffer) {struct sgdma_descrip __iomem *descbase = (struct sgdma_descrip __iomem *)priv->tx_dma_desc;
@@ -196,7 +197,7 @@ int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)/* enqueue the request to the pending transmit queue */ queue_tx (priv, buffer); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/ethernet/altera/altera_sgdma.h +2 -2
@@ -13,8 +13,8 @@ void sgdma_disable_rxirq(struct altera_tse_private *priv);void sgdma_disable_txirq (struct altera_tse_private *priv);void sgdma_clear_rxirq (struct altera_tse_private *priv);void sgdma_clear_txirq (struct altera_tse_private *priv); -int sgdma_tx_buffer (struct altera_tse_private *priv, -struct tse_buffer *buffer); +netdev_tx_t sgdma_tx_buffer (struct altera_tse_private *priv, +struct tse_buffer *buffer);u32 sgdma_tx_completions (struct altera_tse_private *priv);void sgdma_add_rx_desc (struct altera_tse_private *priv,struct tse_buffer *buffer);
drivers/net/ethernet/altera/altera_tse.h +2 -2
@@ -392,8 +392,8 @@ struct altera_dmaops {void (*disable_rxirq)(struct altera_tse_private *priv);void (*clear_txirq)(struct altera_tse_private *priv);void (*clear_rxirq)(struct altera_tse_private *priv); -int (*tx_buffer)(struct altera_tse_private *priv, -struct tse_buffer *buffer); +netdev_tx_t (*tx_buffer)(struct altera_tse_private *priv, +struct tse_buffer *buffer);u32 (*tx_completions)(struct altera_tse_private *priv);void (*add_rx_desc)(struct altera_tse_private *priv,struct tse_buffer *buffer);
Signature · 1 line
2.13.0
PATCH v5 8/10 net: eth: altera: add support for ptp and timestamping
In reply to Ooi, JoyceFrom: Dalon Westergreen <[email protected]>
Add support for the ptp clock used with the tse, and update the driver to support timestamping when enabled. We also enable debugfs entries for the ptp clock to allow some user control and interaction with the ptp clock.
---
v2: this patch is added in patch version 2
v3: no change
v4: no change
v5: rename 'ptp_enable' variable to 'has_ptp', initialize hardware clock
to 0, and minor suggested edits
--- drivers/net/ethernet/altera/Kconfig | 1 + drivers/net/ethernet/altera/Makefile | 3 +- drivers/net/ethernet/altera/altera_tse.h | 8 + drivers/net/ethernet/altera/altera_tse_ethtool.c | 29 ++ drivers/net/ethernet/altera/altera_tse_main.c | 115 +++++++- drivers/net/ethernet/altera/intel_fpga_tod.c | 341 +++++++++++++++++++++++ drivers/net/ethernet/altera/intel_fpga_tod.h | 56 ++++ 7 files changed, 551 insertions(+), 2 deletions(-) create mode 100644 drivers/net/ethernet/altera/intel_fpga_tod.c create mode 100644 drivers/net/ethernet/altera/intel_fpga_tod.h
drivers/net/ethernet/altera/Kconfig +1 -0
@@ -3,6 +3,7 @@ config ALTERA_TSE tristate "Altera Triple-Speed Ethernet MAC support" depends on HAS_DMA select PHYLIB + imply PTP_1588_CLOCK help This driver supports the Altera Triple-Speed (TSE) Ethernet MAC.
drivers/net/ethernet/altera/Makefile +2 -1
@@ -5,4 +5,5 @@ obj-$(CONFIG_ALTERA_TSE) += altera_tse.o altera_tse-objs := altera_tse_main.o altera_tse_ethtool.o \ -altera_msgdma.o altera_sgdma.o altera_utils.o + altera_msgdma.o altera_sgdma.o altera_utils.o \ + intel_fpga_tod.o
drivers/net/ethernet/altera/altera_tse.h +8 -0
@@ -28,6 +28,8 @@#include <linux/netdevice.h> #include <linux/phy.h> +#include "intel_fpga_tod.h" +#define ALTERA_TSE_SW_RESET_WATCHDOG_CNTR 10000#define ALTERA_TSE_MAC_FIFO_WIDTH 4/* TX/RX FIFO width in * bytes
@@ -417,6 +419,12 @@ struct altera_tse_private {/* TSE Revision */ u32 revision; +/* Shared PTP structure */ +struct intel_fpga_tod_private ptp_priv; +int hwts_tx_en; +int hwts_rx_en; +u32 has_ptp; +/* mSGDMA Rx Dispatcher address space */ void __iomem *rx_dma_csr;void __iomem *rx_dma_desc;
drivers/net/ethernet/altera/altera_tse_ethtool.c +29 -0
@@ -19,6 +19,7 @@#include <linux/ethtool.h> #include <linux/kernel.h> #include <linux/netdevice.h> +#include <linux/net_tstamp.h> #include <linux/phy.h> #include "altera_tse.h"
@@ -222,6 +223,33 @@ static void tse_get_regs(struct net_device *dev, struct ethtool_regs *regs, buf[i] =csrrd32 (priv->mac_dev, i *4 ); } +static int tse_get_ts_info (struct net_device *dev, +struct ethtool_ts_info *info) +{ +struct altera_tse_private *priv =netdev_priv (dev); + +if (priv->has_ptp) { +if (priv->ptp_priv.ptp_clock) + info->phc_index = +ptp_clock_index (priv->ptp_priv.ptp_clock); +else + info->phc_index =-1 ; + + info->so_timestamping =SOF_TIMESTAMPING_TX_HARDWARE | +SOF_TIMESTAMPING_RX_HARDWARE | +SOF_TIMESTAMPING_RAW_HARDWARE ; + + info->tx_types = (1 <<HWTSTAMP_TX_OFF ) | (1 <<HWTSTAMP_TX_ON ); + + info->rx_filters = (1 <<HWTSTAMP_FILTER_NONE ) | + (1 <<HWTSTAMP_FILTER_ALL ); + +return 0 ; + } + +return ethtool_op_get_ts_info (dev, info); +} +static const struct ethtool_ops tse_ethtool_ops = { .get_drvinfo = tse_get_drvinfo, .get_regs_len = tse_reglen,
@@ -234,6 +262,7 @@ static const struct ethtool_ops tse_ethtool_ops = { .set_msglevel = tse_set_msglevel, .get_link_ksettings = phy_ethtool_get_link_ksettings, .set_link_ksettings = phy_ethtool_set_link_ksettings, + .get_ts_info = tse_get_ts_info, };void altera_tse_set_ethtool_ops (struct net_device *netdev)
drivers/net/ethernet/altera/altera_tse_main.c +114 -1
171 lines not on this page · raw message
drivers/net/ethernet/altera/intel_fpga_tod.c new file +341 -0
341 lines not on this page · raw message
drivers/net/ethernet/altera/intel_fpga_tod.h new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
2.13.0
Re: [PATCH v5 08/10] net: eth: altera: add support for ptp and timestamping
drivers/net/ethernet/altera/altera_tse_main.c static int tse_shutdown(struct net_device *dev) · line 1335
Quoted 13 lines · Joyce
drivers/net/ethernet/altera/altera_tse_main.c +13
-0+/* ioctl to configure timestamping */ +static int tse_do_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +{ +struct altera_tse_private *priv =netdev_priv (dev); +struct hwtstamp_config config; + +if (!netif_running (dev)) +return -EINVAL ; + +if (!priv->has_ptp) { +netdev_alert (priv->dev,"Timestamping not supported" ); +return -EOPNOTSUPP ; + }
The user might well have a PHY that supports time stamping. The code must pass the ioctl through to the PHY even when !priv->has_ptp.
Quoted 55 lines
drivers/net/ethernet/altera/altera_tse_main.c +55
-0+ +if (!dev->phydev) +return -EINVAL ; + +if (!phy_has_hwtstamp (dev->phydev)) { +if (cmd ==SIOCSHWTSTAMP ) { +if (copy_from_user (&config, ifr->ifr_data, +sizeof (struct hwtstamp_config ))) +return -EFAULT ; + +if (config.flags) +return -EINVAL ; + +switch (config.tx_type) { +case HWTSTAMP_TX_OFF : + priv->hwts_tx_en =0 ; +break ; +case HWTSTAMP_TX_ON : + priv->hwts_tx_en =1 ; +break ; +default : +return -ERANGE ; + } + +switch (config.rx_filter) { +case HWTSTAMP_FILTER_NONE : + priv->hwts_rx_en =0 ; + config.rx_filter =HWTSTAMP_FILTER_NONE ; +break ; +default : + priv->hwts_rx_en =1 ; + config.rx_filter =HWTSTAMP_FILTER_ALL ; +break ; + } + +if (copy_to_user (ifr->ifr_data, &config, +sizeof (struct hwtstamp_config ))) +return -EFAULT ; +else +return 0 ; + } + +if (cmd ==SIOCGHWTSTAMP ) { + config.flags =0 ; + +if (priv->hwts_tx_en) + config.tx_type =HWTSTAMP_TX_ON ; +else + config.tx_type =HWTSTAMP_TX_OFF ; + +if (priv->hwts_rx_en) + config.rx_filter =HWTSTAMP_FILTER_ALL ; +else + config.rx_filter =HWTSTAMP_FILTER_NONE ; +
drivers/net/ethernet/altera/altera_tse_main.c static int tse_shutdown(struct net_device *dev) · line 1400
Quoted 10 lines
drivers/net/ethernet/altera/altera_tse_main.c +10
-0+if (copy_to_user (ifr->ifr_data, &config, +sizeof (struct hwtstamp_config ))) +return -EFAULT ; +else +return 0 ; + } + } + +return phy_mii_ioctl (dev->phydev, ifr, cmd); +}
Thanks,
Richard
RE: [PATCH v5 08/10] net: eth: altera: add support for ptp and timestamping
Quoted 16 lines
-----Original Message-----
From: Richard Cochran <[email protected]>
Sent: Monday, July 27, 2020 10:29 PM
To: Ooi, Joyce <[email protected]>
Cc: Thor Thayer <[email protected]>; David S . Miller <[email protected]>; Jakub Kicinski <[email protected]>; [email protected]; [email protected]; Dalon Westergreen <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Nguyen, Dinh <[email protected]>; Westergreen, Dalon <[email protected]>
Subject: Re: [PATCH v5 08/10] net: eth: altera: add support for ptp and timestampingOn Mon, Jul 27, 2020 at 05:21:55PM +0800, Ooi, Joyce wrote:
Quoted 15 lines
drivers/net/ethernet/altera/altera_tse_main.c static int tse_shutdown(struct net_device *dev) · line 1335
Quoted 12 lines
drivers/net/ethernet/altera/altera_tse_main.c +12
-0+/* ioctl to configure timestamping */ static int tse_do_ioctl (struct +net_device *dev,struct ifreq *ifr,int cmd) { +struct altera_tse_private *priv =netdev_priv (dev); +struct hwtstamp_config config; + +if (!netif_running (dev)) +return -EINVAL ; + +if (!priv->has_ptp) { +netdev_alert (priv->dev,"Timestamping not supported" ); +return -EOPNOTSUPP ; + }The user might well have a PHY that supports time stamping. The code must pass the ioctl through to the PHY even when !priv->has_ptp.
Ok, I'll remove 'return -EOPNOTSUPP;' to allow those that have PHY with timestamping support to go pass through ioctl.
Quoted 68 lines
Quoted 55 lines
drivers/net/ethernet/altera/altera_tse_main.c +54
-0+ +if (!dev->phydev) +return -EINVAL ; + +if (!phy_has_hwtstamp (dev->phydev)) { +if (cmd ==SIOCSHWTSTAMP ) { +if (copy_from_user (&config, ifr->ifr_data, +sizeof (struct hwtstamp_config ))) +return -EFAULT ; + +if (config.flags) +return -EINVAL ; + +switch (config.tx_type) { +case HWTSTAMP_TX_OFF : + priv->hwts_tx_en =0 ; +break ; +case HWTSTAMP_TX_ON : + priv->hwts_tx_en =1 ; +break ; +default : +return -ERANGE ; + } + +switch (config.rx_filter) { +case HWTSTAMP_FILTER_NONE : + priv->hwts_rx_en =0 ; + config.rx_filter =HWTSTAMP_FILTER_NONE ; +break ; +default : + priv->hwts_rx_en =1 ; + config.rx_filter =HWTSTAMP_FILTER_ALL ; +break ; + } + +if (copy_to_user (ifr->ifr_data, &config, +sizeof (struct hwtstamp_config ))) +return -EFAULT ; +else +return 0 ; + } + +if (cmd ==SIOCGHWTSTAMP ) { + config.flags =0 ; + +if (priv->hwts_tx_en) + config.tx_type =HWTSTAMP_TX_ON ; +else + config.tx_type =HWTSTAMP_TX_OFF ; + +if (priv->hwts_rx_en) + config.rx_filter =HWTSTAMP_FILTER_ALL ; +else + config.rx_filter =HWTSTAMP_FILTER_NONE ;drivers/net/ethernet/altera/altera_tse_main.c static int tse_shutdown(struct net_device *dev)
Quoted 10 lines
drivers/net/ethernet/altera/altera_tse_main.c +10
-0+ +if (copy_to_user (ifr->ifr_data, &config, +sizeof (struct hwtstamp_config ))) +return -EFAULT ; +else +return 0 ; + } + } + +return phy_mii_ioctl (dev->phydev, ifr, cmd); }Thanks,
Richard
Jakub Kicinski
maintainerRe: [PATCH v5 08/10] net: eth: altera: add support for ptp and timestamping
In reply to Ooi, JoyceQuoted 10 lines · Joyce
From: Dalon Westergreen <[email protected]>
Add support for the ptp clock used with the tse, and update the driver to support timestamping when enabled. We also enable debugfs entries for the ptp clock to allow some user control and interaction with the ptp clock.
Cc Richard Cochran <[email protected]>Signed-off-by Dalon Westergreen <[email protected]>Signed-off-by Joyce Ooi <[email protected]>
W=1 build reveals a warnings, please fix:
drivers/net/ethernet/altera/intel_fpga_tod.c:334:55: warning: Using plain integer as NULL pointer
kernel test robot
build botRe: [PATCH v5 08/10] net: eth: altera: add support for ptp and timestamping
In reply to Ooi, JoyceThank you for the patch! Perhaps something to improve:
Hi Joyce",
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
[also build test WARNING on net/master robh/for-next linus/master v5.8-rc7 next-20200727] [cannot apply to sparc-next/master]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Ooi-Joyce/net-eth-altera-tse-Add-PTP-and-mSGDMA-prefetcher/20200727-173217 base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git a57066b1a01977a646145f4ce8dfb4538b08368a config: nios2-randconfig-s032-20200727 (attached as .config) compiler: nios2-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.2-94-geb6779f6-dirty
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=nios2
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> drivers/net/ethernet/altera/intel_fpga_tod.c:334:55: sparse: sparse: Using plain integer as NULL pointer
drivers/net/ethernet/altera/intel_fpga_tod.c: note: in included file (through arch/nios2/include/asm/io.h, include/linux/io.h, arch/nios2/include/asm/pgtable.h, ...):
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
include/asm-generic/io.h:225:22: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] value @@ got restricted __le32 [usertype] @@
include/asm-generic/io.h:225:22: sparse: expected unsigned int [usertype] value
include/asm-generic/io.h:225:22: sparse: got restricted __le32 [usertype]
vim +334 drivers/net/ethernet/altera/intel_fpga_tod.c
306
307 /* Common PTP probe function */
308 int intel_fpga_tod_probe(struct platform_device *pdev,
309 struct intel_fpga_tod_private *priv)
310 {
311 struct resource *ptp_res;
312 int ret = -ENODEV;
313
314 priv->dev = (struct net_device *)platform_get_drvdata(pdev);
315
316 /* Time-of-Day (ToD) Clock address space */
317 ret = request_and_map(pdev, "tod_ctrl", &ptp_res,
318 (void __iomem **)&priv->tod_ctrl);
319 if (ret)
320 goto err;
321
322 dev_info(&pdev->dev, "\tTOD Ctrl at 0x%08lx\n",
323 (unsigned long)ptp_res->start);
324
325 /* Time-of-Day (ToD) Clock period clock */
326 priv->tod_clk = devm_clk_get(&pdev->dev, "tod_clk");
327 if (IS_ERR(priv->tod_clk)) {
328 dev_err(&pdev->dev, "cannot obtain ToD period clock\n");
329 ret = -ENXIO;
330 goto err;
331 }
332
333 /* Initialize the hardware clock to zero */
> 334 intel_fpga_tod_set_time(&priv->ptp_clock_ops, 0);
335
336 spin_lock_init(&priv->tod_lock);
337 err:
338 return ret;
339 }
340
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v5 9/10 net: eth: altera: add msgdma prefetcher
In reply to Ooi, JoyceFrom: Dalon Westergreen <[email protected]>
Add support for the mSGDMA prefetcher. The prefetcher adds support for a linked list of descriptors in system memory. The prefetcher feeds these to the mSGDMA dispatcher.
The prefetcher is configured to poll for the next descriptor in the list to be owned by hardware, then pass the descriptor to the dispatcher. It will then poll the next descriptor until it is owned by hardware.
The dispatcher responses are written back to the appropriate descriptor, and the owned by hardware bit is cleared.
The driver sets up a linked list twice the tx and rx ring sizes, with the last descriptor pointing back to the first. This ensures that the ring of descriptors will always have inactive descriptors preventing the prefetcher from looping over and reusing descriptors inappropriately. The prefetcher will continuously loop over these descriptors. The driver modifies descriptors as required to update the skb address and length as well as the owned by hardware bit.
In addition to the above, the mSGDMA prefetcher can be used to handle rx and tx timestamps coming from the ethernet ip. These can be included in the prefetcher response in the descriptor.
---
v2: minor fixes and suggested edits
v3: queue is stopped before returning NETDEV_TX_BUSY
v4: fix build warnings
v5: hardcode poll_freq instead of reading from device tree and some minor edits
--- drivers/net/ethernet/altera/Makefile | 2 +- .../net/ethernet/altera/altera_msgdma_prefetcher.c | 431 +++++++++++++++++++++ .../net/ethernet/altera/altera_msgdma_prefetcher.h | 30 ++ .../ethernet/altera/altera_msgdmahw_prefetcher.h | 87 +++++ drivers/net/ethernet/altera/altera_tse.h | 14 + drivers/net/ethernet/altera/altera_tse_main.c | 40 ++ 6 files changed, 603 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/altera/altera_msgdma_prefetcher.c create mode 100644 drivers/net/ethernet/altera/altera_msgdma_prefetcher.h create mode 100644 drivers/net/ethernet/altera/altera_msgdmahw_prefetcher.h
drivers/net/ethernet/altera/Makefile +1 -1
@@ -6,4 +6,4 @@ obj-$(CONFIG_ALTERA_TSE) += altera_tse.o altera_tse-objs := altera_tse_main.o altera_tse_ethtool.o \ altera_msgdma.o altera_sgdma.o altera_utils.o \ - intel_fpga_tod.o + intel_fpga_tod.o altera_msgdma_prefetcher.o
drivers/net/ethernet/altera/altera_msgdma_prefetcher.c new file +431 -0
431 lines not on this page · raw message
drivers/net/ethernet/altera/altera_msgdma_prefetcher.h new file +30 -0
@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* MSGDMA Prefetcher driver for Altera ethernet devices +* +* Copyright (C) 2020 Intel Corporation. All rights reserved. +* Author(s): +* Dalon Westergreen <[email protected]> +*/ + +#ifndef __ALTERA_PREF_MSGDMA_H__ +#define __ALTERA_PREF_MSGDMA_H__ + +void msgdma_pref_reset (struct altera_tse_private *priv); +void msgdma_pref_enable_txirq (struct altera_tse_private *priv); +void msgdma_pref_enable_rxirq (struct altera_tse_private *priv); +void msgdma_pref_disable_rxirq (struct altera_tse_private *priv); +void msgdma_pref_disable_txirq (struct altera_tse_private *priv); +void msgdma_pref_clear_rxirq (struct altera_tse_private *priv); +void msgdma_pref_clear_txirq (struct altera_tse_private *priv); +u32 msgdma_pref_tx_completions (struct altera_tse_private *priv); +void msgdma_pref_add_rx_desc (struct altera_tse_private *priv, +struct tse_buffer *buffer); +netdev_tx_t msgdma_pref_tx_buffer (struct altera_tse_private *priv, +struct tse_buffer *buffer); +u32 msgdma_pref_rx_status (struct altera_tse_private *priv); +int msgdma_pref_initialize (struct altera_tse_private *priv); +void msgdma_pref_uninitialize (struct altera_tse_private *priv); +void msgdma_pref_start_rxdma (struct altera_tse_private *priv); +void msgdma_pref_start_txdma (struct altera_tse_private *priv); + +#endif /* __ALTERA_PREF_MSGDMA_H__ */
drivers/net/ethernet/altera/altera_msgdmahw_prefetcher.h new file +87 -0
87 lines not on this page · raw message
drivers/net/ethernet/altera/altera_tse.h +14 -0
@@ -382,6 +382,7 @@ struct altera_tse_private;#define ALTERA_DTYPE_SGDMA 1#define ALTERA_DTYPE_MSGDMA 2 +#define ALTERA_DTYPE_MSGDMA_PREF 3/* standard DMA interface for SGDMA and MSGDMA */ struct altera_dmaops {
@@ -434,6 +435,19 @@ struct altera_tse_private {void __iomem *tx_dma_csr;void __iomem *tx_dma_desc; +/* mSGDMA Rx Prefecher address space */ +void __iomem *rx_pref_csr; +struct msgdma_pref_extended_desc *pref_rxdesc; +dma_addr_t pref_rxdescphys; +u32 pref_rx_prod; + +/* mSGDMA Tx Prefecher address space */ +void __iomem *tx_pref_csr; +struct msgdma_pref_extended_desc *pref_txdesc; +dma_addr_t pref_txdescphys; +u32 rx_poll_freq; +u32 tx_poll_freq; +/* Rx buffers queue */ struct tse_buffer *rx_ring;u32 rx_cons;
drivers/net/ethernet/altera/altera_tse_main.c +40 -0
@@ -44,6 +44,7 @@#include "altera_sgdma.h" #include "altera_msgdma.h" #include "intel_fpga_tod.h" +#include "altera_msgdma_prefetcher.h" static atomic_t instance_count =ATOMIC_INIT (~0 );/* Module parameters */
@@ -1498,6 +1499,23 @@ static int altera_tse_probe(struct platform_device *pdev) priv->rxdescmem =resource_size (dma_res); priv->rxdescmem_busaddr = dma_res->start; + }else if (priv->dmaops && + priv->dmaops->altera_dtype ==ALTERA_DTYPE_MSGDMA_PREF ) { +/* mSGDMA Rx Prefetcher address space */ + ret =request_and_map (pdev,"rx_pref" , &dma_res, + &priv->rx_pref_csr); +if (ret) + goto err_free_netdev; + +/* mSGDMA Tx Prefetcher address space */ + ret =request_and_map (pdev,"tx_pref" , &dma_res, + &priv->tx_pref_csr); +if (ret) + goto err_free_netdev; + + priv->rx_poll_freq =128 ; + priv->tx_poll_freq =128 ; + }else { goto err_free_netdev; }
@@ -1756,7 +1774,29 @@ static const struct altera_dmaops altera_dtype_msgdma = { .start_txdma = NULL, }; +static const struct altera_dmaops altera_dtype_prefetcher = { + .altera_dtype =ALTERA_DTYPE_MSGDMA_PREF , + .dmamask =64 , + .reset_dma = msgdma_pref_reset, + .enable_txirq = msgdma_pref_enable_txirq, + .enable_rxirq = msgdma_pref_enable_rxirq, + .disable_txirq = msgdma_pref_disable_txirq, + .disable_rxirq = msgdma_pref_disable_rxirq, + .clear_txirq = msgdma_pref_clear_txirq, + .clear_rxirq = msgdma_pref_clear_rxirq, + .tx_buffer = msgdma_pref_tx_buffer, + .tx_completions = msgdma_pref_tx_completions, + .add_rx_desc = msgdma_pref_add_rx_desc, + .get_rx_status = msgdma_pref_rx_status, + .init_dma = msgdma_pref_initialize, + .uninit_dma = msgdma_pref_uninitialize, + .start_rxdma = msgdma_pref_start_rxdma, + .start_txdma = msgdma_pref_start_txdma, +}; +static const struct of_device_id altera_tse_ids[] = { + { .compatible ="altr,tse-msgdma-2.0" , + .data = &altera_dtype_prefetcher, }, { .compatible ="altr,tse-msgdma-1.0" , .data = &altera_dtype_msgdma, }, { .compatible ="altr,tse-1.0" , .data = &altera_dtype_sgdma, }, { .compatible ="ALTR,tse-1.0" , .data = &altera_dtype_sgdma, },
Signature · 1 line
2.13.0
PATCH v5 10/10 net: eth: altera: update devicetree bindings documentation
In reply to Ooi, JoyceFrom: Dalon Westergreen <[email protected]>
Update devicetree bindings documentation to include msgdma prefetcher and ptp bindings.
---
v2: no change
v3: no change
v4: no change
v5: no change
--- .../devicetree/bindings/net/altera_tse.txt | 103 +++++++++++++++++---- 1 file changed, 84 insertions(+), 19 deletions(-)
Documentation/devicetree/bindings/net/altera_tse.txt +84 -19
@@ -2,53 +2,86 @@ Required properties: - compatible: Should be "altr,tse-1.0" for legacy SGDMA based TSE, and should - be "altr,tse-msgdma-1.0" for the preferred MSGDMA based TSE. + be "altr,tse-msgdma-1.0" for the preferred MSGDMA based TSE, + and "altr,tse-msgdma-2.0" for MSGDMA with prefetcher based + implementations. ALTR is supported for legacy device trees, but is deprecated. altr should be used for all new designs. - reg: Address and length of the register set for the device. It contains the information of registers in the same order as described by reg-names - reg-names: Should contain the reg names - "control_port": MAC configuration space region - "tx_csr": xDMA Tx dispatcher control and status space region - "tx_desc": MSGDMA Tx dispatcher descriptor space region - "rx_csr" : xDMA Rx dispatcher control and status space region - "rx_desc": MSGDMA Rx dispatcher descriptor space region - "rx_resp": MSGDMA Rx dispatcher response space region - "s1": SGDMA descriptor memory - interrupts: Should contain the TSE interrupts and it's mode. - interrupt-names: Should contain the interrupt names - "rx_irq": xDMA Rx dispatcher interrupt - "tx_irq": xDMA Tx dispatcher interrupt + "rx_irq": DMA Rx dispatcher interrupt + "tx_irq": DMA Tx dispatcher interrupt - rx-fifo-depth: MAC receive FIFO buffer depth in bytes - tx-fifo-depth: MAC transmit FIFO buffer depth in bytes - phy-mode: See ethernet.txt in the same directory. - phy-handle: See ethernet.txt in the same directory. - phy-addr: See ethernet.txt in the same directory. A configuration should include phy-handle or phy-addr. -- altr,has-supplementary-unicast: - If present, TSE supports additional unicast addresses. - Otherwise additional unicast addresses are not supported. -- altr,has-hash-multicast-filter: - If present, TSE supports a hash based multicast filter. - Otherwise, hash-based multicast filtering is not supported. - - mdio device tree subnode: When the TSE has a phy connected to its local mdio, there must be device tree subnode with the following required properties: - - compatible: Must be "altr,tse-mdio". - #address-cells: Must be <1>. - #size-cells: Must be <0>. For each phy on the mdio bus, there must be a node with the following fields: - - reg: phy id used to communicate to phy. - device_type: Must be "ethernet-phy". The MAC address will be determined using the optional properties defined in ethernet.txt. +- altr,has-supplementary-unicast: + If present, TSE supports additional unicast addresses. + Otherwise additional unicast addresses are not supported. +- altr,has-hash-multicast-filter: + If present, TSE supports a hash based multicast filter. + Otherwise, hash-based multicast filtering is not supported. +- altr,has-ptp: + If present, TSE supports 1588 timestamping. Currently only + supported with the msgdma prefetcher. +- altr,tx-poll-cnt: + Optional cycle count for Tx prefetcher to poll descriptor + list. If not present, defaults to 128, which at 125MHz is + roughly 1usec. Only for "altr,tse-msgdma-2.0". +- altr,rx-poll-cnt: + Optional cycle count for Tx prefetcher to poll descriptor + list. If not present, defaults to 128, which at 125MHz is + roughly 1usec. Only for "altr,tse-msgdma-2.0". + +Required registers by compatibility string: + - "altr,tse-1.0" + "control_port": MAC configuration space region + "tx_csr": DMA Tx dispatcher control and status space region + "rx_csr" : DMA Rx dispatcher control and status space region + "s1": DMA descriptor memory + + - "altr,tse-msgdma-1.0" + "control_port": MAC configuration space region + "tx_csr": DMA Tx dispatcher control and status space region + "tx_desc": DMA Tx dispatcher descriptor space region + "rx_csr" : DMA Rx dispatcher control and status space region + "rx_desc": DMA Rx dispatcher descriptor space region + "rx_resp": DMA Rx dispatcher response space region + + - "altr,tse-msgdma-2.0" + "control_port": MAC configuration space region + "tx_csr": DMA Tx dispatcher control and status space region + "tx_pref": DMA Tx prefetcher configuration space region + "rx_csr" : DMA Rx dispatcher control and status space region + "rx_pref": DMA Rx prefetcher configuration space region + "tod_ctrl": Time of Day Control register only required when + timestamping support is enabled. Timestamping is + only supported with the msgdma-2.0 implementation. + +Optional properties: +- local-mac-address: See ethernet.txt in the same directory. +- max-frame-size: See ethernet.txt in the same directory. + Example: tse_sub_0_eth_tse_0: ethernet@1,00000000 {
@@ -86,6 +119,11 @@ Example: device_type = "ethernet-phy"; }; + phy2: ethernet-phy@2 { + reg = <0x2>; + device_type = "ethernet-phy"; + }; + }; };
@@ -111,3 +149,30 @@ Example: altr,has-hash-multicast-filter; phy-handle = <&phy1>; }; + + + tse_sub_2_eth_tse_0: ethernet@1,00002000 { + compatible = "altr,tse-msgdma-2.0"; + reg = <0x00000001 0x00002000 0x00000400>, + <0x00000001 0x00002400 0x00000020>, + <0x00000001 0x00002420 0x00000020>, + <0x00000001 0x00002440 0x00000020>, + <0x00000001 0x00002460 0x00000020>, + <0x00000001 0x00002480 0x00000040>; + reg-names = "control_port", "rx_csr", "rx_pref","tx_csr", "tx_pref", "tod_ctrl"; + interrupt-parent = <&hps_0_arm_gic_0>; + interrupts = <0 45 4>, <0 44 4>; + interrupt-names = "rx_irq", "tx_irq"; + rx-fifo-depth = <2048>; + tx-fifo-depth = <2048>; + address-bits = <48>; + max-frame-size = <1500>; + local-mac-address = [ 00 00 00 00 00 00 ]; + phy-mode = "sgmii"; + altr,has-supplementary-unicast; + altr,has-hash-multicast-filter; + altr,has-ptp; + altr,tx-poll-cnt = <128>; + altr,rx-poll-cnt = <32>; + phy-handle = <&phy2>; + };
Signature · 1 line
2.13.0