Re: [PATCH v1 net-next] stmmac: intel: Adding ref clock 1us tic for LPI cntr

[David Miller]

From: Voon Weifeng 
Date: Mon, 28 Sep 2020 18:12:12 +0800

> From: Rusaimi Amira Ruslan 
> 
> Adding reference clock (1us tic) for all LPI timer on Intel platforms.
> The reference clock is derived from ptp clk. This also enables all LPI
> counter.
> 
> Signed-off-by: Rusaimi Amira Ruslan 
> Signed-off-by: Voon Weifeng 

Applied.

[PATCH v1 net-next] stmmac: intel: Adding ref clock 1us tic for LPI cntr

[Voon Weifeng]

From: Rusaimi Amira Ruslan 

Adding reference clock (1us tic) for all LPI timer on Intel platforms.
The reference clock is derived from ptp clk. This also enables all LPI
counter.

Signed-off-by: Rusaimi Amira Ruslan 
Signed-off-by: Voon Weifeng 
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 9 +
 drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c  | 9 +
 include/linux/stmmac.h | 1 +
 3 files changed, 19 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c 
b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
index b1323d5c95b5..f61cb997a8f6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
@@ -11,6 +11,7 @@
 #include 
 #include 
 
+#include "dwmac4.h"
 #include "stmmac.h"
 #include "stmmac_platform.h"
 
@@ -146,6 +147,14 @@ static int intel_eth_plat_probe(struct platform_device 
*pdev)
}
 
plat_dat->bsp_priv = dwmac;
+   plat_dat->eee_usecs_rate = plat_dat->clk_ptp_rate;
+
+   if (plat_dat->eee_usecs_rate > 0) {
+   u32 tx_lpi_usec;
+
+   tx_lpi_usec = (plat_dat->eee_usecs_rate / 100) - 1;
+   writel(tx_lpi_usec, stmmac_res.addr + GMAC_1US_TIC_COUNTER);
+   }
 
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
if (ret) {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c 
b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index ab0a81e0fea1..2af9458be95f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -6,6 +6,7 @@
 #include 
 #include 
 #include "dwmac-intel.h"
+#include "dwmac4.h"
 #include "stmmac.h"
 
 struct intel_priv_data {
@@ -295,6 +296,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
plat->axi->axi_blen[2] = 16;
 
plat->ptp_max_adj = plat->clk_ptp_rate;
+   plat->eee_usecs_rate = plat->clk_ptp_rate;
 
/* Set system clock */
plat->stmmac_clk = clk_register_fixed_rate(&pdev->dev,
@@ -623,6 +625,13 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,
if (ret)
return ret;
 
+   if (plat->eee_usecs_rate > 0) {
+   u32 tx_lpi_usec;
+
+   tx_lpi_usec = (plat->eee_usecs_rate / 100) - 1;
+   writel(tx_lpi_usec, res.addr + GMAC_1US_TIC_COUNTER);
+   }
+
ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
if (ret < 0)
return ret;
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 00e83c877496..628e28903b8b 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -200,5 +200,6 @@ struct plat_stmmacenet_data {
int has_xgmac;
bool vlan_fail_q_en;
u8 vlan_fail_q;
+   unsigned int eee_usecs_rate;
 };
 #endif
-- 
2.17.1