* [PATCH 1/1] net: ethernet: stmmac: simplify phy modes management for stm32
@ 2020-01-28 8:39 Christophe Roullier
2020-01-29 10:51 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Christophe Roullier @ 2020-01-28 8:39 UTC (permalink / raw)
To: davem, joabreu, mcoquelin.stm32, alexandre.torgue, peppe.cavallaro
Cc: netdev, christophe.roullier, linux-kernel, linux-arm-kernel, linux-stm32
No new feature, just to simplify stm32 part to be easier to use.
Add by default all Ethernet clocks in DT, and activate or not in function
of phy mode, clock frequency, if property "st,ext-phyclk" is set or not.
Keep backward compatibility
-----------------------------------------------------------------------
|PHY_MODE | Normal | PHY wo crystal| PHY wo crystal | No 125Mhz |
| | | 25MHz | 50MHz | from PHY |
-----------------------------------------------------------------------
| MII | - | eth-ck | n/a | n/a |
| | | st,ext-phyclk | | |
-----------------------------------------------------------------------
| GMII | - | eth-ck | n/a | n/a |
| | | st,ext-phyclk | | |
-----------------------------------------------------------------------
| RGMII | - | eth-ck | n/a | eth-ck |
| | | st,ext-phyclk | |st,eth-clk-sel|
| | | | | or |
| | | | | st,ext-phyclk|
------------------------------------------------------------------------
| RMII | - | eth-ck | eth-ck | n/a |
| | | st,ext-phyclk | st,eth-ref-clk-sel | |
| | | | or st,ext-phyclk | |
------------------------------------------------------------------------
Signed-off-by: Christophe Roullier <christophe.roullier@st.com>
---
.../net/ethernet/stmicro/stmmac/dwmac-stm32.c | 58 +++++++++++--------
1 file changed, 34 insertions(+), 24 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
index 9b7be996d07b..866251eac868 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
@@ -29,6 +29,11 @@
#define SYSCFG_PMCR_ETH_CLK_SEL BIT(16)
#define SYSCFG_PMCR_ETH_REF_CLK_SEL BIT(17)
+/* CLOCK feed to PHY*/
+#define ETH_CK_F_25M 25000000
+#define ETH_CK_F_50M 50000000
+#define ETH_CK_F_125M 125000000
+
/* Ethernet PHY interface selection in register SYSCFG Configuration
*------------------------------------------
* src |BIT(23)| BIT(22)| BIT(21)|BIT(20)|
@@ -58,33 +63,20 @@
*| | | 25MHz | 50MHz | |
* ---------------------------------------------------------------------------
*| MII | - | eth-ck | n/a | n/a |
- *| | | | | |
+ *| | | st,ext-phyclk | | |
* ---------------------------------------------------------------------------
*| GMII | - | eth-ck | n/a | n/a |
- *| | | | | |
+ *| | | st,ext-phyclk | | |
* ---------------------------------------------------------------------------
- *| RGMII | - | eth-ck | n/a | eth-ck (no pin) |
- *| | | | | st,eth-clk-sel |
+ *| RGMII | - | eth-ck | n/a | eth-ck |
+ *| | | st,ext-phyclk | | st,eth-clk-sel or|
+ *| | | | | st,ext-phyclk |
* ---------------------------------------------------------------------------
*| RMII | - | eth-ck | eth-ck | n/a |
- *| | | | st,eth-ref-clk-sel | |
+ *| | | st,ext-phyclk | st,eth-ref-clk-sel | |
+ *| | | | or st,ext-phyclk | |
* ---------------------------------------------------------------------------
*
- * BIT(17) : set this bit in RMII mode when you have PHY without crystal 50MHz
- * BIT(16) : set this bit in GMII/RGMII PHY when you do not want use 125Mhz
- * from PHY
- *-----------------------------------------------------
- * src | BIT(17) | BIT(16) |
- *-----------------------------------------------------
- * MII | n/a | n/a |
- *-----------------------------------------------------
- * GMII | n/a | st,eth-clk-sel |
- *-----------------------------------------------------
- * RGMII | n/a | st,eth-clk-sel |
- *-----------------------------------------------------
- * RMII | st,eth-ref-clk-sel | n/a |
- *-----------------------------------------------------
- *
*/
struct stm32_dwmac {
@@ -93,6 +85,8 @@ struct stm32_dwmac {
struct clk *clk_eth_ck;
struct clk *clk_ethstp;
struct clk *syscfg_clk;
+ int ext_phyclk;
+ int enable_eth_ck;
int eth_clk_sel_reg;
int eth_ref_clk_sel_reg;
int irq_pwr_wakeup;
@@ -170,24 +164,34 @@ static int stm32mp1_clk_prepare(struct stm32_dwmac *dwmac, bool prepare)
static int stm32mp1_set_mode(struct plat_stmmacenet_data *plat_dat)
{
struct stm32_dwmac *dwmac = plat_dat->bsp_priv;
- u32 reg = dwmac->mode_reg;
+ u32 reg = dwmac->mode_reg, clk_rate;
int val;
+ clk_rate = clk_get_rate(dwmac->clk_eth_ck);
+ dwmac->enable_eth_ck = false;
switch (plat_dat->interface) {
case PHY_INTERFACE_MODE_MII:
+ if (clk_rate == ETH_CK_F_25M && dwmac->ext_phyclk)
+ dwmac->enable_eth_ck = true;
val = SYSCFG_PMCR_ETH_SEL_MII;
pr_debug("SYSCFG init : PHY_INTERFACE_MODE_MII\n");
break;
case PHY_INTERFACE_MODE_GMII:
val = SYSCFG_PMCR_ETH_SEL_GMII;
- if (dwmac->eth_clk_sel_reg)
+ if (clk_rate == ETH_CK_F_25M &&
+ (dwmac->eth_clk_sel_reg || dwmac->ext_phyclk)) {
+ dwmac->enable_eth_ck = true;
val |= SYSCFG_PMCR_ETH_CLK_SEL;
+ }
pr_debug("SYSCFG init : PHY_INTERFACE_MODE_GMII\n");
break;
case PHY_INTERFACE_MODE_RMII:
val = SYSCFG_PMCR_ETH_SEL_RMII;
- if (dwmac->eth_ref_clk_sel_reg)
+ if ((clk_rate == ETH_CK_F_25M || clk_rate == ETH_CK_F_50M) &&
+ (dwmac->eth_ref_clk_sel_reg || dwmac->ext_phyclk)) {
+ dwmac->enable_eth_ck = true;
val |= SYSCFG_PMCR_ETH_REF_CLK_SEL;
+ }
pr_debug("SYSCFG init : PHY_INTERFACE_MODE_RMII\n");
break;
case PHY_INTERFACE_MODE_RGMII:
@@ -195,8 +199,11 @@ static int stm32mp1_set_mode(struct plat_stmmacenet_data *plat_dat)
case PHY_INTERFACE_MODE_RGMII_RXID:
case PHY_INTERFACE_MODE_RGMII_TXID:
val = SYSCFG_PMCR_ETH_SEL_RGMII;
- if (dwmac->eth_clk_sel_reg)
+ if ((clk_rate == ETH_CK_F_25M || clk_rate == ETH_CK_F_125M) &&
+ (dwmac->eth_clk_sel_reg || dwmac->ext_phyclk)) {
+ dwmac->enable_eth_ck = true;
val |= SYSCFG_PMCR_ETH_CLK_SEL;
+ }
pr_debug("SYSCFG init : PHY_INTERFACE_MODE_RGMII\n");
break;
default:
@@ -294,6 +301,9 @@ static int stm32mp1_parse_data(struct stm32_dwmac *dwmac,
struct device_node *np = dev->of_node;
int err = 0;
+ /* Ethernet PHY have no crystal */
+ dwmac->ext_phyclk = of_property_read_bool(np, "st,ext-phyclk");
+
/* Gigabit Ethernet 125MHz clock selection. */
dwmac->eth_clk_sel_reg = of_property_read_bool(np, "st,eth-clk-sel");
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] net: ethernet: stmmac: simplify phy modes management for stm32
2020-01-28 8:39 [PATCH 1/1] net: ethernet: stmmac: simplify phy modes management for stm32 Christophe Roullier
@ 2020-01-29 10:51 ` David Miller
2020-01-30 13:30 ` Christophe ROULLIER
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2020-01-29 10:51 UTC (permalink / raw)
To: christophe.roullier
Cc: alexandre.torgue, netdev, linux-kernel, joabreu, mcoquelin.stm32,
peppe.cavallaro, linux-stm32, linux-arm-kernel
From: Christophe Roullier <christophe.roullier@st.com>
Date: Tue, 28 Jan 2020 09:39:42 +0100
> No new feature, just to simplify stm32 part to be easier to use.
> Add by default all Ethernet clocks in DT, and activate or not in function
> of phy mode, clock frequency, if property "st,ext-phyclk" is set or not.
> Keep backward compatibility
> -----------------------------------------------------------------------
> |PHY_MODE | Normal | PHY wo crystal| PHY wo crystal | No 125Mhz |
> | | | 25MHz | 50MHz | from PHY |
> -----------------------------------------------------------------------
> | MII | - | eth-ck | n/a | n/a |
> | | | st,ext-phyclk | | |
> -----------------------------------------------------------------------
> | GMII | - | eth-ck | n/a | n/a |
> | | | st,ext-phyclk | | |
> -----------------------------------------------------------------------
> | RGMII | - | eth-ck | n/a | eth-ck |
> | | | st,ext-phyclk | |st,eth-clk-sel|
> | | | | | or |
> | | | | | st,ext-phyclk|
> ------------------------------------------------------------------------
> | RMII | - | eth-ck | eth-ck | n/a |
> | | | st,ext-phyclk | st,eth-ref-clk-sel | |
> | | | | or st,ext-phyclk | |
> ------------------------------------------------------------------------
>
> Signed-off-by: Christophe Roullier <christophe.roullier@st.com>
If anything, this is more of a cleanup, and therefore only appropriate for
net-next when it opens back up.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] net: ethernet: stmmac: simplify phy modes management for stm32
2020-01-29 10:51 ` David Miller
@ 2020-01-30 13:30 ` Christophe ROULLIER
2020-02-13 7:03 ` Christophe ROULLIER
0 siblings, 1 reply; 4+ messages in thread
From: Christophe ROULLIER @ 2020-01-30 13:30 UTC (permalink / raw)
To: David Miller
Cc: Alexandre TORGUE, netdev, linux-kernel, joabreu, mcoquelin.stm32,
Peppe CAVALLARO, linux-stm32, linux-arm-kernel
On 1/29/20 11:51 AM, David Miller wrote:
> From: Christophe Roullier <christophe.roullier@st.com>
> Date: Tue, 28 Jan 2020 09:39:42 +0100
>
>> No new feature, just to simplify stm32 part to be easier to use.
>> Add by default all Ethernet clocks in DT, and activate or not in function
>> of phy mode, clock frequency, if property "st,ext-phyclk" is set or not.
>> Keep backward compatibility
>> -----------------------------------------------------------------------
>> |PHY_MODE | Normal | PHY wo crystal| PHY wo crystal | No 125Mhz |
>> | | | 25MHz | 50MHz | from PHY |
>> -----------------------------------------------------------------------
>> | MII | - | eth-ck | n/a | n/a |
>> | | | st,ext-phyclk | | |
>> -----------------------------------------------------------------------
>> | GMII | - | eth-ck | n/a | n/a |
>> | | | st,ext-phyclk | | |
>> -----------------------------------------------------------------------
>> | RGMII | - | eth-ck | n/a | eth-ck |
>> | | | st,ext-phyclk | |st,eth-clk-sel|
>> | | | | | or |
>> | | | | | st,ext-phyclk|
>> ------------------------------------------------------------------------
>> | RMII | - | eth-ck | eth-ck | n/a |
>> | | | st,ext-phyclk | st,eth-ref-clk-sel | |
>> | | | | or st,ext-phyclk | |
>> ------------------------------------------------------------------------
>>
>> Signed-off-by: Christophe Roullier <christophe.roullier@st.com>
> If anything, this is more of a cleanup, and therefore only appropriate for
> net-next when it opens back up.
Thanks David, It is not urgent, do you want that I re-push it with
"PATCH net next" ?
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] net: ethernet: stmmac: simplify phy modes management for stm32
2020-01-30 13:30 ` Christophe ROULLIER
@ 2020-02-13 7:03 ` Christophe ROULLIER
0 siblings, 0 replies; 4+ messages in thread
From: Christophe ROULLIER @ 2020-02-13 7:03 UTC (permalink / raw)
To: David Miller
Cc: Alexandre TORGUE, netdev, linux-kernel, joabreu, mcoquelin.stm32,
Peppe CAVALLARO, linux-stm32, linux-arm-kernel
Gentle reminder
Thanks
On 1/30/20 2:29 PM, Christophe ROULLIER wrote:
> On 1/29/20 11:51 AM, David Miller wrote:
>> From: Christophe Roullier <christophe.roullier@st.com>
>> Date: Tue, 28 Jan 2020 09:39:42 +0100
>>
>>> No new feature, just to simplify stm32 part to be easier to use.
>>> Add by default all Ethernet clocks in DT, and activate or not in
>>> function
>>> of phy mode, clock frequency, if property "st,ext-phyclk" is set or
>>> not.
>>> Keep backward compatibility
>>> -----------------------------------------------------------------------
>>> |PHY_MODE | Normal | PHY wo crystal| PHY wo crystal | No 125Mhz |
>>> | | | 25MHz | 50MHz | from PHY |
>>> -----------------------------------------------------------------------
>>> | MII | - | eth-ck | n/a | n/a |
>>> | | | st,ext-phyclk | | |
>>> -----------------------------------------------------------------------
>>> | GMII | - | eth-ck | n/a | n/a |
>>> | | | st,ext-phyclk | | |
>>> -----------------------------------------------------------------------
>>> | RGMII | - | eth-ck | n/a | eth-ck |
>>> | | | st,ext-phyclk | |st,eth-clk-sel|
>>> | | | | | or |
>>> | | | | |
>>> st,ext-phyclk|
>>> ------------------------------------------------------------------------
>>>
>>> | RMII | - | eth-ck | eth-ck | n/a |
>>> | | | st,ext-phyclk | st,eth-ref-clk-sel
>>> | |
>>> | | | | or st,ext-phyclk | |
>>> ------------------------------------------------------------------------
>>>
>>>
>>> Signed-off-by: Christophe Roullier <christophe.roullier@st.com>
>> If anything, this is more of a cleanup, and therefore only
>> appropriate for
>> net-next when it opens back up.
> Thanks David, It is not urgent, do you want that I re-push it with
> "PATCH net next" ?
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-13 7:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-28 8:39 [PATCH 1/1] net: ethernet: stmmac: simplify phy modes management for stm32 Christophe Roullier
2020-01-29 10:51 ` David Miller
2020-01-30 13:30 ` Christophe ROULLIER
2020-02-13 7:03 ` Christophe ROULLIER
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).