drop acq111 patches from 5.0 and 5.1

diff --git a/queue-5.0/aqc111-fix-double-endianness-swap-on-be.patch b/queue-5.0/aqc111-fix-double-endianness-swap-on-be.patch
deleted file mode 100644 (file)
index b724a3f..0000000
--- a/queue-5.0/aqc111-fix-double-endianness-swap-on-be.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Wed 15 May 2019 07:51:54 AM CEST
-From: Oliver Neukum <oneukum@suse.com>
-Date: Thu, 9 May 2019 11:08:18 +0200
-Subject: aqc111: fix double endianness swap on BE
-
-From: Oliver Neukum <oneukum@suse.com>
-
-[ Upstream commit 2cf672709beb005f6e90cb4edbed6f2218ba953e ]
-
-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 <oneukum@suse.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/usb/aqc111.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/net/usb/aqc111.c
-+++ b/drivers/net/usb/aqc111.c
-@@ -1428,7 +1428,7 @@ static int aqc111_resume(struct usb_inte
- {
-       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_inte
-       /* 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, &reg16);
- 
--      reg16 |= SFR_RX_CTL_START;
-+      reg16 = oldreg16 | SFR_RX_CTL_START;
-       aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16);
- 
-       aqc111_set_phy_speed(dev, aqc111_data->autoneg,

diff --git a/queue-5.0/aqc111-fix-endianness-issue-in-aqc111_change_mtu.patch b/queue-5.0/aqc111-fix-endianness-issue-in-aqc111_change_mtu.patch
deleted file mode 100644 (file)
index 5b3f56f..0000000
--- a/queue-5.0/aqc111-fix-endianness-issue-in-aqc111_change_mtu.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From foo@baz Wed 15 May 2019 07:51:54 AM CEST
-From: Oliver Neukum <oneukum@suse.com>
-Date: Thu, 9 May 2019 11:08:16 +0200
-Subject: aqc111: fix endianness issue in aqc111_change_mtu
-
-From: Oliver Neukum <oneukum@suse.com>
-
-[ Upstream commit b8b277525e9df2fd2dc3d1f4fe01c6796bb107fc ]
-
-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 <oneukum@suse.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/usb/aqc111.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/usb/aqc111.c
-+++ b/drivers/net/usb/aqc111.c
-@@ -453,6 +453,8 @@ static int aqc111_change_mtu(struct net_
-               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, &reg16);

diff --git a/queue-5.0/aqc111-fix-writing-to-the-phy-on-be.patch b/queue-5.0/aqc111-fix-writing-to-the-phy-on-be.patch
deleted file mode 100644 (file)
index 9fabb29..0000000
--- a/queue-5.0/aqc111-fix-writing-to-the-phy-on-be.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From foo@baz Wed 15 May 2019 07:51:54 AM CEST
-From: Oliver Neukum <oneukum@suse.com>
-Date: Thu, 9 May 2019 11:08:17 +0200
-Subject: aqc111: fix writing to the phy on BE
-
-From: Oliver Neukum <oneukum@suse.com>
-
-[ Upstream commit 369b46e9fbcfa5136f2cb5f486c90e5f7fa92630 ]
-
-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 <oneukum@suse.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/usb/aqc111.c |   23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
---- a/drivers/net/usb/aqc111.c
-+++ b/drivers/net/usb/aqc111.c
-@@ -320,6 +320,7 @@ static int aqc111_get_link_ksettings(str
- 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
-               }
-       }
- 
--      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
- {
-       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
-       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 *d
- {
-       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 *d
- 
-       /* 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 *de
- {
-       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, &reg16);
-@@ -1047,8 +1054,9 @@ static int aqc111_stop(struct usbnet *de
- 
-       /* 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_int
-       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_int
- 
-               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,

diff --git a/queue-5.0/series b/queue-5.0/series
index ebcb236cb69d4d7eb8fe6485ff76c64298a65b70..79e6ff15ae5547e9b047e944324c3f0583430d2f 100644 (file)
--- a/queue-5.0/series
+++ b/queue-5.0/series
@@ -117,9 +117,6 @@ selinux-do-not-report-error-on-connect-af_unspec.patch
 tipc-fix-hanging-clients-using-poll-with-epollout-flag.patch
 vlan-disable-siocshwtstamp-in-container.patch
 vrf-sit-mtu-should-not-be-updated-when-vrf-netdev-is-the-link.patch
-aqc111-fix-endianness-issue-in-aqc111_change_mtu.patch
-aqc111-fix-writing-to-the-phy-on-be.patch
-aqc111-fix-double-endianness-swap-on-be.patch
 tuntap-fix-dividing-by-zero-in-ebpf-queue-selection.patch
 tuntap-synchronize-through-tfiles-array-instead-of-tun-numqueues.patch
 net-phy-fix-phy_validate_pause.patch

diff --git a/queue-5.1/aqc111-fix-double-endianness-swap-on-be.patch b/queue-5.1/aqc111-fix-double-endianness-swap-on-be.patch
deleted file mode 100644 (file)
index 016ed69..0000000
--- a/queue-5.1/aqc111-fix-double-endianness-swap-on-be.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Wed 15 May 2019 07:51:30 AM CEST
-From: Oliver Neukum <oneukum@suse.com>
-Date: Thu, 9 May 2019 11:08:18 +0200
-Subject: aqc111: fix double endianness swap on BE
-
-From: Oliver Neukum <oneukum@suse.com>
-
-[ Upstream commit 2cf672709beb005f6e90cb4edbed6f2218ba953e ]
-
-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 <oneukum@suse.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/usb/aqc111.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/net/usb/aqc111.c
-+++ b/drivers/net/usb/aqc111.c
-@@ -1428,7 +1428,7 @@ static int aqc111_resume(struct usb_inte
- {
-       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_inte
-       /* 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, &reg16);
- 
--      reg16 |= SFR_RX_CTL_START;
-+      reg16 = oldreg16 | SFR_RX_CTL_START;
-       aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16);
- 
-       aqc111_set_phy_speed(dev, aqc111_data->autoneg,

diff --git a/queue-5.1/aqc111-fix-endianness-issue-in-aqc111_change_mtu.patch b/queue-5.1/aqc111-fix-endianness-issue-in-aqc111_change_mtu.patch
deleted file mode 100644 (file)
index d014ee9..0000000
--- a/queue-5.1/aqc111-fix-endianness-issue-in-aqc111_change_mtu.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From foo@baz Wed 15 May 2019 07:51:30 AM CEST
-From: Oliver Neukum <oneukum@suse.com>
-Date: Thu, 9 May 2019 11:08:16 +0200
-Subject: aqc111: fix endianness issue in aqc111_change_mtu
-
-From: Oliver Neukum <oneukum@suse.com>
-
-[ Upstream commit b8b277525e9df2fd2dc3d1f4fe01c6796bb107fc ]
-
-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 <oneukum@suse.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/usb/aqc111.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/usb/aqc111.c
-+++ b/drivers/net/usb/aqc111.c
-@@ -453,6 +453,8 @@ static int aqc111_change_mtu(struct net_
-               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, &reg16);

diff --git a/queue-5.1/aqc111-fix-writing-to-the-phy-on-be.patch b/queue-5.1/aqc111-fix-writing-to-the-phy-on-be.patch
deleted file mode 100644 (file)
index 1c3ef8b..0000000
--- a/queue-5.1/aqc111-fix-writing-to-the-phy-on-be.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From foo@baz Wed 15 May 2019 07:51:30 AM CEST
-From: Oliver Neukum <oneukum@suse.com>
-Date: Thu, 9 May 2019 11:08:17 +0200
-Subject: aqc111: fix writing to the phy on BE
-
-From: Oliver Neukum <oneukum@suse.com>
-
-[ Upstream commit 369b46e9fbcfa5136f2cb5f486c90e5f7fa92630 ]
-
-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 <oneukum@suse.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/usb/aqc111.c |   23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
---- a/drivers/net/usb/aqc111.c
-+++ b/drivers/net/usb/aqc111.c
-@@ -320,6 +320,7 @@ static int aqc111_get_link_ksettings(str
- 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
-               }
-       }
- 
--      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
- {
-       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
-       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 *d
- {
-       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 *d
- 
-       /* 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 *de
- {
-       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, &reg16);
-@@ -1047,8 +1054,9 @@ static int aqc111_stop(struct usbnet *de
- 
-       /* 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_int
-       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_int
- 
-               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,

diff --git a/queue-5.1/series b/queue-5.1/series
index 4b586eb8aa6d31ac436038704214c7b4888fbade..9e796ecaa2680b536e9b1fecedc46e97d16eeec6 100644 (file)
--- a/queue-5.1/series
+++ b/queue-5.1/series
@@ -26,9 +26,6 @@ selinux-do-not-report-error-on-connect-af_unspec.patch
 tipc-fix-hanging-clients-using-poll-with-epollout-flag.patch
 vlan-disable-siocshwtstamp-in-container.patch
 vrf-sit-mtu-should-not-be-updated-when-vrf-netdev-is-the-link.patch
-aqc111-fix-endianness-issue-in-aqc111_change_mtu.patch
-aqc111-fix-writing-to-the-phy-on-be.patch
-aqc111-fix-double-endianness-swap-on-be.patch
 tuntap-fix-dividing-by-zero-in-ebpf-queue-selection.patch
 tuntap-synchronize-through-tfiles-array-instead-of-tun-numqueues.patch
 net-phy-fix-phy_validate_pause.patch