* [PATCH] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface
@ 2015-04-23 19:17 Murali Karicheri
2015-04-24 5:55 ` Mugunthan V N
2015-04-24 13:33 ` Sergei Shtylyov
0 siblings, 2 replies; 5+ messages in thread
From: Murali Karicheri @ 2015-04-23 19:17 UTC (permalink / raw)
To: netdev, davem, linux-kernel; +Cc: Murali Karicheri
Currently when interface type is MAC to Phy, netif_carrier_(on/off)
is called which is not needed as Phy lib already updates the carrier
status to net stack. This is needed only for other interface types
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
---
drivers/net/ethernet/ti/netcp_ethss.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
index 2bef655..0a1ef2e 100644
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
@@ -1765,7 +1765,9 @@ static void netcp_ethss_link_state_action(struct gbe_priv *gbe_dev,
ALE_PORT_STATE,
ALE_PORT_STATE_FORWARD);
- if (ndev && slave->open)
+ if (ndev && slave->open &&
+ ((slave->link_interface != SGMII_LINK_MAC_PHY) &&
+ (slave->link_interface != XGMII_LINK_MAC_PHY)))
netif_carrier_on(ndev);
} else {
writel(mac_control, GBE_REG_ADDR(slave, emac_regs,
@@ -1773,7 +1775,9 @@ static void netcp_ethss_link_state_action(struct gbe_priv *gbe_dev,
cpsw_ale_control_set(gbe_dev->ale, slave->port_num,
ALE_PORT_STATE,
ALE_PORT_STATE_DISABLE);
- if (ndev)
+ if (ndev &&
+ ((slave->link_interface != SGMII_LINK_MAC_PHY) &&
+ (slave->link_interface != XGMII_LINK_MAC_PHY)))
netif_carrier_off(ndev);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface
2015-04-23 19:17 [PATCH] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface Murali Karicheri
@ 2015-04-24 5:55 ` Mugunthan V N
2015-04-24 13:33 ` Sergei Shtylyov
1 sibling, 0 replies; 5+ messages in thread
From: Mugunthan V N @ 2015-04-24 5:55 UTC (permalink / raw)
To: Murali Karicheri, netdev, davem, linux-kernel
On Friday 24 April 2015 12:47 AM, Murali Karicheri wrote:
> Currently when interface type is MAC to Phy, netif_carrier_(on/off)
> is called which is not needed as Phy lib already updates the carrier
> status to net stack. This is needed only for other interface types
>
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
> ---
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
Regards
Mugunthan V N
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface
2015-04-23 19:17 [PATCH] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface Murali Karicheri
2015-04-24 5:55 ` Mugunthan V N
@ 2015-04-24 13:33 ` Sergei Shtylyov
2015-04-24 15:18 ` Murali Karicheri
1 sibling, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2015-04-24 13:33 UTC (permalink / raw)
To: Murali Karicheri, netdev, davem, linux-kernel
Hello.
On 4/23/2015 10:17 PM, Murali Karicheri wrote:
> Currently when interface type is MAC to Phy, netif_carrier_(on/off)
> is called which is not needed as Phy lib already updates the carrier
> status to net stack. This is needed only for other interface types
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
> ---
> drivers/net/ethernet/ti/netcp_ethss.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
> diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
> index 2bef655..0a1ef2e 100644
> --- a/drivers/net/ethernet/ti/netcp_ethss.c
> +++ b/drivers/net/ethernet/ti/netcp_ethss.c
> @@ -1765,7 +1765,9 @@ static void netcp_ethss_link_state_action(struct gbe_priv *gbe_dev,
> ALE_PORT_STATE,
> ALE_PORT_STATE_FORWARD);
>
> - if (ndev && slave->open)
> + if (ndev && slave->open &&
> + ((slave->link_interface != SGMII_LINK_MAC_PHY) &&
> + (slave->link_interface != XGMII_LINK_MAC_PHY)))
You don't need extra parens around &&.
> netif_carrier_on(ndev);
> } else {
> writel(mac_control, GBE_REG_ADDR(slave, emac_regs,
> @@ -1773,7 +1775,9 @@ static void netcp_ethss_link_state_action(struct gbe_priv *gbe_dev,
> cpsw_ale_control_set(gbe_dev->ale, slave->port_num,
> ALE_PORT_STATE,
> ALE_PORT_STATE_DISABLE);
> - if (ndev)
> + if (ndev &&
> + ((slave->link_interface != SGMII_LINK_MAC_PHY) &&
> + (slave->link_interface != XGMII_LINK_MAC_PHY)))
Likewise.
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface
2015-04-24 13:33 ` Sergei Shtylyov
@ 2015-04-24 15:18 ` Murali Karicheri
2015-04-24 16:41 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Murali Karicheri @ 2015-04-24 15:18 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: netdev, davem, linux-kernel
On 04/24/2015 09:33 AM, Sergei Shtylyov wrote:
> Hello.
>
> On 4/23/2015 10:17 PM, Murali Karicheri wrote:
>
>> Currently when interface type is MAC to Phy, netif_carrier_(on/off)
>> is called which is not needed as Phy lib already updates the carrier
>> status to net stack. This is needed only for other interface types
>
>> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
>> ---
>> drivers/net/ethernet/ti/netcp_ethss.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>> diff --git a/drivers/net/ethernet/ti/netcp_ethss.c
>> b/drivers/net/ethernet/ti/netcp_ethss.c
>> index 2bef655..0a1ef2e 100644
>> --- a/drivers/net/ethernet/ti/netcp_ethss.c
>> +++ b/drivers/net/ethernet/ti/netcp_ethss.c
>> @@ -1765,7 +1765,9 @@ static void
>> netcp_ethss_link_state_action(struct gbe_priv *gbe_dev,
>> ALE_PORT_STATE,
>> ALE_PORT_STATE_FORWARD);
>>
>> - if (ndev && slave->open)
>> + if (ndev && slave->open &&
>> + ((slave->link_interface != SGMII_LINK_MAC_PHY) &&
>> + (slave->link_interface != XGMII_LINK_MAC_PHY)))
>
> You don't need extra parens around &&.
You are right! I will fix it up and re-send.
Mruali
>
>> netif_carrier_on(ndev);
>> } else {
>> writel(mac_control, GBE_REG_ADDR(slave, emac_regs,
>> @@ -1773,7 +1775,9 @@ static void
>> netcp_ethss_link_state_action(struct gbe_priv *gbe_dev,
>> cpsw_ale_control_set(gbe_dev->ale, slave->port_num,
>> ALE_PORT_STATE,
>> ALE_PORT_STATE_DISABLE);
>> - if (ndev)
>> + if (ndev &&
>> + ((slave->link_interface != SGMII_LINK_MAC_PHY) &&
>> + (slave->link_interface != XGMII_LINK_MAC_PHY)))
>
> Likewise.
>
> WBR, Sergei
>
--
Murali Karicheri
Linux Kernel, Texas Instruments
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface
2015-04-24 15:18 ` Murali Karicheri
@ 2015-04-24 16:41 ` Sergei Shtylyov
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2015-04-24 16:41 UTC (permalink / raw)
To: Murali Karicheri; +Cc: netdev, davem, linux-kernel
On 04/24/2015 06:18 PM, Murali Karicheri wrote:
>>> Currently when interface type is MAC to Phy, netif_carrier_(on/off)
>>> is called which is not needed as Phy lib already updates the carrier
>>> status to net stack. This is needed only for other interface types
>>> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
>>> ---
>>> drivers/net/ethernet/ti/netcp_ethss.c | 8 ++++++--
>>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>> diff --git a/drivers/net/ethernet/ti/netcp_ethss.c
>>> b/drivers/net/ethernet/ti/netcp_ethss.c
>>> index 2bef655..0a1ef2e 100644
>>> --- a/drivers/net/ethernet/ti/netcp_ethss.c
>>> +++ b/drivers/net/ethernet/ti/netcp_ethss.c
>>> @@ -1765,7 +1765,9 @@ static void netcp_ethss_link_state_action(struct
>>> gbe_priv *gbe_dev,
>>> ALE_PORT_STATE,
>>> ALE_PORT_STATE_FORWARD);
>>>
>>> - if (ndev && slave->open)
>>> + if (ndev && slave->open &&
>>> + ((slave->link_interface != SGMII_LINK_MAC_PHY) &&
>>> + (slave->link_interface != XGMII_LINK_MAC_PHY)))
>> You don't need extra parens around &&.
> You are right! I will fix it up and re-send.
In fact, you don't need parens around != either.
> Mruali
[...]
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-04-24 16:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-23 19:17 [PATCH] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface Murali Karicheri
2015-04-24 5:55 ` Mugunthan V N
2015-04-24 13:33 ` Sergei Shtylyov
2015-04-24 15:18 ` Murali Karicheri
2015-04-24 16:41 ` Sergei Shtylyov
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).