aqc111: revert endianess fixes and cleanup mtu logic
Subsystems (3)
cover aqc111: revert endianess fixes and cleanup mtu logic
Hello!
This reverts no-op commits as it was discussed:
https://lore.kernel.org/netdev/[email protected]/
First and second original patches are already dropped from stable, No need to stable-queue the third patch as it has no functional impact, just a logic cleanup.
Igor Russkikh (3):
Revert "aqc111: fix double endianness swap on BE" Revert "aqc111: fix writing to the phy on BE"
aqc111: cleanup mtu related logic
drivers/net/usb/aqc111.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/3 Revert "aqc111: fix double endianness swap on BE"
This reverts commit 2cf672709beb005f6e90cb4edbed6f2218ba953e.
The required temporary storage is already done inside of write32/16 helpers.
--- drivers/net/usb/aqc111.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/usb/aqc111.c +2 -4
@@ -1428,7 +1428,7 @@ static int aqc111_resume(struct usb_interface *intf) {struct usbnet *dev =usb_get_intfdata (intf);struct aqc111_data *aqc111_data = dev->driver_priv; -u16 reg16, oldreg16; +u16 reg16;u8 reg8;netif_carrier_off (dev->net);
@@ -1444,11 +1444,9 @@ static int aqc111_resume(struct usb_interface *intf)/* Configure RX control register => start operation */ reg16 = aqc111_data->rxctl; reg16 &= ~SFR_RX_CTL_START ; -/* needs to be saved in case endianness is swapped */ - oldreg16 = reg16;aqc111_write16_cmd_nopm (dev,AQ_ACCESS_MAC ,SFR_RX_CTL ,2 , ®16); - reg16 = oldreg16 |SFR_RX_CTL_START ; + reg16 |=SFR_RX_CTL_START ;aqc111_write16_cmd_nopm (dev,AQ_ACCESS_MAC ,SFR_RX_CTL ,2 , ®16); aqc111_set_phy_speed(dev, aqc111_data->autoneg,
Signature · 1 line
2.17.1
PATCH 2/3 Revert "aqc111: fix writing to the phy on BE"
In reply to Igor RusskikhThis reverts commit 369b46e9fbcfa5136f2cb5f486c90e5f7fa92630.
The required temporary storage is already done inside of write32/16 helpers.
--- drivers/net/usb/aqc111.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)
drivers/net/usb/aqc111.c +6 -17
@@ -320,7 +320,6 @@ static int aqc111_get_link_ksettings(struct net_device *net,static void aqc111_set_phy_speed (struct usbnet *dev,u8 autoneg,u16 speed) {struct aqc111_data *aqc111_data = dev->driver_priv; -u32 phy_on_the_wire; aqc111_data->phy_cfg &= ~AQ_ADV_MASK ; aqc111_data->phy_cfg |=AQ_PAUSE ;
@@ -362,8 +361,7 @@ static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) } } - phy_on_the_wire = aqc111_data->phy_cfg; -aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &phy_on_the_wire); +aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &aqc111_data->phy_cfg); } static int aqc111_set_link_ksettings(struct net_device *net,
@@ -757,7 +755,6 @@ static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf) {struct aqc111_data *aqc111_data = dev->driver_priv;u16 reg16; -u32 phy_on_the_wire;/* Force bz */ reg16 =SFR_PHYPWR_RSTCTL_BZ ;
@@ -771,9 +768,8 @@ static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf) aqc111_data->phy_cfg &= ~AQ_ADV_MASK ; aqc111_data->phy_cfg |=AQ_LOW_POWER ; aqc111_data->phy_cfg &= ~AQ_PHY_POWER_EN ; - phy_on_the_wire = aqc111_data->phy_cfg;aqc111_write32_cmd_nopm (dev,AQ_PHY_OPS ,0 ,0 , - &phy_on_the_wire); + &aqc111_data->phy_cfg);kfree (aqc111_data); }
@@ -996,7 +992,6 @@ static int aqc111_reset(struct usbnet *dev) {struct aqc111_data *aqc111_data = dev->driver_priv;u8 reg8 =0 ; -u32 phy_on_the_wire; dev->rx_urb_size =URB_SIZE ;
@@ -1009,9 +1004,8 @@ static int aqc111_reset(struct usbnet *dev)/* Power up ethernet PHY */ aqc111_data->phy_cfg =AQ_PHY_POWER_EN ; - phy_on_the_wire = aqc111_data->phy_cfg;aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , - &phy_on_the_wire); + &aqc111_data->phy_cfg);/* Set the MAC address */ aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_NODE_ID, ETH_ALEN,
@@ -1042,7 +1036,6 @@ static int aqc111_stop(struct usbnet *dev) {struct aqc111_data *aqc111_data = dev->driver_priv;u16 reg16 =0 ; -u32 phy_on_the_wire;aqc111_read16_cmd (dev,AQ_ACCESS_MAC ,SFR_MEDIUM_STATUS_MODE ,2 , ®16);
@@ -1054,9 +1047,8 @@ static int aqc111_stop(struct usbnet *dev)/* Put PHY to low power*/ aqc111_data->phy_cfg |=AQ_LOW_POWER ; - phy_on_the_wire = aqc111_data->phy_cfg;aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , - &phy_on_the_wire); + &aqc111_data->phy_cfg);netif_carrier_off (dev->net);
@@ -1332,7 +1324,6 @@ static int aqc111_suspend(struct usb_interface *intf, pm_message_t message)u16 temp_rx_ctrl =0x00 ;u16 reg16;u8 reg8; -u32 phy_on_the_wire;usbnet_suspend (intf, message);
@@ -1404,14 +1395,12 @@ static int aqc111_suspend(struct usb_interface *intf, pm_message_t message)aqc111_write_cmd (dev,AQ_WOL_CFG ,0 ,0 ,WOL_CFG_SIZE , &wol_cfg); - phy_on_the_wire = aqc111_data->phy_cfg;aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , - &phy_on_the_wire); + &aqc111_data->phy_cfg); }else { aqc111_data->phy_cfg |=AQ_LOW_POWER ; - phy_on_the_wire = aqc111_data->phy_cfg;aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , - &phy_on_the_wire); + &aqc111_data->phy_cfg);/* Disable RX path */ aqc111_read16_cmd_nopm(dev, AQ_ACCESS_MAC,
Signature · 1 line
2.17.1
PATCH 3/3 aqc111: cleanup mtu related logic
In reply to Igor RusskikhOriginal fix b8b277525e9d was done under impression that invalid data could be written for mtu configuration higher that 16334.
But the high limit will anyway be rejected my max_mtu check in caller. Thus, make the code cleaner and allow it doing the configuration without checking for maximum mtu value.
--- drivers/net/usb/aqc111.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/usb/aqc111.c +2 -4
@@ -437,7 +437,7 @@ static int aqc111_change_mtu(struct net_device *net, int new_mtu)aqc111_write16_cmd (dev,AQ_ACCESS_MAC ,SFR_MEDIUM_STATUS_MODE ,2 , ®16); -if (dev->net->mtu >12500 && dev->net->mtu <=16334 ) { +if (dev->net->mtu >12500 ) {memcpy (buf, &AQC111_BULKIN_SIZE [2 ],5 );/* RX bulk configuration */ aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_RX_BULKIN_QCTRL,
@@ -451,10 +451,8 @@ static int aqc111_change_mtu(struct net_device *net, int new_mtu) reg16 =0x1020 ; else if (dev->net->mtu <= 12500) reg16 =0x1420 ; - else if (dev->net->mtu <= 16334) - reg16 =0x1A20 ; else - return 0; + reg16 =0x1A20 ;aqc111_write16_cmd (dev,AQ_ACCESS_MAC ,SFR_PAUSE_WATERLVL_LOW ,2 , ®16);
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Igor Russkikh <[email protected]>
Date: Thu, 16 May 2019 14:52:18 +0000
Quoted 7 lines
This reverts no-op commits as it was discussed:
https://lore.kernel.org/netdev/[email protected]/
First and second original patches are already dropped from stable, No need to stable-queue the third patch as it has no functional impact, just a logic cleanup.
Series applied, thank you.