aqc111: fix endianness issue in aqc111_change_mtu
Subsystems (3)
PATCH 1/3 aqc111: fix endianness issue in aqc111_change_mtu
If the MTU is large enough, the first write to the device is just repeated. On BE architectures, however, the first word of the command will be swapped a second time and garbage will be written. Avoid that.
--- drivers/net/usb/aqc111.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/usb/aqc111.c +2 -0
@@ -453,6 +453,8 @@ static int aqc111_change_mtu(struct net_device *net, int new_mtu) reg16 =0x1420 ; else if (dev->net->mtu <= 16334) reg16 =0x1A20 ; + else + return 0;aqc111_write16_cmd (dev,AQ_ACCESS_MAC ,SFR_PAUSE_WATERLVL_LOW ,2 , ®16);
Signature · 1 line
2.16.4
PATCH 2/3 aqc111: fix writing to the phy on BE
When writing to the phy on BE architectures an internal data structure was directly given, leading to it being byte swapped in the wrong way for the CPU in 50% of all cases. A temporary buffer must be used.
--- drivers/net/usb/aqc111.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/net/usb/aqc111.c +17 -6
@@ -320,6 +320,7 @@ 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 ;
@@ -361,7 +362,8 @@ static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) } } -aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &aqc111_data->phy_cfg); + phy_on_the_wire = aqc111_data->phy_cfg; +aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &phy_on_the_wire); } static int aqc111_set_link_ksettings(struct net_device *net,
@@ -755,6 +757,7 @@ 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 ;
@@ -768,8 +771,9 @@ 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 , - &aqc111_data->phy_cfg); + &phy_on_the_wire);kfree (aqc111_data); }
@@ -992,6 +996,7 @@ 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 ;
@@ -1004,8 +1009,9 @@ 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 , - &aqc111_data->phy_cfg); + &phy_on_the_wire);/* Set the MAC address */ aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_NODE_ID, ETH_ALEN,
@@ -1036,6 +1042,7 @@ 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);
@@ -1047,8 +1054,9 @@ 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 , - &aqc111_data->phy_cfg); + &phy_on_the_wire);netif_carrier_off (dev->net);
@@ -1324,6 +1332,7 @@ 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);
@@ -1395,12 +1404,14 @@ 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 , - &aqc111_data->phy_cfg); + &phy_on_the_wire); }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 , - &aqc111_data->phy_cfg); + &phy_on_the_wire);/* Disable RX path */ aqc111_read16_cmd_nopm(dev, AQ_ACCESS_MAC,
Signature · 1 line
2.16.4
David Miller
maintainerRe: [PATCH 2/3] aqc111: fix writing to the phy on BE
From: Oliver Neukum <[email protected]>
Date: Thu, 9 May 2019 11:08:17 +0200
Quoted 5 lines
When writing to the phy on BE architectures an internal data structure was directly given, leading to it being byte swapped in the wrong way for the CPU in 50% of all cases. A temporary buffer must be used.
Signed-off-by Oliver Neukum <[email protected]>
Applied and queued up for -stable.
Re: [PATCH 2/3] aqc111: fix writing to the phy on BE
In reply to Oliver NeukumQuoted 22 lines · Oliver Neukum
When writing to the phy on BE architectures an internal data structure was directly given, leading to it being byte swapped in the wrong way for the CPU in 50% of all cases. A temporary buffer must be used.
Signed-off-by Oliver Neukum <[email protected]>--- drivers/net/usb/aqc111.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)drivers/net/usb/aqc111.c +1
-0@@ -320,6 +320,7 @@ 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 ;
drivers/net/usb/aqc111.c static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) · line 366
Quoted 6 lines
drivers/net/usb/aqc111.c +2
-1@@ -361,7 +362,8 @@ static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) } } -aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &aqc111_data->phy_cfg); + phy_on_the_wire = aqc111_data->phy_cfg; +aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &phy_on_the_wire);
Hi Oliver,
I see all write32_cmd and write16_cmd are using a temporary variable to do an internal cpu_to_le32. Why this extra temporary storage is needed?
The question is actually for both 2nd and third patch.
In all the cases BE machine will store temporary bswap conversion in tmp variable and will not actually touch actual field.
Regards,
Igor
PS Sorry for sending this lately, had a long holiday weekend.
Re: [PATCH 2/3] aqc111: fix writing to the phy on BE
Quoted 32 lines · Igor Russkikh
Quoted 22 lines · Oliver Neukum
When writing to the phy on BE architectures an internal data structure was directly given, leading to it being byte swapped in the wrong way for the CPU in 50% of all cases. A temporary buffer must be used.
Signed-off-by Oliver Neukum <[email protected]>--- drivers/net/usb/aqc111.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)drivers/net/usb/aqc111.c +1
-0@@ -320,6 +320,7 @@ 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 ;drivers/net/usb/aqc111.c static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) · line 366
Quoted 6 lines
drivers/net/usb/aqc111.c +2
-1@@ -361,7 +362,8 @@ static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) } } -aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &aqc111_data->phy_cfg); + phy_on_the_wire = aqc111_data->phy_cfg; +aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &phy_on_the_wire);Hi Oliver,
Quoted 6 lines
I see all
write32_cmdandwrite16_cmdare using a temporary variable to do an internalcpu_to_le32. Why this extra temporary storage is needed?The question is actually for both 2nd and third patch.
In all the cases BE machine will store temporary bswap conversion in tmp variable and will not actually touch actual field.
Hi,
I am most terribly sorry. I overlooked the copy. Shall I revert or will you.
Sorry
Oliver
Re: [PATCH 2/3] aqc111: fix writing to the phy on BE
Quoted 14 lines
Quoted 7 lines
drivers/net/usb/aqc111.c static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) · line 366
Quoted 4 lines
drivers/net/usb/aqc111.c +2
-1-aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &aqc111_data->phy_cfg); + phy_on_the_wire = aqc111_data->phy_cfg; +aqc111_write32_cmd (dev,AQ_PHY_OPS ,0 ,0 , &phy_on_the_wire);Hi Oliver,
Quoted 6 lines
I see all
write32_cmdandwrite16_cmdare using a temporary variable to do an internalcpu_to_le32. Why this extra temporary storage is needed?The question is actually for both 2nd and third patch.
In all the cases BE machine will store temporary bswap conversion in tmp variable and will not actually touch actual field.
Quoted 7 lines
Hi,
I am most terribly sorry. I overlooked the copy. Shall I revert or will you.
Sorry
Oliver
Hi Oliver,
I'll submit the reverts.
Regards,
Igor
PATCH 3/3 aqc111: fix double endianness swap on BE
In reply to Oliver NeukumIf you are using a function that does a swap in place, you cannot just reuse the buffer on the assumption that it has not been changed.
--- drivers/net/usb/aqc111.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/usb/aqc111.c +4 -2
@@ -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; +u16 reg16, oldreg16;u8 reg8;netif_carrier_off (dev->net);
@@ -1444,9 +1444,11 @@ 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 |=SFR_RX_CTL_START ; + reg16 = oldreg16 |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.16.4
David Miller
maintainerRe: [PATCH 3/3] aqc111: fix double endianness swap on BE
From: Oliver Neukum <[email protected]>
Date: Thu, 9 May 2019 11:08:18 +0200
Quoted 5 lines
If you are using a function that does a swap in place, you cannot just reuse the buffer on the assumption that it has not been changed.
Signed-off-by Oliver Neukum <[email protected]>
Applied and queued up for -stable.
David Miller
maintainerFrom: Oliver Neukum <[email protected]>
Date: Thu, 9 May 2019 11:08:16 +0200
Quoted 6 lines
If the MTU is large enough, the first write to the device is just repeated. On BE architectures, however, the first word of the command will be swapped a second time and garbage will be written. Avoid that.
Signed-off-by Oliver Neukum <[email protected]>
Applied and queued up for -stable.
Quoted 16 lines · Oliver Neukum
If the MTU is large enough, the first write to the device is just repeated. On BE architectures, however, the first word of the command will be swapped a second time and garbage will be written. Avoid that.
Signed-off-by Oliver Neukum <[email protected]>--- drivers/net/usb/aqc111.c | 2 ++ 1 file changed, 2 insertions(+)drivers/net/usb/aqc111.c +0
-0
drivers/net/usb/aqc111.c static int aqc111_change_mtu(struct net_device *net, int new_mtu) · line 460
Quoted 8 lines
drivers/net/usb/aqc111.c +2
-0@@ -453,6 +453,8 @@ static int aqc111_change_mtu(struct net_device *net, int new_mtu) reg16 =0x1420 ; else if (dev->net->mtu <= 16334) reg16 =0x1A20 ; + else + return 0;aqc111_write16_cmd (dev,AQ_ACCESS_MAC ,SFR_PAUSE_WATERLVL_LOW ,2 , ®16);
Since we specify max_mtu at bind time, this else will never happen. Only for readability that could be rewritten as
- else if (dev->net->mtu <= 16334)
+ else
reg16 = 0x1A20;
Regards,
Igor