doc: marvell: add PPv2.3 description to marvell-pp2.txt
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v5 4/18 doc: marvell: add PPv2.3 description to marvell-pp2.txt
From: Stefan Chulski <[email protected]>
--- Documentation/devicetree/bindings/net/marvell-pp2.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/marvell-pp2.txt +2 -1
@@ -1,5 +1,6 @@ * Marvell Armada 375 Ethernet Controller (PPv2.1) Marvell Armada 7K/8K Ethernet Controller (PPv2.2) + Marvell CN913X Ethernet Controller (PPv2.3) Required properties:
@@ -12,7 +13,7 @@ Required properties: - common controller registers - LMS registers - one register area per Ethernet port - For "marvell,armada-7k-pp2", must contain the following register + For "marvell,armada-7k-pp2" used by 7K/8K and CN913X, must contain the following register sets: - packet processor registers - networking interfaces registers
Signature · 1 line
1.9.1
PATCH v5 6/18 net: mvpp2: always compare hw-version vs MVPP21
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
Currently we have PP2v1 and PP2v2 hw-versions, with some different handlers depending upon condition hw_version = MVPP21/MVPP22. In a future there will be also PP2v3. Let's use now the generic "if equal/notEqual MVPP21" for all cases instead of "if MVPP22".
This patch does not change any functionality.
It is not intended to introduce PP2v3.
It just modifies MVPP21/MVPP22 check-condition bringing it to generic and unified form correct for new-code introducing and PP2v3 net-next generation.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +18 -18
@@ -320,7 +320,7 @@ static int mvpp2_get_nrxqs(struct mvpp2 *priv) {unsigned int nrxqs; -if (priv->hw_version ==MVPP22 && queue_mode ==MVPP2_QDIST_SINGLE_MODE ) +if (priv->hw_version !=MVPP21 && queue_mode ==MVPP2_QDIST_SINGLE_MODE )return 1 ;/* According to the PPv2.2 datasheet and our experiments on
@@ -447,7 +447,7 @@ static void mvpp2_bm_bufs_get_addrs(struct device *dev, struct mvpp2 *priv, MVPP2_BM_PHY_ALLOC_REG(bm_pool->id)); *phys_addr =mvpp2_thread_read (priv, thread,MVPP2_BM_VIRT_ALLOC_REG ); -if (priv->hw_version ==MVPP22 ) { +if (priv->hw_version !=MVPP21 ) {u32 val;u32 dma_addr_highbits, phys_addr_highbits;
@@ -743,7 +743,7 @@ static inline void mvpp2_bm_pool_put(struct mvpp2_port *port, int pool,if (test_bit (thread, &port->priv->lock_map))spin_lock_irqsave (&port->bm_lock[thread], flags); -if (port->priv->hw_version ==MVPP22 ) { +if (port->priv->hw_version !=MVPP21 ) {u32 val =0 ;if (sizeof (dma_addr_t) ==8 )
@@ -1200,7 +1200,7 @@ static bool mvpp2_port_supports_xlg(struct mvpp2_port *port)static bool mvpp2_port_supports_rgmii (struct mvpp2_port *port) { -return !(port->priv->hw_version ==MVPP22 && port->gop_id ==0 ); +return !(port->priv->hw_version !=MVPP21 && port->gop_id ==0 ); }/* Port configuration routines */
@@ -1818,7 +1818,7 @@ static void mvpp2_mac_reset_assert(struct mvpp2_port *port)MVPP2_GMAC_PORT_RESET_MASK ;writel (val, port->base +MVPP2_GMAC_CTRL_2_REG ); -if (port->priv->hw_version ==MVPP22 && port->gop_id ==0 ) { +if (port->priv->hw_version !=MVPP21 && port->gop_id ==0 ) { val =readl (port->base +MVPP22_XLG_CTRL0_REG ) & ~MVPP22_XLG_CTRL0_MAC_RESET_DIS ;writel (val, port->base +MVPP22_XLG_CTRL0_REG );
@@ -1831,7 +1831,7 @@ static void mvpp22_pcs_reset_assert(struct mvpp2_port *port)void __iomem *mpcs, *xpcs;u32 val; -if (port->priv->hw_version !=MVPP22 || port->gop_id !=0 ) +if (port->priv->hw_version ==MVPP21 || port->gop_id !=0 )return ; mpcs = priv->iface_base +MVPP22_MPCS_BASE (port->gop_id);
@@ -1852,7 +1852,7 @@ static void mvpp22_pcs_reset_deassert(struct mvpp2_port *port)void __iomem *mpcs, *xpcs;u32 val; -if (port->priv->hw_version !=MVPP22 || port->gop_id !=0 ) +if (port->priv->hw_version ==MVPP21 || port->gop_id !=0 )return ; mpcs = priv->iface_base +MVPP22_MPCS_BASE (port->gop_id);
@@ -4189,7 +4189,7 @@ static void mvpp2_start_dev(struct mvpp2_port *port)/* Enable interrupts on all threads */ mvpp2_interrupts_enable (port); -if (port->priv->hw_version ==MVPP22 ) +if (port->priv->hw_version !=MVPP21 )mvpp22_mode_reconfigure (port);if (port->phylink) {
@@ -4405,7 +4405,7 @@ static int mvpp2_open(struct net_device *dev) valid = true; } -if (priv->hw_version ==MVPP22 && port->port_irq) { +if (priv->hw_version !=MVPP21 && port->port_irq) { err =request_irq (port->port_irq, mvpp2_port_isr,0 , dev->name, port);if (err) {
@@ -6053,7 +6053,7 @@ static int mvpp2__mac_prepare(struct phylink_config *config, unsigned int mode,MVPP2_GMAC_PORT_RESET_MASK , MVPP2_GMAC_PORT_RESET_MASK); -if (port->priv->hw_version ==MVPP22 ) { +if (port->priv->hw_version !=MVPP21 ) {mvpp22_gop_mask_irq (port);phy_power_off (port->comphy);
@@ -6107,7 +6107,7 @@ static int mvpp2_mac_finish(struct phylink_config *config, unsigned int mode, {struct mvpp2_port *port =mvpp2_phylink_to_port (config); -if (port->priv->hw_version ==MVPP22 && +if (port->priv->hw_version !=MVPP21 && port->phy_interface != interface) { port->phy_interface = interface;
@@ -6787,7 +6787,7 @@ static int mvpp2_init(struct platform_device *pdev, struct mvpp2 *priv)if (dram_target_info)mvpp2_conf_mbus_windows (dram_target_info, priv); -if (priv->hw_version ==MVPP22 ) +if (priv->hw_version !=MVPP21 )mvpp2_axi_init (priv);/* Disable HW PHY polling */
@@ -6950,7 +6950,7 @@ static int mvpp2_probe(struct platform_device *pdev)dev_warn (&pdev->dev,"Fail to alloc CM3 SRAM\n" ); } -if (priv->hw_version ==MVPP22 &&dev_of_node (&pdev->dev)) { +if (priv->hw_version !=MVPP21 &&dev_of_node (&pdev->dev)) { priv->sysctrl_base =syscon_regmap_lookup_by_phandle (pdev->dev.of_node,"marvell,system-controller" );
@@ -6963,7 +6963,7 @@ static int mvpp2_probe(struct platform_device *pdev) priv->sysctrl_base =NULL ; } -if (priv->hw_version ==MVPP22 && +if (priv->hw_version !=MVPP21 &&mvpp2_get_nrxqs (priv) *2 <=MVPP2_BM_MAX_POOLS ) priv->percpu_pools =1 ;
@@ -7010,7 +7010,7 @@ static int mvpp2_probe(struct platform_device *pdev)if (err <0 ) goto err_pp_clk; -if (priv->hw_version ==MVPP22 ) { +if (priv->hw_version !=MVPP21 ) { priv->mg_clk =devm_clk_get (&pdev->dev,"mg_clk" );if (IS_ERR (priv->mg_clk)) { err =PTR_ERR (priv->mg_clk);
@@ -7051,7 +7051,7 @@ static int mvpp2_probe(struct platform_device *pdev)return -EINVAL ; } -if (priv->hw_version ==MVPP22 ) { +if (priv->hw_version !=MVPP21 ) { err =dma_set_mask (&pdev->dev,MVPP2_DESC_DMA_MASK );if (err) goto err_axi_clk;
@@ -7131,10 +7131,10 @@ static int mvpp2_probe(struct platform_device *pdev)clk_disable_unprepare (priv->axi_clk); err_mg_core_clk: -if (priv->hw_version ==MVPP22 ) +if (priv->hw_version !=MVPP21 )clk_disable_unprepare (priv->mg_core_clk); err_mg_clk: -if (priv->hw_version ==MVPP22 ) +if (priv->hw_version !=MVPP21 )clk_disable_unprepare (priv->mg_clk); err_gop_clk:clk_disable_unprepare (priv->gop_clk);
Signature · 1 line
1.9.1
PATCH v5 8/18 net: mvpp2: increase RXQ size to 1024 descriptors
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
RXQ size increased to support Firmware Flow Control. Minimum depletion thresholds to support FC is 1024 buffers. Default set to 1024 descriptors and maximum size to 2048.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +2 -2
@@ -715,8 +715,8 @@#define MVPP2_PORT_MAX_RXQ 32/* Max number of Rx descriptors */ -#define MVPP2_MAX_RXD_MAX 1024 -#define MVPP2_MAX_RXD_DFLT 128 +#define MVPP2_MAX_RXD_MAX 2048 +#define MVPP2_MAX_RXD_DFLT 1024/* Max number of Tx descriptors */ #define MVPP2_MAX_TXD_MAX 2048
Signature · 1 line
1.9.1
PATCH v5 9/18 net: mvpp2: add FCA periodic timer configurations
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
Flow Control periodic timer would be used if port in XOFF to transmit periodic XOFF frames.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 13 +++++- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 45 ++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +12 -1
@@ -596,6 +596,15 @@#define MVPP22_MPCS_CLK_RESET_DIV_RATIO (n) ((n) << 4)#define MVPP22_MPCS_CLK_RESET_DIV_SET BIT(11) +/* FCA registers. PPv2.2 and PPv2.3 */ +#define MVPP22_FCA_BASE (port) (0x7600 + (port) * 0x1000) +#define MVPP22_FCA_REG_SIZE 16 +#define MVPP22_FCA_REG_MASK 0xFFFF +#define MVPP22_FCA_CONTROL_REG 0x0 +#define MVPP22_FCA_ENABLE_PERIODIC BIT(11) +#define MVPP22_PERIODIC_COUNTER_LSB_REG (0x110) +#define MVPP22_PERIODIC_COUNTER_MSB_REG (0x114) +/* XPCS registers. PPv2.2 and PPv2.3 */ #define MVPP22_XPCS_BASE (port) (0x7400 + (port) * 0x1000)#define MVPP22_XPCS_CFG0 0x0
@@ -752,7 +761,9 @@ ((kb) *1024 -MVPP2_TX_FIFO_THRESHOLD_MIN ) /* MSS Flow control */ -#define MSS_SRAM_SIZE 0x800 +#define MSS_SRAM_SIZE 0x800 +#define FC_QUANTA 0xFFFF +#define FC_CLK_DIVIDER 100/* RX buffer constants */ #define MVPP2_SKB_SHINFO_SIZE \
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +45 -0
57 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v5 10/18 net: mvpp2: add FCA RXQ non occupied descriptor threshold
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
The firmware needs to monitor the RX Non-occupied descriptor bits for flow control to move to XOFF mode.
These bits need to be unmasked to be functional, but they will not raise interrupts as we leave the RX exception summary bit in MVPP2_ISR_RX_TX_MASK_REG clear.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 3 ++ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 44 ++++++++++++++++---- 2 files changed, 40 insertions(+), 7 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +3 -0
@@ -295,6 +295,8 @@#define MVPP2_PON_CAUSE_TXP_OCCUP_DESC_ALL_MASK 0x3fc00000#define MVPP2_PON_CAUSE_MISC_SUM_MASK BIT(31)#define MVPP2_ISR_MISC_CAUSE_REG 0x55b0 +#define MVPP2_ISR_RX_ERR_CAUSE_REG (port) (0x5520 + 4 * (port)) +#define MVPP2_ISR_RX_ERR_CAUSE_NONOCC_MASK 0x00ff/* Buffer Manager registers */ #define MVPP2_BM_POOL_BASE_REG (pool) (0x6000 + ((pool) * 4))
@@ -764,6 +766,7 @@#define MSS_SRAM_SIZE 0x800#define FC_QUANTA 0xFFFF#define FC_CLK_DIVIDER 100 +#define MSS_THRESHOLD_STOP 768/* RX buffer constants */ #define MVPP2_SKB_SHINFO_SIZE \
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +37 -7
89 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v5 11/18 net: mvpp2: enable global flow control
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
This patch enables global flow control in FW and in the phylink validate mask.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 13 ++++++--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 30 +++++++++++++++++++- 2 files changed, 38 insertions(+), 5 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +9 -4
@@ -763,10 +763,12 @@ ((kb) *1024 -MVPP2_TX_FIFO_THRESHOLD_MIN ) /* MSS Flow control */ -#define MSS_SRAM_SIZE 0x800 -#define FC_QUANTA 0xFFFF -#define FC_CLK_DIVIDER 100 -#define MSS_THRESHOLD_STOP 768 +#define MSS_SRAM_SIZE 0x800 +#define MSS_FC_COM_REG 0 +#define FLOW_CONTROL_ENABLE_BIT BIT(0) +#define FC_QUANTA 0xFFFF +#define FC_CLK_DIVIDER 100 +#define MSS_THRESHOLD_STOP 768/* RX buffer constants */ #define MVPP2_SKB_SHINFO_SIZE \
@@ -1021,6 +1023,9 @@ struct mvpp2 {/* CM3 SRAM pool */ struct gen_pool *sram_pool; + +/* Global TX Flow Control config */ +bool global_tx_fc; };struct mvpp2_pcpu_stats {
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +29 -1
@@ -92,6 +92,16 @@ static inline u32 mvpp2_cpu_to_thread(struct mvpp2 *priv, int cpu)return cpu % priv->nthreads; } +static void mvpp2_cm3_write (struct mvpp2 *priv,u32 offset,u32 data) +{ +writel (data, priv->cm3_base + offset); +} + +static u32 mvpp2_cm3_read (struct mvpp2 *priv,u32 offset) +{ +return readl (priv->cm3_base + offset); +} +static struct page_pool *mvpp2_create_page_pool (struct device *dev,int num,int len,enum dma_data_direction dma_dir)
@@ -5951,6 +5961,11 @@ static void mvpp2_phylink_validate(struct phylink_config *config,phylink_set (mask, Autoneg);phylink_set_port_modes (mask); +if (port->priv->global_tx_fc) { +phylink_set (mask, Pause); +phylink_set (mask, Asym_Pause); + } +switch (state->interface) {case PHY_INTERFACE_MODE_10GBASER :case PHY_INTERFACE_MODE_XAUI :
@@ -6969,7 +6984,7 @@ static int mvpp2_probe(struct platform_device *pdev)struct resource *res;void __iomem *base;int i, shared; -int err; +int err, val; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -7023,6 +7038,10 @@ static int mvpp2_probe(struct platform_device *pdev)return err; else if (err) dev_warn(&pdev->dev, "Fail to alloc CM3 SRAM\n"); + +/* Enable global Flow Control only if handler to SRAM not NULL */ +if (priv->cm3_base) + priv->global_tx_fc = true; }if (priv->hw_version !=MVPP21 &&dev_of_node (&pdev->dev)) {
@@ -7190,6 +7209,15 @@ static int mvpp2_probe(struct platform_device *pdev) goto err_port_probe; } +/* Enable global flow control. In this stage global +* flow control enabled, but still disabled per port. +*/ +if (priv->global_tx_fc && priv->hw_version !=MVPP21 ) { + val =mvpp2_cm3_read (priv,MSS_FC_COM_REG ); + val |=FLOW_CONTROL_ENABLE_BIT ; +mvpp2_cm3_write (priv,MSS_FC_COM_REG , val); + } +mvpp2_dbgfs_init (priv, pdev->name);platform_set_drvdata (pdev, priv);
Signature · 1 line
1.9.1
PATCH v5 12/18 net: mvpp2: add RXQ flow control configurations
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
This patch add RXQ flow control configurations. Patch do not enable flow control itself, flow control disabled by default.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 35 +++++- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 114 ++++++++++++++++++++ 2 files changed, 148 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +34 -1
@@ -766,9 +766,36 @@#define MSS_SRAM_SIZE 0x800#define MSS_FC_COM_REG 0#define FLOW_CONTROL_ENABLE_BIT BIT(0) +#define FLOW_CONTROL_UPDATE_COMMAND_BIT BIT(31)#define FC_QUANTA 0xFFFF#define FC_CLK_DIVIDER 100 -#define MSS_THRESHOLD_STOP 768 + +#define MSS_RXQ_TRESH_BASE 0x200 +#define MSS_RXQ_TRESH_OFFS 4 +#define MSS_RXQ_TRESH_REG (q, fq) (MSS_RXQ_TRESH_BASE + (((q) + (fq)) \ + * MSS_RXQ_TRESH_OFFS)) + +#define MSS_RXQ_TRESH_START_MASK 0xFFFF +#define MSS_RXQ_TRESH_STOP_MASK (0xFFFF << MSS_RXQ_TRESH_STOP_OFFS) +#define MSS_RXQ_TRESH_STOP_OFFS 16 + +#define MSS_RXQ_ASS_BASE 0x80 +#define MSS_RXQ_ASS_OFFS 4 +#define MSS_RXQ_ASS_PER_REG 4 +#define MSS_RXQ_ASS_PER_OFFS 8 +#define MSS_RXQ_ASS_PORTID_OFFS 0 +#define MSS_RXQ_ASS_PORTID_MASK 0x3 +#define MSS_RXQ_ASS_HOSTID_OFFS 2 +#define MSS_RXQ_ASS_HOSTID_MASK 0x3F + +#define MSS_RXQ_ASS_Q_BASE (q, fq) ((((q) + (fq)) % MSS_RXQ_ASS_PER_REG) \ + * MSS_RXQ_ASS_PER_OFFS) +#define MSS_RXQ_ASS_PQ_BASE (q, fq) ((((q) + (fq)) / MSS_RXQ_ASS_PER_REG) \ + * MSS_RXQ_ASS_OFFS) +#define MSS_RXQ_ASS_REG (q, fq) (MSS_RXQ_ASS_BASE + MSS_RXQ_ASS_PQ_BASE(q, fq)) + +#define MSS_THRESHOLD_STOP 768 +#define MSS_THRESHOLD_START 1024/* RX buffer constants */ #define MVPP2_SKB_SHINFO_SIZE \
@@ -1026,6 +1053,9 @@ struct mvpp2 {/* Global TX Flow Control config */ bool global_tx_fc; + +/* Spinlocks for CM3 shared memory configuration */ +spinlock_t mss_spinlock; };struct mvpp2_pcpu_stats {
@@ -1188,6 +1218,9 @@ struct mvpp2_port {bool rx_hwtstamp;enum hwtstamp_tx_types tx_hwtstamp_type;struct mvpp2_hwtstamp_queue tx_hwtstamp_queue[2 ]; + +/* Firmware TX flow control */ +bool tx_fc; };/* The mvpp2_tx_desc and mvpp2_rx_desc structures describe the
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +114 -0
138 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v5 13/18 net: mvpp2: add ethtool flow control configuration support
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
This patch add ethtool flow control configuration support.
Tx flow control retrieved correctly by ethtool get function. FW per port ethtool configuration capability added.
Patch also takes care about mtu change procedure, if PPv2 switch BM pools during mtu change.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 13 +++ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 98 ++++++++++++++++++++ 2 files changed, 111 insertions(+)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +13 -0
@@ -775,6 +775,19 @@#define MSS_RXQ_TRESH_REG (q, fq) (MSS_RXQ_TRESH_BASE + (((q) + (fq)) \ * MSS_RXQ_TRESH_OFFS)) +#define MSS_BUF_POOL_BASE 0x40 +#define MSS_BUF_POOL_OFFS 4 +#define MSS_BUF_POOL_REG (id) (MSS_BUF_POOL_BASE \ + + (id) * MSS_BUF_POOL_OFFS) + +#define MSS_BUF_POOL_STOP_MASK 0xFFF +#define MSS_BUF_POOL_START_MASK (0xFFF << MSS_BUF_POOL_START_OFFS) +#define MSS_BUF_POOL_START_OFFS 12 +#define MSS_BUF_POOL_PORTS_MASK (0xF << MSS_BUF_POOL_PORTS_OFFS) +#define MSS_BUF_POOL_PORTS_OFFS 24 +#define MSS_BUF_POOL_PORT_OFFS (id) (0x1 << \ + ((id) + MSS_BUF_POOL_PORTS_OFFS)) +#define MSS_RXQ_TRESH_START_MASK 0xFFFF#define MSS_RXQ_TRESH_STOP_MASK (0xFFFF << MSS_RXQ_TRESH_STOP_OFFS)#define MSS_RXQ_TRESH_STOP_OFFS 16
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +98 -0
128 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v5 14/18 net: mvpp2: add BM protection underrun feature support
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
Feature double size of BPPI by decreasing number of pools from 16 to 8. Increasing of BPPI size protect BM drop from BPPI underrun. Underrun could occurred due to stress on DDR and as result slow buffer transition from BPPE to BPPI.
New BPPI threshold recommended by spec is:
BPPI low threshold - 640 buffers
BPPI high threshold - 832 buffers
Supported only in PPv23.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 8 +++++ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 35 +++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +8 -0
@@ -324,6 +324,10 @@#define MVPP2_BM_HIGH_THRESH_MASK 0x7f0000#define MVPP2_BM_HIGH_THRESH_VALUE (val) ((val) << \ MVPP2_BM_HIGH_THRESH_OFFS) +#define MVPP2_BM_BPPI_HIGH_THRESH 0x1E +#define MVPP2_BM_BPPI_LOW_THRESH 0x1C +#define MVPP23_BM_BPPI_HIGH_THRESH 0x34 +#define MVPP23_BM_BPPI_LOW_THRESH 0x28#define MVPP2_BM_INTR_CAUSE_REG (pool) (0x6240 + ((pool) * 4))#define MVPP2_BM_RELEASED_DELAY_MASK BIT(0)#define MVPP2_BM_ALLOC_FAILED_MASK BIT(1)
@@ -352,6 +356,10 @@#define MVPP2_OVERRUN_ETH_DROP 0x7000#define MVPP2_CLS_ETH_DROP 0x7020 +#define MVPP22_BM_POOL_BASE_ADDR_HIGH_REG 0x6310 +#define MVPP22_BM_POOL_BASE_ADDR_HIGH_MASK 0xff +#define MVPP23_BM_8POOL_MODE BIT(8) +/* Hit counters registers */ #define MVPP2_CTRS_IDX 0x7040#define MVPP22_CTRS_TX_CTR (port, txq) ((txq) | ((port) << 3) | BIT(7))
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +34 -1
@@ -70,6 +70,11 @@ enum mvpp2_bm_pool_log_num {module_param (queue_mode, int,0444 );MODULE_PARM_DESC (queue_mode,"Set queue_mode (single=0, multi=1)" ); +static int bm_underrun_protect =1 ; + +module_param (bm_underrun_protect, int,0444 ); +MODULE_PARM_DESC (bm_underrun_protect,"Set BM underrun protect feature (0-1), def=1" ); +/* Utility/helper methods */ void mvpp2_write (struct mvpp2 *priv,u32 offset,u32 data)
@@ -424,6 +429,21 @@ static int mvpp2_bm_pool_create(struct device *dev, struct mvpp2 *priv, val =mvpp2_read (priv,MVPP2_BM_POOL_CTRL_REG (bm_pool->id)); val |=MVPP2_BM_START_MASK ; + + val &= ~MVPP2_BM_LOW_THRESH_MASK ; + val &= ~MVPP2_BM_HIGH_THRESH_MASK ; + +/* Set 8 Pools BPPI threshold if BM underrun protection feature +* were enabled +*/ +if (priv->hw_version ==MVPP23 && bm_underrun_protect) { + val |=MVPP2_BM_LOW_THRESH_VALUE (MVPP23_BM_BPPI_LOW_THRESH ); + val |=MVPP2_BM_HIGH_THRESH_VALUE (MVPP23_BM_BPPI_HIGH_THRESH ); + }else { + val |=MVPP2_BM_LOW_THRESH_VALUE (MVPP2_BM_BPPI_LOW_THRESH ); + val |=MVPP2_BM_HIGH_THRESH_VALUE (MVPP2_BM_BPPI_HIGH_THRESH ); + } +mvpp2_write (priv,MVPP2_BM_POOL_CTRL_REG (bm_pool->id), val); bm_pool->size = size;
@@ -592,6 +612,16 @@ static int mvpp2_bm_pools_init(struct device *dev, struct mvpp2 *priv)return err; } +/* Routine enable PPv23 8 pool mode */ +static void mvpp23_bm_set_8pool_mode (struct mvpp2 *priv) +{ +int val; + + val =mvpp2_read (priv,MVPP22_BM_POOL_BASE_ADDR_HIGH_REG ); + val |=MVPP23_BM_8POOL_MODE ; +mvpp2_write (priv,MVPP22_BM_POOL_BASE_ADDR_HIGH_REG , val); +} +static int mvpp2_bm_init (struct device *dev,struct mvpp2 *priv) {enum dma_data_direction dma_dir =DMA_FROM_DEVICE ;
@@ -645,6 +675,9 @@ static int mvpp2_bm_init(struct device *dev, struct mvpp2 *priv)if (!priv->bm_pools)return -ENOMEM ; +if (priv->hw_version ==MVPP23 && bm_underrun_protect) +mvpp23_bm_set_8pool_mode (priv); + err =mvpp2_bm_pools_init (dev, priv);if (err <0 )return err;
@@ -6489,7 +6522,7 @@ static void mvpp2_mac_link_up(struct phylink_config *config, val); } -if (port->priv->global_tx_fc) { +if (port->priv->global_tx_fc && bm_underrun_protect) { port->tx_fc = tx_pause;if (tx_pause)mvpp2_rxq_enable_fc (port);
Signature · 1 line
1.9.1
PATCH v5 15/18 net: mvpp2: add PPv23 RX FIFO flow control
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
New FIFO flow control feature were added in PPv23. PPv2 FIFO polled by HW and trigger pause frame if FIFO fill level is below threshold.
FIFO HW flow control enabled with CM3 RXQ&BM flow control with ethtool.
Current FIFO thresholds is:
9KB for port with maximum speed 10Gb/s port 4KB for port with maximum speed 5Gb/s port 2KB for port with maximum speed 1Gb/s port
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 15 ++++++ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 53 ++++++++++++++++++++ 2 files changed, 68 insertions(+)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +15 -0
@@ -770,6 +770,18 @@#define MVPP2_TX_FIFO_THRESHOLD (kb) \ ((kb) * 1024 - MVPP2_TX_FIFO_THRESHOLD_MIN) +/* RX FIFO threshold in 1KB granularity */ +#define MVPP23_PORT0_FIFO_TRSH (9 * 1024) +#define MVPP23_PORT1_FIFO_TRSH (4 * 1024) +#define MVPP23_PORT2_FIFO_TRSH (2 * 1024) + +/* RX Flow Control Registers */ +#define MVPP2_RX_FC_REG (port) (0x150 + 4 * (port)) +#define MVPP2_RX_FC_EN BIT(24) +#define MVPP2_RX_FC_TRSH_OFFS 16 +#define MVPP2_RX_FC_TRSH_MASK (0xFF << MVPP2_RX_FC_TRSH_OFFS) +#define MVPP2_RX_FC_TRSH_UNIT 256 +/* MSS Flow control */ #define MSS_SRAM_SIZE 0x800#define MSS_FC_COM_REG 0
@@ -1502,6 +1514,8 @@ struct mvpp2_bm_pool {void mvpp2_dbgfs_cleanup (struct mvpp2 *priv); +void mvpp23_rx_fifo_fc_en (struct mvpp2 *priv,int port,bool en); +#ifdef CONFIG_MVPP2_PTP int mvpp22_tai_probe (struct device *dev,struct mvpp2 *priv); void mvpp22_tai_tstamp(struct mvpp2_tai *tai, u32 tstamp,
@@ -1534,4 +1548,5 @@ static inline bool mvpp22_rx_hwtstamping(struct mvpp2_port *port) {return IS_ENABLED (CONFIG_MVPP2_PTP ) && port->rx_hwtstamp; } +#endif
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +53 -0
71 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v5 16/18 net: mvpp2: set 802.3x GoP Flow Control mode
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
This patch fix GMAC TX flow control autoneg.
Flow control autoneg wrongly were disabled with enabled TX flow control.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
@@ -6282,7 +6282,7 @@ static void mvpp2_gmac_config(struct mvpp2_port *port, unsigned int mode, old_ctrl4 = ctrl4 =readl (port->base +MVPP22_GMAC_CTRL_4_REG ); ctrl0 &= ~MVPP2_GMAC_PORT_TYPE_MASK ; - ctrl2 &= ~(MVPP2_GMAC_INBAND_AN_MASK |MVPP2_GMAC_PCS_ENABLE_MASK ); + ctrl2 &= ~(MVPP2_GMAC_INBAND_AN_MASK |MVPP2_GMAC_PCS_ENABLE_MASK |MVPP2_GMAC_FLOW_CTRL_MASK );/* Configure port type */ if (phy_interface_mode_is_8023z (state->interface)) {
Signature · 1 line
1.9.1
PATCH v5 17/18 net: mvpp2: limit minimum ring size to 1024 descriptors
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
To support Flow Control ring size should be at least 1024 descriptors.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +2 -0
@@ -4543,6 +4543,8 @@ static int mvpp2_check_ringparam_valid(struct net_device *dev,if (ring->rx_pending >MVPP2_MAX_RXD_MAX ) new_rx_pending =MVPP2_MAX_RXD_MAX ; +else if (ring->rx_pending <MSS_THRESHOLD_START ) + new_rx_pending =MSS_THRESHOLD_START ;else if (!IS_ALIGNED (ring->rx_pending,16 )) new_rx_pending =ALIGN (ring->rx_pending,16 );
Signature · 1 line
1.9.1
PATCH v5 18/18 net: mvpp2: add TX FC firmware check
In reply to a message not in the archiveFrom: Stefan Chulski <[email protected]>
Patch check that TX FC firmware is running in CM3. If not, global TX FC would be disabled.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 1 + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 42 ++++++++++++++++---- 2 files changed, 36 insertions(+), 7 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +1 -0
@@ -829,6 +829,7 @@#define MSS_THRESHOLD_STOP 768#define MSS_THRESHOLD_START 1024 +#define MSS_FC_MAX_TIMEOUT 5000/* RX buffer constants */ #define MVPP2_SKB_SHINFO_SIZE \
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +35 -7
61 lines not on this page · raw message
Signature · 1 line
1.9.1
Jakub Kicinski
maintainerRe: [PATCH v5 net-next 00/18] net: mvpp2: Add TX Flow Control support
In reply to a message not in the archiveQuoted 15 lines · On Thu, 28 Jan 2021 20:31:04 +0200 [email protected] wrote:
From: Stefan Chulski <[email protected]>
Armada hardware has a pause generation mechanism in GOP (MAC).
The GOP generate flow control frames based on an indication programmed in Ports Control 0 Register. There is a bit per port. However assertion of the PortX Pause bits in the ports control 0 register only sends a one time pause. To complement the function the GOP has a mechanism to periodically send pause control messages based on periodic counters. This mechanism ensures that the pause is effective as long as the Appropriate PortX Pause is asserted.Problem is that Packet Processor that actually can drop packets due to lack of resources not connected to the GOP flow control generation mechanism. To solve this issue Armada has firmware running on CM3 CPU dedicated for Flow Control support.
Firmware monitors Packet Processor resources and asserts XON/XOFF by writing to Ports Control 0 Register.MSS shared SRAM memory used to communicate between CM3 firmware and PP2 driver.
During init PP2 driver informs firmware about used BM pools, RXQs, congestion and depletion thresholds.
Quoted 7 lines
The pause frames are generated whenever congestion or depletion in resources is detected.
The back pressure is stopped when the resource reaches a sufficient level.
So the congestion/depletion and sufficient level implement a hysteresis that reduces the XON/XOFF toggle frequency.Packet Processor v23 hardware introduces support for RX FIFO fill level monitor. Patch "add PPv23 version definition" to differ between v23 and v22 hardware. Patch "add TX FC firmware check" verifies that CM3 firmware supports Flow Control monitoring.
Hi Stefan, looks like patchwork and lore didn't get all the emails:
https://lore.kernel.org/r/[email protected]
https://patchwork.kernel.org/project/netdevbpf/list/?series=423983
Unless it fixes itself soon - please repost.
RE: [EXT] Re: [PATCH v5 net-next 00/18] net: mvpp2: Add TX Flow Control support
Quoted 18 lines
Hi Stefan, looks like patchwork and lore didn't get all the emails:
https://urldefense.proofpoint.com/v2/url?u=https-
3A__lore.kernel.org_r_1611858682-2D9845-2D1-2Dgit-2Dsend-2Demail- 2Dstefanc- 40marvell.com&d=DwICAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=DDQ3dKwkTIx KAl6_Bs7GMx4zhJArrXKN2mDMOXGh7lg&m=AFp2yfjV7t2l3c7dCM9lllj7Mz1V - 57354rTjjMB9_o&s=TK5AoswsdBLZNKNMI_rMiQQFtoLZf9UqEGQ40u7OHGI& e=
https://urldefense.proofpoint.com/v2/url?u=https-
3A__patchwork.kernel.org_project_netdevbpf_list_-3Fseries- 3D423983&d=DwICAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=DDQ3dKwkTIxKAl6_ Bs7GMx4zhJArrXKN2mDMOXGh7lg&m=AFp2yfjV7t2l3c7dCM9lllj7Mz1V- 57354rTjjMB9_o&s=BC2VcCRP0O0r4wywUHOgkqvleArWUsCGaT3Ue1- O6VE&e=
Quoted 1 line
Unless it fixes itself soon - please repost.
Reposted.
Best Regards,
Stefan.
A message that is not in the archive (sent off-list or not yet received): CO6PR18MB3873FF66600BCD9E7E5A4FEDB0B79@CO6PR18MB3873.namprd18.prod.outlook.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
Russell King - ARM Linux admin
maintainerRe: [EXT] Re: [PATCH v5 net-next 00/18] net: mvpp2: Add TX Flow Control support
Quoted 11 lines · Russell King - ARM Linux admin
Quoted 2 lines · Stefan Chulski
I still don't see all patches in https://patchwork.kernel.org/project/netdevbpf/list/?series=424949
I would reduce patch series to 15 patches and repost again.kernel.org email is currently broken for everyone due to the spamcop.net RBL domain having expired. Please don't resend until this has been resolved. The problem has been reported to a kernel.org admin (John Hawley) and others via IRC.
If you didn't get bounce messages from the attempt to send to kernel.org email addresses, your email server is broken.
Ok, kernel.org has now dropped spamcop.net, so email should flow normally now.
Are you sure all your emails are being received by vger.kernel.org?
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
RE: [EXT] Re: [PATCH v5 net-next 00/18] net: mvpp2: Add TX Flow Control support
Quoted 5 lines
Ok, kernel.org has now dropped spamcop.net, so email should flow normally now.
Are you sure all your emails are being received by vger.kernel.org?
No, I get Undeliverable Email response. I probably would wait till tomorrow and repost them again as v8.
Regards,
Stefan.