aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isdn/hardware/mISDN/hfcmulti.c3
-rw-r--r--drivers/net/Kconfig4
-rw-r--r--drivers/net/dsa/qca8k.c174
-rw-r--r--drivers/net/dsa/qca8k.h13
-rw-r--r--drivers/net/ethernet/3com/3c515.c2
-rw-r--r--drivers/net/ethernet/8390/mac8390.c19
-rw-r--r--drivers/net/ethernet/aquantia/atlantic/aq_ring.c5
-rw-r--r--drivers/net/ethernet/cadence/macb_main.c10
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/sge.c2
-rw-r--r--drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c15
-rw-r--r--drivers/net/ethernet/hisilicon/hns3/hns3_enet.c13
-rw-r--r--drivers/net/ethernet/hisilicon/hns3/hns3_enet.h1
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_main.c1
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/core_env.c2
-rw-r--r--drivers/net/ethernet/micrel/ks8851.c42
-rw-r--r--drivers/net/ethernet/micrel/ks8851.h93
-rw-r--r--drivers/net/ethernet/micrel/ks8851_mll.c317
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c2
-rw-r--r--drivers/net/ethernet/realtek/atp.c2
-rw-r--r--drivers/net/ethernet/realtek/r8169.c8
-rw-r--r--drivers/net/ethernet/sis/sis900.c10
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/ring_mode.c13
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c14
-rw-r--r--drivers/net/ethernet/ti/netcp_ethss.c8
-rw-r--r--drivers/net/ethernet/xilinx/xilinx_axienet_main.c2
-rw-r--r--drivers/net/ieee802154/adf7242.c4
-rw-r--r--drivers/net/ieee802154/mac802154_hwsim.c2
-rw-r--r--drivers/net/phy/Kconfig3
-rw-r--r--drivers/net/phy/broadcom.c13
-rw-r--r--drivers/net/phy/dp83822.c34
-rw-r--r--drivers/net/phy/meson-gxl.c6
-rw-r--r--drivers/net/phy/phy_device.c2
-rw-r--r--drivers/net/tun.c16
-rw-r--r--drivers/net/usb/aqc111.c15
-rw-r--r--drivers/net/usb/cdc_ether.c8
-rw-r--r--drivers/net/vxlan.c4
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c4
-rw-r--r--drivers/net/wireless/mediatek/mt76/dma.c7
-rw-r--r--drivers/net/wireless/mediatek/mt76/mac80211.c18
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76.h4
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7603/beacon.c3
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7603/dma.c17
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7603/init.c2
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7603/mac.c2
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7603/main.c16
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7603/mcu.c2
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7603/soc.c4
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h2
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x0/usb.c10
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02.h11
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c27
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c3
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02_mac.c67
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02_mac.h2
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c82
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02_phy.c2
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c3
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x02_util.c14
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x2/init.c2
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h1
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c2
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c21
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x2/phy.c30
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x2/usb.c7
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c1
-rw-r--r--drivers/net/wireless/mediatek/mt76/tx.c11
-rw-r--r--drivers/net/wireless/mediatek/mt76/usb.c6
-rw-r--r--drivers/net/wireless/mediatek/mt7601u/usb.c4
-rw-r--r--drivers/s390/net/qeth_core_main.c5
-rw-r--r--drivers/s390/net/qeth_l2_main.c7
-rw-r--r--drivers/s390/net/qeth_l3_main.c8
72 files changed, 756 insertions, 535 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 4d85645c87f7..0928fd1f0e0c 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -4365,7 +4365,8 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev,
4365 if (m->clock2) 4365 if (m->clock2)
4366 test_and_set_bit(HFC_CHIP_CLOCK2, &hc->chip); 4366 test_and_set_bit(HFC_CHIP_CLOCK2, &hc->chip);
4367 4367
4368 if (ent->device == 0xB410) { 4368 if (ent->vendor == PCI_VENDOR_ID_DIGIUM &&
4369 ent->device == PCI_DEVICE_ID_DIGIUM_HFC4S) {
4369 test_and_set_bit(HFC_CHIP_B410P, &hc->chip); 4370 test_and_set_bit(HFC_CHIP_B410P, &hc->chip);
4370 test_and_set_bit(HFC_CHIP_PCM_MASTER, &hc->chip); 4371 test_and_set_bit(HFC_CHIP_PCM_MASTER, &hc->chip);
4371 test_and_clear_bit(HFC_CHIP_PCM_SLAVE, &hc->chip); 4372 test_and_clear_bit(HFC_CHIP_PCM_SLAVE, &hc->chip);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5e4ca082cfcd..7a96d168efc4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -216,8 +216,8 @@ config GENEVE
216 216
217config GTP 217config GTP
218 tristate "GPRS Tunneling Protocol datapath (GTP-U)" 218 tristate "GPRS Tunneling Protocol datapath (GTP-U)"
219 depends on INET && NET_UDP_TUNNEL 219 depends on INET
220 select NET_IP_TUNNEL 220 select NET_UDP_TUNNEL
221 ---help--- 221 ---help---
222 This allows one to create gtp virtual interfaces that provide 222 This allows one to create gtp virtual interfaces that provide
223 the GPRS Tunneling Protocol datapath (GTP-U). This tunneling protocol 223 the GPRS Tunneling Protocol datapath (GTP-U). This tunneling protocol
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 576b37d12a63..c4fa400efdcc 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -481,6 +481,155 @@ qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable)
481 qca8k_reg_clear(priv, QCA8K_REG_PORT_STATUS(port), mask); 481 qca8k_reg_clear(priv, QCA8K_REG_PORT_STATUS(port), mask);
482} 482}
483 483
484static u32
485qca8k_port_to_phy(int port)
486{
487 /* From Andrew Lunn:
488 * Port 0 has no internal phy.
489 * Port 1 has an internal PHY at MDIO address 0.
490 * Port 2 has an internal PHY at MDIO address 1.
491 * ...
492 * Port 5 has an internal PHY at MDIO address 4.
493 * Port 6 has no internal PHY.
494 */
495
496 return port - 1;
497}
498
499static int
500qca8k_mdio_write(struct qca8k_priv *priv, int port, u32 regnum, u16 data)
501{
502 u32 phy, val;
503
504 if (regnum >= QCA8K_MDIO_MASTER_MAX_REG)
505 return -EINVAL;
506
507 /* callee is responsible for not passing bad ports,
508 * but we still would like to make spills impossible.
509 */
510 phy = qca8k_port_to_phy(port) % PHY_MAX_ADDR;
511 val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |
512 QCA8K_MDIO_MASTER_WRITE | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |
513 QCA8K_MDIO_MASTER_REG_ADDR(regnum) |
514 QCA8K_MDIO_MASTER_DATA(data);
515
516 qca8k_write(priv, QCA8K_MDIO_MASTER_CTRL, val);
517
518 return qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,
519 QCA8K_MDIO_MASTER_BUSY);
520}
521
522static int
523qca8k_mdio_read(struct qca8k_priv *priv, int port, u32 regnum)
524{
525 u32 phy, val;
526
527 if (regnum >= QCA8K_MDIO_MASTER_MAX_REG)
528 return -EINVAL;
529
530 /* callee is responsible for not passing bad ports,
531 * but we still would like to make spills impossible.
532 */
533 phy = qca8k_port_to_phy(port) % PHY_MAX_ADDR;
534 val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |
535 QCA8K_MDIO_MASTER_READ | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |
536 QCA8K_MDIO_MASTER_REG_ADDR(regnum);
537
538 qca8k_write(priv, QCA8K_MDIO_MASTER_CTRL, val);
539
540 if (qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,
541 QCA8K_MDIO_MASTER_BUSY))
542 return -ETIMEDOUT;
543
544 val = (qca8k_read(priv, QCA8K_MDIO_MASTER_CTRL) &
545 QCA8K_MDIO_MASTER_DATA_MASK);
546
547 return val;
548}
549
550static int
551qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data)
552{
553 struct qca8k_priv *priv = ds->priv;
554
555 return qca8k_mdio_write(priv, port, regnum, data);
556}
557
558static int
559qca8k_phy_read(struct dsa_switch *ds, int port, int regnum)
560{
561 struct qca8k_priv *priv = ds->priv;
562 int ret;
563
564 ret = qca8k_mdio_read(priv, port, regnum);
565
566 if (ret < 0)
567 return 0xffff;
568
569 return ret;
570}
571
572static int
573qca8k_setup_mdio_bus(struct qca8k_priv *priv)
574{
575 u32 internal_mdio_mask = 0, external_mdio_mask = 0, reg;
576 struct device_node *ports, *port;
577 int err;
578
579 ports = of_get_child_by_name(priv->dev->of_node, "ports");
580 if (!ports)
581 return -EINVAL;
582
583 for_each_available_child_of_node(ports, port) {
584 err = of_property_read_u32(port, "reg", &reg);
585 if (err)
586 return err;
587
588 if (!dsa_is_user_port(priv->ds, reg))
589 continue;
590
591 if (of_property_read_bool(port, "phy-handle"))
592 external_mdio_mask |= BIT(reg);
593 else
594 internal_mdio_mask |= BIT(reg);
595 }
596
597 if (!external_mdio_mask && !internal_mdio_mask) {
598 dev_err(priv->dev, "no PHYs are defined.\n");
599 return -EINVAL;
600 }
601
602 /* The QCA8K_MDIO_MASTER_EN Bit, which grants access to PHYs through
603 * the MDIO_MASTER register also _disconnects_ the external MDC
604 * passthrough to the internal PHYs. It's not possible to use both
605 * configurations at the same time!
606 *
607 * Because this came up during the review process:
608 * If the external mdio-bus driver is capable magically disabling
609 * the QCA8K_MDIO_MASTER_EN and mutex/spin-locking out the qca8k's
610 * accessors for the time being, it would be possible to pull this
611 * off.
612 */
613 if (!!external_mdio_mask && !!internal_mdio_mask) {
614 dev_err(priv->dev, "either internal or external mdio bus configuration is supported.\n");
615 return -EINVAL;
616 }
617
618 if (external_mdio_mask) {
619 /* Make sure to disable the internal mdio bus in cases
620 * a dt-overlay and driver reload changed the configuration
621 */
622
623 qca8k_reg_clear(priv, QCA8K_MDIO_MASTER_CTRL,
624 QCA8K_MDIO_MASTER_EN);
625 return 0;
626 }
627
628 priv->ops.phy_read = qca8k_phy_read;
629 priv->ops.phy_write = qca8k_phy_write;
630 return 0;
631}
632
484static int 633static int
485qca8k_setup(struct dsa_switch *ds) 634qca8k_setup(struct dsa_switch *ds)
486{ 635{
@@ -502,6 +651,10 @@ qca8k_setup(struct dsa_switch *ds)
502 if (IS_ERR(priv->regmap)) 651 if (IS_ERR(priv->regmap))
503 pr_warn("regmap initialization failed"); 652 pr_warn("regmap initialization failed");
504 653
654 ret = qca8k_setup_mdio_bus(priv);
655 if (ret)
656 return ret;
657
505 /* Initialize CPU port pad mode (xMII type, delays...) */ 658 /* Initialize CPU port pad mode (xMII type, delays...) */
506 phy_mode = of_get_phy_mode(ds->ports[QCA8K_CPU_PORT].dn); 659 phy_mode = of_get_phy_mode(ds->ports[QCA8K_CPU_PORT].dn);
507 if (phy_mode < 0) { 660 if (phy_mode < 0) {
@@ -624,22 +777,6 @@ qca8k_adjust_link(struct dsa_switch *ds, int port, struct phy_device *phy)
624 qca8k_port_set_status(priv, port, 1); 777 qca8k_port_set_status(priv, port, 1);
625} 778}
626 779
627static int
628qca8k_phy_read(struct dsa_switch *ds, int phy, int regnum)
629{
630 struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
631
632 return mdiobus_read(priv->bus, phy, regnum);
633}
634
635static int
636qca8k_phy_write(struct dsa_switch *ds, int phy, int regnum, u16 val)
637{
638 struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
639
640 return mdiobus_write(priv->bus, phy, regnum, val);
641}
642
643static void 780static void
644qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data) 781qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data)
645{ 782{
@@ -879,8 +1016,6 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
879 .setup = qca8k_setup, 1016 .setup = qca8k_setup,
880 .adjust_link = qca8k_adjust_link, 1017 .adjust_link = qca8k_adjust_link,
881 .get_strings = qca8k_get_strings, 1018 .get_strings = qca8k_get_strings,
882 .phy_read = qca8k_phy_read,
883 .phy_write = qca8k_phy_write,
884 .get_ethtool_stats = qca8k_get_ethtool_stats, 1019 .get_ethtool_stats = qca8k_get_ethtool_stats,
885 .get_sset_count = qca8k_get_sset_count, 1020 .get_sset_count = qca8k_get_sset_count,
886 .get_mac_eee = qca8k_get_mac_eee, 1021 .get_mac_eee = qca8k_get_mac_eee,
@@ -923,7 +1058,8 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
923 return -ENOMEM; 1058 return -ENOMEM;
924 1059
925 priv->ds->priv = priv; 1060 priv->ds->priv = priv;
926 priv->ds->ops = &qca8k_switch_ops; 1061 priv->ops = qca8k_switch_ops;
1062 priv->ds->ops = &priv->ops;
927 mutex_init(&priv->reg_mutex); 1063 mutex_init(&priv->reg_mutex);
928 dev_set_drvdata(&mdiodev->dev, priv); 1064 dev_set_drvdata(&mdiodev->dev, priv);
929 1065
diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index d146e54c8a6c..249fd62268e5 100644
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -49,6 +49,18 @@
49#define QCA8K_MIB_FLUSH BIT(24) 49#define QCA8K_MIB_FLUSH BIT(24)
50#define QCA8K_MIB_CPU_KEEP BIT(20) 50#define QCA8K_MIB_CPU_KEEP BIT(20)
51#define QCA8K_MIB_BUSY BIT(17) 51#define QCA8K_MIB_BUSY BIT(17)
52#define QCA8K_MDIO_MASTER_CTRL 0x3c
53#define QCA8K_MDIO_MASTER_BUSY BIT(31)
54#define QCA8K_MDIO_MASTER_EN BIT(30)
55#define QCA8K_MDIO_MASTER_READ BIT(27)
56#define QCA8K_MDIO_MASTER_WRITE 0
57#define QCA8K_MDIO_MASTER_SUP_PRE BIT(26)
58#define QCA8K_MDIO_MASTER_PHY_ADDR(x) ((x) << 21)
59#define QCA8K_MDIO_MASTER_REG_ADDR(x) ((x) << 16)
60#define QCA8K_MDIO_MASTER_DATA(x) (x)
61#define QCA8K_MDIO_MASTER_DATA_MASK GENMASK(15, 0)
62#define QCA8K_MDIO_MASTER_MAX_PORTS 5
63#define QCA8K_MDIO_MASTER_MAX_REG 32
52#define QCA8K_GOL_MAC_ADDR0 0x60 64#define QCA8K_GOL_MAC_ADDR0 0x60
53#define QCA8K_GOL_MAC_ADDR1 0x64 65#define QCA8K_GOL_MAC_ADDR1 0x64
54#define QCA8K_REG_PORT_STATUS(_i) (0x07c + (_i) * 4) 66#define QCA8K_REG_PORT_STATUS(_i) (0x07c + (_i) * 4)
@@ -169,6 +181,7 @@ struct qca8k_priv {
169 struct dsa_switch *ds; 181 struct dsa_switch *ds;
170 struct mutex reg_mutex; 182 struct mutex reg_mutex;
171 struct device *dev; 183 struct device *dev;
184 struct dsa_switch_ops ops;
172}; 185};
173 186
174struct qca8k_mib_desc { 187struct qca8k_mib_desc {
diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c
index 808abb6b3671..b15752267c8d 100644
--- a/drivers/net/ethernet/3com/3c515.c
+++ b/drivers/net/ethernet/3com/3c515.c
@@ -1521,7 +1521,7 @@ static void update_stats(int ioaddr, struct net_device *dev)
1521static void set_rx_mode(struct net_device *dev) 1521static void set_rx_mode(struct net_device *dev)
1522{ 1522{
1523 int ioaddr = dev->base_addr; 1523 int ioaddr = dev->base_addr;
1524 short new_mode; 1524 unsigned short new_mode;
1525 1525
1526 if (dev->flags & IFF_PROMISC) { 1526 if (dev->flags & IFF_PROMISC) {
1527 if (corkscrew_debug > 3) 1527 if (corkscrew_debug > 3)
diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index 342ae08ec3c2..d60a86aa8aa8 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -153,8 +153,6 @@ static void dayna_block_input(struct net_device *dev, int count,
153static void dayna_block_output(struct net_device *dev, int count, 153static void dayna_block_output(struct net_device *dev, int count,
154 const unsigned char *buf, int start_page); 154 const unsigned char *buf, int start_page);
155 155
156#define memcmp_withio(a, b, c) memcmp((a), (void *)(b), (c))
157
158/* Slow Sane (16-bit chunk memory read/write) Cabletron uses this */ 156/* Slow Sane (16-bit chunk memory read/write) Cabletron uses this */
159static void slow_sane_get_8390_hdr(struct net_device *dev, 157static void slow_sane_get_8390_hdr(struct net_device *dev,
160 struct e8390_pkt_hdr *hdr, int ring_page); 158 struct e8390_pkt_hdr *hdr, int ring_page);
@@ -233,19 +231,26 @@ static enum mac8390_type mac8390_ident(struct nubus_rsrc *fres)
233 231
234static enum mac8390_access mac8390_testio(unsigned long membase) 232static enum mac8390_access mac8390_testio(unsigned long membase)
235{ 233{
236 unsigned long outdata = 0xA5A0B5B0; 234 u32 outdata = 0xA5A0B5B0;
237 unsigned long indata = 0x00000000; 235 u32 indata = 0;
236
238 /* Try writing 32 bits */ 237 /* Try writing 32 bits */
239 memcpy_toio((void __iomem *)membase, &outdata, 4); 238 nubus_writel(outdata, membase);
240 /* Now compare them */ 239 /* Now read it back */
241 if (memcmp_withio(&outdata, membase, 4) == 0) 240 indata = nubus_readl(membase);
241 if (outdata == indata)
242 return ACCESS_32; 242 return ACCESS_32;
243
244 outdata = 0xC5C0D5D0;
245 indata = 0;
246
243 /* Write 16 bit output */ 247 /* Write 16 bit output */
244 word_memcpy_tocard(membase, &outdata, 4); 248 word_memcpy_tocard(membase, &outdata, 4);
245 /* Now read it back */ 249 /* Now read it back */
246 word_memcpy_fromcard(&indata, membase, 4); 250 word_memcpy_fromcard(&indata, membase, 4);
247 if (outdata == indata) 251 if (outdata == indata)
248 return ACCESS_16; 252 return ACCESS_16;
253
249 return ACCESS_UNKNOWN; 254 return ACCESS_UNKNOWN;
250} 255}
251 256
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
index 74550ccc7a20..e2ffb159cbe2 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
@@ -186,11 +186,12 @@ static void aq_rx_checksum(struct aq_ring_s *self,
186 } 186 }
187 if (buff->is_ip_cso) { 187 if (buff->is_ip_cso) {
188 __skb_incr_checksum_unnecessary(skb); 188 __skb_incr_checksum_unnecessary(skb);
189 if (buff->is_udp_cso || buff->is_tcp_cso)
190 __skb_incr_checksum_unnecessary(skb);
191 } else { 189 } else {
192 skb->ip_summed = CHECKSUM_NONE; 190 skb->ip_summed = CHECKSUM_NONE;
193 } 191 }
192
193 if (buff->is_udp_cso || buff->is_tcp_cso)
194 __skb_incr_checksum_unnecessary(skb);
194} 195}
195 196
196#define AQ_SKB_ALIGN SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) 197#define AQ_SKB_ALIGN SKB_DATA_ALIGN(sizeof(struct skb_shared_info))
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index ad099fd01b45..1522aee81884 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3370,14 +3370,20 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
3370 *hclk = devm_clk_get(&pdev->dev, "hclk"); 3370 *hclk = devm_clk_get(&pdev->dev, "hclk");
3371 } 3371 }
3372 3372
3373 if (IS_ERR(*pclk)) { 3373 if (IS_ERR_OR_NULL(*pclk)) {
3374 err = PTR_ERR(*pclk); 3374 err = PTR_ERR(*pclk);
3375 if (!err)
3376 err = -ENODEV;
3377
3375 dev_err(&pdev->dev, "failed to get macb_clk (%u)\n", err); 3378 dev_err(&pdev->dev, "failed to get macb_clk (%u)\n", err);
3376 return err; 3379 return err;
3377 } 3380 }
3378 3381
3379 if (IS_ERR(*hclk)) { 3382 if (IS_ERR_OR_NULL(*hclk)) {
3380 err = PTR_ERR(*hclk); 3383 err = PTR_ERR(*hclk);
3384 if (!err)
3385 err = -ENODEV;
3386
3381 dev_err(&pdev->dev, "failed to get hclk (%u)\n", err); 3387 dev_err(&pdev->dev, "failed to get hclk (%u)\n", err);
3382 return err; 3388 return err;
3383 } 3389 }
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
index 3130b43bba52..02959035ed3f 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
@@ -2620,7 +2620,7 @@ static inline struct port_info *ethqset2pinfo(struct adapter *adap, int qset)
2620 } 2620 }
2621 2621
2622 /* should never happen! */ 2622 /* should never happen! */
2623 BUG_ON(1); 2623 BUG();
2624 return NULL; 2624 return NULL;
2625} 2625}
2626 2626
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index 88773ca58e6b..b3da81e90132 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -476,7 +476,7 @@ static inline int get_buf_size(struct adapter *adapter,
476 break; 476 break;
477 477
478 default: 478 default:
479 BUG_ON(1); 479 BUG();
480 } 480 }
481 481
482 return buf_size; 482 return buf_size;
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 2ba49e959c3f..dc339dc1adb2 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -815,6 +815,14 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)
815 */ 815 */
816 queue_mapping = skb_get_queue_mapping(skb); 816 queue_mapping = skb_get_queue_mapping(skb);
817 fq = &priv->fq[queue_mapping]; 817 fq = &priv->fq[queue_mapping];
818
819 fd_len = dpaa2_fd_get_len(&fd);
820 nq = netdev_get_tx_queue(net_dev, queue_mapping);
821 netdev_tx_sent_queue(nq, fd_len);
822
823 /* Everything that happens after this enqueues might race with
824 * the Tx confirmation callback for this frame
825 */
818 for (i = 0; i < DPAA2_ETH_ENQUEUE_RETRIES; i++) { 826 for (i = 0; i < DPAA2_ETH_ENQUEUE_RETRIES; i++) {
819 err = priv->enqueue(priv, fq, &fd, 0); 827 err = priv->enqueue(priv, fq, &fd, 0);
820 if (err != -EBUSY) 828 if (err != -EBUSY)
@@ -825,13 +833,10 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)
825 percpu_stats->tx_errors++; 833 percpu_stats->tx_errors++;
826 /* Clean up everything, including freeing the skb */ 834 /* Clean up everything, including freeing the skb */
827 free_tx_fd(priv, fq, &fd, false); 835 free_tx_fd(priv, fq, &fd, false);
836 netdev_tx_completed_queue(nq, 1, fd_len);
828 } else { 837 } else {
829 fd_len = dpaa2_fd_get_len(&fd);
830 percpu_stats->tx_packets++; 838 percpu_stats->tx_packets++;
831 percpu_stats->tx_bytes += fd_len; 839 percpu_stats->tx_bytes += fd_len;
832
833 nq = netdev_get_tx_queue(net_dev, queue_mapping);
834 netdev_tx_sent_queue(nq, fd_len);
835 } 840 }
836 841
837 return NETDEV_TX_OK; 842 return NETDEV_TX_OK;
@@ -1817,7 +1822,7 @@ static int dpaa2_eth_xdp_xmit_frame(struct net_device *net_dev,
1817 dpaa2_fd_set_format(&fd, dpaa2_fd_single); 1822 dpaa2_fd_set_format(&fd, dpaa2_fd_single);
1818 dpaa2_fd_set_ctrl(&fd, FD_CTRL_PTA); 1823 dpaa2_fd_set_ctrl(&fd, FD_CTRL_PTA);
1819 1824
1820 fq = &priv->fq[smp_processor_id()]; 1825 fq = &priv->fq[smp_processor_id() % dpaa2_eth_queue_count(priv)];
1821 for (i = 0; i < DPAA2_ETH_ENQUEUE_RETRIES; i++) { 1826 for (i = 0; i < DPAA2_ETH_ENQUEUE_RETRIES; i++) {
1822 err = priv->enqueue(priv, fq, &fd, 0); 1827 err = priv->enqueue(priv, fq, &fd, 0);
1823 if (err != -EBUSY) 1828 if (err != -EBUSY)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 1c1f17ec6be2..162cb9afa0e7 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -22,6 +22,7 @@
22#include "hns3_enet.h" 22#include "hns3_enet.h"
23 23
24#define hns3_set_field(origin, shift, val) ((origin) |= ((val) << (shift))) 24#define hns3_set_field(origin, shift, val) ((origin) |= ((val) << (shift)))
25#define hns3_tx_bd_count(S) DIV_ROUND_UP(S, HNS3_MAX_BD_SIZE)
25 26
26static void hns3_clear_all_ring(struct hnae3_handle *h); 27static void hns3_clear_all_ring(struct hnae3_handle *h);
27static void hns3_force_clear_all_rx_ring(struct hnae3_handle *h); 28static void hns3_force_clear_all_rx_ring(struct hnae3_handle *h);
@@ -1079,7 +1080,7 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,
1079 1080
1080 desc_cb->length = size; 1081 desc_cb->length = size;
1081 1082
1082 frag_buf_num = (size + HNS3_MAX_BD_SIZE - 1) >> HNS3_MAX_BD_SIZE_OFFSET; 1083 frag_buf_num = hns3_tx_bd_count(size);
1083 sizeoflast = size & HNS3_TX_LAST_SIZE_M; 1084 sizeoflast = size & HNS3_TX_LAST_SIZE_M;
1084 sizeoflast = sizeoflast ? sizeoflast : HNS3_MAX_BD_SIZE; 1085 sizeoflast = sizeoflast ? sizeoflast : HNS3_MAX_BD_SIZE;
1085 1086
@@ -1124,14 +1125,13 @@ static int hns3_nic_maybe_stop_tso(struct sk_buff **out_skb, int *bnum,
1124 int i; 1125 int i;
1125 1126
1126 size = skb_headlen(skb); 1127 size = skb_headlen(skb);
1127 buf_num = (size + HNS3_MAX_BD_SIZE - 1) >> HNS3_MAX_BD_SIZE_OFFSET; 1128 buf_num = hns3_tx_bd_count(size);
1128 1129
1129 frag_num = skb_shinfo(skb)->nr_frags; 1130 frag_num = skb_shinfo(skb)->nr_frags;
1130 for (i = 0; i < frag_num; i++) { 1131 for (i = 0; i < frag_num; i++) {
1131 frag = &skb_shinfo(skb)->frags[i]; 1132 frag = &skb_shinfo(skb)->frags[i];
1132 size = skb_frag_size(frag); 1133 size = skb_frag_size(frag);
1133 bdnum_for_frag = (size + HNS3_MAX_BD_SIZE - 1) >> 1134 bdnum_for_frag = hns3_tx_bd_count(size);
1134 HNS3_MAX_BD_SIZE_OFFSET;
1135 if (unlikely(bdnum_for_frag > HNS3_MAX_BD_PER_FRAG)) 1135 if (unlikely(bdnum_for_frag > HNS3_MAX_BD_PER_FRAG))
1136 return -ENOMEM; 1136 return -ENOMEM;
1137 1137
@@ -1139,8 +1139,7 @@ static int hns3_nic_maybe_stop_tso(struct sk_buff **out_skb, int *bnum,
1139 } 1139 }
1140 1140
1141 if (unlikely(buf_num > HNS3_MAX_BD_PER_FRAG)) { 1141 if (unlikely(buf_num > HNS3_MAX_BD_PER_FRAG)) {
1142 buf_num = (skb->len + HNS3_MAX_BD_SIZE - 1) >> 1142 buf_num = hns3_tx_bd_count(skb->len);
1143 HNS3_MAX_BD_SIZE_OFFSET;
1144 if (ring_space(ring) < buf_num) 1143 if (ring_space(ring) < buf_num)
1145 return -EBUSY; 1144 return -EBUSY;
1146 /* manual split the send packet */ 1145 /* manual split the send packet */
@@ -1169,7 +1168,7 @@ static int hns3_nic_maybe_stop_tx(struct sk_buff **out_skb, int *bnum,
1169 buf_num = skb_shinfo(skb)->nr_frags + 1; 1168 buf_num = skb_shinfo(skb)->nr_frags + 1;
1170 1169
1171 if (unlikely(buf_num > HNS3_MAX_BD_PER_FRAG)) { 1170 if (unlikely(buf_num > HNS3_MAX_BD_PER_FRAG)) {
1172 buf_num = (skb->len + HNS3_MAX_BD_SIZE - 1) / HNS3_MAX_BD_SIZE; 1171 buf_num = hns3_tx_bd_count(skb->len);
1173 if (ring_space(ring) < buf_num) 1172 if (ring_space(ring) < buf_num)
1174 return -EBUSY; 1173 return -EBUSY;
1175 /* manual split the send packet */ 1174 /* manual split the send packet */
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
index 1db0bd41d209..75669cd0c311 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -193,7 +193,6 @@ enum hns3_nic_state {
193#define HNS3_VECTOR_INITED 1 193#define HNS3_VECTOR_INITED 1
194 194
195#define HNS3_MAX_BD_SIZE 65535 195#define HNS3_MAX_BD_SIZE 65535
196#define HNS3_MAX_BD_SIZE_OFFSET 16
197#define HNS3_MAX_BD_PER_FRAG 8 196#define HNS3_MAX_BD_PER_FRAG 8
198#define HNS3_MAX_BD_PER_PKT MAX_SKB_FRAGS 197#define HNS3_MAX_BD_PER_PKT MAX_SKB_FRAGS
199 198
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 3baabdc89726..90b62c1412c8 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -3160,6 +3160,7 @@ static ssize_t ehea_probe_port(struct device *dev,
3160 3160
3161 if (ehea_add_adapter_mr(adapter)) { 3161 if (ehea_add_adapter_mr(adapter)) {
3162 pr_err("creating MR failed\n"); 3162 pr_err("creating MR failed\n");
3163 of_node_put(eth_dn);
3163 return -EIO; 3164 return -EIO;
3164 } 3165 }
3165 3166
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
index 7a15e932ed2f..c1c1965d7acc 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
@@ -113,7 +113,7 @@ int mlxsw_env_module_temp_thresholds_get(struct mlxsw_core *core, int module,
113 return 0; 113 return 0;
114 default: 114 default:
115 /* Do not consider thresholds for zero temperature. */ 115 /* Do not consider thresholds for zero temperature. */
116 if (!MLXSW_REG_MTMP_TEMP_TO_MC(module_temp)) { 116 if (MLXSW_REG_MTMP_TEMP_TO_MC(module_temp) == 0) {
117 *temp = 0; 117 *temp = 0;
118 return 0; 118 return 0;
119 } 119 }
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index bd6e9014bc74..7849119d407a 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -142,6 +142,12 @@ struct ks8851_net {
142 142
143static int msg_enable; 143static int msg_enable;
144 144
145/* SPI frame opcodes */
146#define KS_SPIOP_RD (0x00)
147#define KS_SPIOP_WR (0x40)
148#define KS_SPIOP_RXFIFO (0x80)
149#define KS_SPIOP_TXFIFO (0xC0)
150
145/* shift for byte-enable data */ 151/* shift for byte-enable data */
146#define BYTE_EN(_x) ((_x) << 2) 152#define BYTE_EN(_x) ((_x) << 2)
147 153
@@ -535,9 +541,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
535 /* set dma read address */ 541 /* set dma read address */
536 ks8851_wrreg16(ks, KS_RXFDPR, RXFDPR_RXFPAI | 0x00); 542 ks8851_wrreg16(ks, KS_RXFDPR, RXFDPR_RXFPAI | 0x00);
537 543
538 /* start the packet dma process, and set auto-dequeue rx */ 544 /* start DMA access */
539 ks8851_wrreg16(ks, KS_RXQCR, 545 ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA);
540 ks->rc_rxqcr | RXQCR_SDA | RXQCR_ADRFE);
541 546
542 if (rxlen > 4) { 547 if (rxlen > 4) {
543 unsigned int rxalign; 548 unsigned int rxalign;
@@ -568,7 +573,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
568 } 573 }
569 } 574 }
570 575
571 ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr); 576 /* end DMA access and dequeue packet */
577 ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_RRXEF);
572 } 578 }
573} 579}
574 580
@@ -785,6 +791,15 @@ static void ks8851_tx_work(struct work_struct *work)
785static int ks8851_net_open(struct net_device *dev) 791static int ks8851_net_open(struct net_device *dev)
786{ 792{
787 struct ks8851_net *ks = netdev_priv(dev); 793 struct ks8851_net *ks = netdev_priv(dev);
794 int ret;
795
796 ret = request_threaded_irq(dev->irq, NULL, ks8851_irq,
797 IRQF_TRIGGER_LOW | IRQF_ONESHOT,
798 dev->name, ks);
799 if (ret < 0) {
800 netdev_err(dev, "failed to get irq\n");
801 return ret;
802 }
788 803
789 /* lock the card, even if we may not actually be doing anything 804 /* lock the card, even if we may not actually be doing anything
790 * else at the moment */ 805 * else at the moment */
@@ -849,6 +864,7 @@ static int ks8851_net_open(struct net_device *dev)
849 netif_dbg(ks, ifup, ks->netdev, "network device up\n"); 864 netif_dbg(ks, ifup, ks->netdev, "network device up\n");
850 865
851 mutex_unlock(&ks->lock); 866 mutex_unlock(&ks->lock);
867 mii_check_link(&ks->mii);
852 return 0; 868 return 0;
853} 869}
854 870
@@ -899,6 +915,8 @@ static int ks8851_net_stop(struct net_device *dev)
899 dev_kfree_skb(txb); 915 dev_kfree_skb(txb);
900 } 916 }
901 917
918 free_irq(dev->irq, ks);
919
902 return 0; 920 return 0;
903} 921}
904 922
@@ -1508,6 +1526,7 @@ static int ks8851_probe(struct spi_device *spi)
1508 1526
1509 spi_set_drvdata(spi, ks); 1527 spi_set_drvdata(spi, ks);
1510 1528
1529 netif_carrier_off(ks->netdev);
1511 ndev->if_port = IF_PORT_100BASET; 1530 ndev->if_port = IF_PORT_100BASET;
1512 ndev->netdev_ops = &ks8851_netdev_ops; 1531 ndev->netdev_ops = &ks8851_netdev_ops;
1513 ndev->irq = spi->irq; 1532 ndev->irq = spi->irq;
@@ -1529,14 +1548,6 @@ static int ks8851_probe(struct spi_device *spi)
1529 ks8851_read_selftest(ks); 1548 ks8851_read_selftest(ks);
1530 ks8851_init_mac(ks); 1549 ks8851_init_mac(ks);
1531 1550
1532 ret = request_threaded_irq(spi->irq, NULL, ks8851_irq,
1533 IRQF_TRIGGER_LOW | IRQF_ONESHOT,
1534 ndev->name, ks);
1535 if (ret < 0) {
1536 dev_err(&spi->dev, "failed to get irq\n");
1537 goto err_irq;
1538 }
1539
1540 ret = register_netdev(ndev); 1551 ret = register_netdev(ndev);
1541 if (ret) { 1552 if (ret) {
1542 dev_err(&spi->dev, "failed to register network device\n"); 1553 dev_err(&spi->dev, "failed to register network device\n");
@@ -1549,14 +1560,10 @@ static int ks8851_probe(struct spi_device *spi)
1549 1560
1550 return 0; 1561 return 0;
1551 1562
1552
1553err_netdev: 1563err_netdev:
1554 free_irq(ndev->irq, ks); 1564err_id:
1555
1556err_irq:
1557 if (gpio_is_valid(gpio)) 1565 if (gpio_is_valid(gpio))
1558 gpio_set_value(gpio, 0); 1566 gpio_set_value(gpio, 0);
1559err_id:
1560 regulator_disable(ks->vdd_reg); 1567 regulator_disable(ks->vdd_reg);
1561err_reg: 1568err_reg:
1562 regulator_disable(ks->vdd_io); 1569 regulator_disable(ks->vdd_io);
@@ -1574,7 +1581,6 @@ static int ks8851_remove(struct spi_device *spi)
1574 dev_info(&spi->dev, "remove\n"); 1581 dev_info(&spi->dev, "remove\n");
1575 1582
1576 unregister_netdev(priv->netdev); 1583 unregister_netdev(priv->netdev);
1577 free_irq(spi->irq, priv);
1578 if (gpio_is_valid(priv->gpio)) 1584 if (gpio_is_valid(priv->gpio))
1579 gpio_set_value(priv->gpio, 0); 1585 gpio_set_value(priv->gpio, 0);
1580 regulator_disable(priv->vdd_reg); 1586 regulator_disable(priv->vdd_reg);
diff --git a/drivers/net/ethernet/micrel/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h
index 852256ef1f22..23da1e3ee429 100644
--- a/drivers/net/ethernet/micrel/ks8851.h
+++ b/drivers/net/ethernet/micrel/ks8851.h
@@ -11,9 +11,15 @@
11*/ 11*/
12 12
13#define KS_CCR 0x08 13#define KS_CCR 0x08
14#define CCR_LE (1 << 10) /* KSZ8851-16MLL */
14#define CCR_EEPROM (1 << 9) 15#define CCR_EEPROM (1 << 9)
15#define CCR_SPI (1 << 8) 16#define CCR_SPI (1 << 8) /* KSZ8851SNL */
16#define CCR_32PIN (1 << 0) 17#define CCR_8BIT (1 << 7) /* KSZ8851-16MLL */
18#define CCR_16BIT (1 << 6) /* KSZ8851-16MLL */
19#define CCR_32BIT (1 << 5) /* KSZ8851-16MLL */
20#define CCR_SHARED (1 << 4) /* KSZ8851-16MLL */
21#define CCR_48PIN (1 << 1) /* KSZ8851-16MLL */
22#define CCR_32PIN (1 << 0) /* KSZ8851SNL */
17 23
18/* MAC address registers */ 24/* MAC address registers */
19#define KS_MAR(_m) (0x15 - (_m)) 25#define KS_MAR(_m) (0x15 - (_m))
@@ -112,13 +118,13 @@
112#define RXCR1_RXE (1 << 0) 118#define RXCR1_RXE (1 << 0)
113 119
114#define KS_RXCR2 0x76 120#define KS_RXCR2 0x76
115#define RXCR2_SRDBL_MASK (0x7 << 5) 121#define RXCR2_SRDBL_MASK (0x7 << 5) /* KSZ8851SNL */
116#define RXCR2_SRDBL_SHIFT (5) 122#define RXCR2_SRDBL_SHIFT (5) /* KSZ8851SNL */
117#define RXCR2_SRDBL_4B (0x0 << 5) 123#define RXCR2_SRDBL_4B (0x0 << 5) /* KSZ8851SNL */
118#define RXCR2_SRDBL_8B (0x1 << 5) 124#define RXCR2_SRDBL_8B (0x1 << 5) /* KSZ8851SNL */
119#define RXCR2_SRDBL_16B (0x2 << 5) 125#define RXCR2_SRDBL_16B (0x2 << 5) /* KSZ8851SNL */
120#define RXCR2_SRDBL_32B (0x3 << 5) 126#define RXCR2_SRDBL_32B (0x3 << 5) /* KSZ8851SNL */
121#define RXCR2_SRDBL_FRAME (0x4 << 5) 127#define RXCR2_SRDBL_FRAME (0x4 << 5) /* KSZ8851SNL */
122#define RXCR2_IUFFP (1 << 4) 128#define RXCR2_IUFFP (1 << 4)
123#define RXCR2_RXIUFCEZ (1 << 3) 129#define RXCR2_RXIUFCEZ (1 << 3)
124#define RXCR2_UDPLFE (1 << 2) 130#define RXCR2_UDPLFE (1 << 2)
@@ -143,8 +149,10 @@
143#define RXFSHR_RXCE (1 << 0) 149#define RXFSHR_RXCE (1 << 0)
144 150
145#define KS_RXFHBCR 0x7E 151#define KS_RXFHBCR 0x7E
152#define RXFHBCR_CNT_MASK (0xfff << 0)
153
146#define KS_TXQCR 0x80 154#define KS_TXQCR 0x80
147#define TXQCR_AETFE (1 << 2) 155#define TXQCR_AETFE (1 << 2) /* KSZ8851SNL */
148#define TXQCR_TXQMAM (1 << 1) 156#define TXQCR_TXQMAM (1 << 1)
149#define TXQCR_METFE (1 << 0) 157#define TXQCR_METFE (1 << 0)
150 158
@@ -167,6 +175,10 @@
167 175
168#define KS_RXFDPR 0x86 176#define KS_RXFDPR 0x86
169#define RXFDPR_RXFPAI (1 << 14) 177#define RXFDPR_RXFPAI (1 << 14)
178#define RXFDPR_WST (1 << 12) /* KSZ8851-16MLL */
179#define RXFDPR_EMS (1 << 11) /* KSZ8851-16MLL */
180#define RXFDPR_RXFP_MASK (0x7ff << 0)
181#define RXFDPR_RXFP_SHIFT (0)
170 182
171#define KS_RXDTTR 0x8C 183#define KS_RXDTTR 0x8C
172#define KS_RXDBCTR 0x8E 184#define KS_RXDBCTR 0x8E
@@ -184,7 +196,7 @@
184#define IRQ_RXMPDI (1 << 4) 196#define IRQ_RXMPDI (1 << 4)
185#define IRQ_LDI (1 << 3) 197#define IRQ_LDI (1 << 3)
186#define IRQ_EDI (1 << 2) 198#define IRQ_EDI (1 << 2)
187#define IRQ_SPIBEI (1 << 1) 199#define IRQ_SPIBEI (1 << 1) /* KSZ8851SNL */
188#define IRQ_DEDI (1 << 0) 200#define IRQ_DEDI (1 << 0)
189 201
190#define KS_RXFCTR 0x9C 202#define KS_RXFCTR 0x9C
@@ -257,42 +269,37 @@
257#define KS_P1ANLPR 0xEE 269#define KS_P1ANLPR 0xEE
258 270
259#define KS_P1SCLMD 0xF4 271#define KS_P1SCLMD 0xF4
260#define P1SCLMD_LEDOFF (1 << 15)
261#define P1SCLMD_TXIDS (1 << 14)
262#define P1SCLMD_RESTARTAN (1 << 13)
263#define P1SCLMD_DISAUTOMDIX (1 << 10)
264#define P1SCLMD_FORCEMDIX (1 << 9)
265#define P1SCLMD_AUTONEGEN (1 << 7)
266#define P1SCLMD_FORCE100 (1 << 6)
267#define P1SCLMD_FORCEFDX (1 << 5)
268#define P1SCLMD_ADV_FLOW (1 << 4)
269#define P1SCLMD_ADV_100BT_FDX (1 << 3)
270#define P1SCLMD_ADV_100BT_HDX (1 << 2)
271#define P1SCLMD_ADV_10BT_FDX (1 << 1)
272#define P1SCLMD_ADV_10BT_HDX (1 << 0)
273 272
274#define KS_P1CR 0xF6 273#define KS_P1CR 0xF6
275#define P1CR_HP_MDIX (1 << 15) 274#define P1CR_LEDOFF (1 << 15)
276#define P1CR_REV_POL (1 << 13) 275#define P1CR_TXIDS (1 << 14)
277#define P1CR_OP_100M (1 << 10) 276#define P1CR_RESTARTAN (1 << 13)
278#define P1CR_OP_FDX (1 << 9) 277#define P1CR_DISAUTOMDIX (1 << 10)
279#define P1CR_OP_MDI (1 << 7) 278#define P1CR_FORCEMDIX (1 << 9)
280#define P1CR_AN_DONE (1 << 6) 279#define P1CR_AUTONEGEN (1 << 7)
281#define P1CR_LINK_GOOD (1 << 5) 280#define P1CR_FORCE100 (1 << 6)
282#define P1CR_PNTR_FLOW (1 << 4) 281#define P1CR_FORCEFDX (1 << 5)
283#define P1CR_PNTR_100BT_FDX (1 << 3) 282#define P1CR_ADV_FLOW (1 << 4)
284#define P1CR_PNTR_100BT_HDX (1 << 2) 283#define P1CR_ADV_100BT_FDX (1 << 3)
285#define P1CR_PNTR_10BT_FDX (1 << 1) 284#define P1CR_ADV_100BT_HDX (1 << 2)
286#define P1CR_PNTR_10BT_HDX (1 << 0) 285#define P1CR_ADV_10BT_FDX (1 << 1)
286#define P1CR_ADV_10BT_HDX (1 << 0)
287
288#define KS_P1SR 0xF8
289#define P1SR_HP_MDIX (1 << 15)
290#define P1SR_REV_POL (1 << 13)
291#define P1SR_OP_100M (1 << 10)
292#define P1SR_OP_FDX (1 << 9)
293#define P1SR_OP_MDI (1 << 7)
294#define P1SR_AN_DONE (1 << 6)
295#define P1SR_LINK_GOOD (1 << 5)
296#define P1SR_PNTR_FLOW (1 << 4)
297#define P1SR_PNTR_100BT_FDX (1 << 3)
298#define P1SR_PNTR_100BT_HDX (1 << 2)
299#define P1SR_PNTR_10BT_FDX (1 << 1)
300#define P1SR_PNTR_10BT_HDX (1 << 0)
287 301
288/* TX Frame control */ 302/* TX Frame control */
289
290#define TXFR_TXIC (1 << 15) 303#define TXFR_TXIC (1 << 15)
291#define TXFR_TXFID_MASK (0x3f << 0) 304#define TXFR_TXFID_MASK (0x3f << 0)
292#define TXFR_TXFID_SHIFT (0) 305#define TXFR_TXFID_SHIFT (0)
293
294/* SPI frame opcodes */
295#define KS_SPIOP_RD (0x00)
296#define KS_SPIOP_WR (0x40)
297#define KS_SPIOP_RXFIFO (0x80)
298#define KS_SPIOP_TXFIFO (0xC0)
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 35f8c9ef204d..c946841c0a06 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -40,6 +40,8 @@
40#include <linux/of_device.h> 40#include <linux/of_device.h>
41#include <linux/of_net.h> 41#include <linux/of_net.h>
42 42
43#include "ks8851.h"
44
43#define DRV_NAME "ks8851_mll" 45#define DRV_NAME "ks8851_mll"
44 46
45static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x86, 0x95, 0x11 }; 47static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x86, 0x95, 0x11 };
@@ -48,319 +50,10 @@ static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x86, 0x95, 0x11 };
48#define TX_BUF_SIZE 2000 50#define TX_BUF_SIZE 2000
49#define RX_BUF_SIZE 2000 51#define RX_BUF_SIZE 2000
50 52
51#define KS_CCR 0x08
52#define CCR_EEPROM (1 << 9)
53#define CCR_SPI (1 << 8)
54#define CCR_8BIT (1 << 7)
55#define CCR_16BIT (1 << 6)
56#define CCR_32BIT (1 << 5)
57#define CCR_SHARED (1 << 4)
58#define CCR_32PIN (1 << 0)
59
60/* MAC address registers */
61#define KS_MARL 0x10
62#define KS_MARM 0x12
63#define KS_MARH 0x14
64
65#define KS_OBCR 0x20
66#define OBCR_ODS_16MA (1 << 6)
67
68#define KS_EEPCR 0x22
69#define EEPCR_EESA (1 << 4)
70#define EEPCR_EESB (1 << 3)
71#define EEPCR_EEDO (1 << 2)
72#define EEPCR_EESCK (1 << 1)
73#define EEPCR_EECS (1 << 0)
74
75#define KS_MBIR 0x24
76#define MBIR_TXMBF (1 << 12)
77#define MBIR_TXMBFA (1 << 11)
78#define MBIR_RXMBF (1 << 4)
79#define MBIR_RXMBFA (1 << 3)
80
81#define KS_GRR 0x26
82#define GRR_QMU (1 << 1)
83#define GRR_GSR (1 << 0)
84
85#define KS_WFCR 0x2A
86#define WFCR_MPRXE (1 << 7)
87#define WFCR_WF3E (1 << 3)
88#define WFCR_WF2E (1 << 2)
89#define WFCR_WF1E (1 << 1)
90#define WFCR_WF0E (1 << 0)
91
92#define KS_WF0CRC0 0x30
93#define KS_WF0CRC1 0x32
94#define KS_WF0BM0 0x34
95#define KS_WF0BM1 0x36
96#define KS_WF0BM2 0x38
97#define KS_WF0BM3 0x3A
98
99#define KS_WF1CRC0 0x40
100#define KS_WF1CRC1 0x42
101#define KS_WF1BM0 0x44
102#define KS_WF1BM1 0x46
103#define KS_WF1BM2 0x48
104#define KS_WF1BM3 0x4A
105
106#define KS_WF2CRC0 0x50
107#define KS_WF2CRC1 0x52
108#define KS_WF2BM0 0x54
109#define KS_WF2BM1 0x56
110#define KS_WF2BM2 0x58
111#define KS_WF2BM3 0x5A
112
113#define KS_WF3CRC0 0x60
114#define KS_WF3CRC1 0x62
115#define KS_WF3BM0 0x64
116#define KS_WF3BM1 0x66
117#define KS_WF3BM2 0x68
118#define KS_WF3BM3 0x6A
119
120#define KS_TXCR 0x70
121#define TXCR_TCGICMP (1 << 8)
122#define TXCR_TCGUDP (1 << 7)
123#define TXCR_TCGTCP (1 << 6)
124#define TXCR_TCGIP (1 << 5)
125#define TXCR_FTXQ (1 << 4)
126#define TXCR_TXFCE (1 << 3)
127#define TXCR_TXPE (1 << 2)
128#define TXCR_TXCRC (1 << 1)
129#define TXCR_TXE (1 << 0)
130
131#define KS_TXSR 0x72
132#define TXSR_TXLC (1 << 13)
133#define TXSR_TXMC (1 << 12)
134#define TXSR_TXFID_MASK (0x3f << 0)
135#define TXSR_TXFID_SHIFT (0)
136#define TXSR_TXFID_GET(_v) (((_v) >> 0) & 0x3f)
137
138
139#define KS_RXCR1 0x74
140#define RXCR1_FRXQ (1 << 15)
141#define RXCR1_RXUDPFCC (1 << 14)
142#define RXCR1_RXTCPFCC (1 << 13)
143#define RXCR1_RXIPFCC (1 << 12)
144#define RXCR1_RXPAFMA (1 << 11)
145#define RXCR1_RXFCE (1 << 10)
146#define RXCR1_RXEFE (1 << 9)
147#define RXCR1_RXMAFMA (1 << 8)
148#define RXCR1_RXBE (1 << 7)
149#define RXCR1_RXME (1 << 6)
150#define RXCR1_RXUE (1 << 5)
151#define RXCR1_RXAE (1 << 4)
152#define RXCR1_RXINVF (1 << 1)
153#define RXCR1_RXE (1 << 0)
154#define RXCR1_FILTER_MASK (RXCR1_RXINVF | RXCR1_RXAE | \ 53#define RXCR1_FILTER_MASK (RXCR1_RXINVF | RXCR1_RXAE | \
155 RXCR1_RXMAFMA | RXCR1_RXPAFMA) 54 RXCR1_RXMAFMA | RXCR1_RXPAFMA)
156
157#define KS_RXCR2 0x76
158#define RXCR2_SRDBL_MASK (0x7 << 5)
159#define RXCR2_SRDBL_SHIFT (5)
160#define RXCR2_SRDBL_4B (0x0 << 5)
161#define RXCR2_SRDBL_8B (0x1 << 5)
162#define RXCR2_SRDBL_16B (0x2 << 5)
163#define RXCR2_SRDBL_32B (0x3 << 5)
164/* #define RXCR2_SRDBL_FRAME (0x4 << 5) */
165#define RXCR2_IUFFP (1 << 4)
166#define RXCR2_RXIUFCEZ (1 << 3)
167#define RXCR2_UDPLFE (1 << 2)
168#define RXCR2_RXICMPFCC (1 << 1)
169#define RXCR2_RXSAF (1 << 0)
170
171#define KS_TXMIR 0x78
172
173#define KS_RXFHSR 0x7C
174#define RXFSHR_RXFV (1 << 15)
175#define RXFSHR_RXICMPFCS (1 << 13)
176#define RXFSHR_RXIPFCS (1 << 12)
177#define RXFSHR_RXTCPFCS (1 << 11)
178#define RXFSHR_RXUDPFCS (1 << 10)
179#define RXFSHR_RXBF (1 << 7)
180#define RXFSHR_RXMF (1 << 6)
181#define RXFSHR_RXUF (1 << 5)
182#define RXFSHR_RXMR (1 << 4)
183#define RXFSHR_RXFT (1 << 3)
184#define RXFSHR_RXFTL (1 << 2)
185#define RXFSHR_RXRF (1 << 1)
186#define RXFSHR_RXCE (1 << 0)
187#define RXFSHR_ERR (RXFSHR_RXCE | RXFSHR_RXRF |\
188 RXFSHR_RXFTL | RXFSHR_RXMR |\
189 RXFSHR_RXICMPFCS | RXFSHR_RXIPFCS |\
190 RXFSHR_RXTCPFCS)
191#define KS_RXFHBCR 0x7E
192#define RXFHBCR_CNT_MASK 0x0FFF
193
194#define KS_TXQCR 0x80
195#define TXQCR_AETFE (1 << 2)
196#define TXQCR_TXQMAM (1 << 1)
197#define TXQCR_METFE (1 << 0)
198
199#define KS_RXQCR 0x82
200#define RXQCR_RXDTTS (1 << 12)
201#define RXQCR_RXDBCTS (1 << 11)
202#define RXQCR_RXFCTS (1 << 10)
203#define RXQCR_RXIPHTOE (1 << 9)
204#define RXQCR_RXDTTE (1 << 7)
205#define RXQCR_RXDBCTE (1 << 6)
206#define RXQCR_RXFCTE (1 << 5)
207#define RXQCR_ADRFE (1 << 4)
208#define RXQCR_SDA (1 << 3)
209#define RXQCR_RRXEF (1 << 0)
210#define RXQCR_CMD_CNTL (RXQCR_RXFCTE|RXQCR_ADRFE) 55#define RXQCR_CMD_CNTL (RXQCR_RXFCTE|RXQCR_ADRFE)
211 56
212#define KS_TXFDPR 0x84
213#define TXFDPR_TXFPAI (1 << 14)
214#define TXFDPR_TXFP_MASK (0x7ff << 0)
215#define TXFDPR_TXFP_SHIFT (0)
216
217#define KS_RXFDPR 0x86
218#define RXFDPR_RXFPAI (1 << 14)
219
220#define KS_RXDTTR 0x8C
221#define KS_RXDBCTR 0x8E
222
223#define KS_IER 0x90
224#define KS_ISR 0x92
225#define IRQ_LCI (1 << 15)
226#define IRQ_TXI (1 << 14)
227#define IRQ_RXI (1 << 13)
228#define IRQ_RXOI (1 << 11)
229#define IRQ_TXPSI (1 << 9)
230#define IRQ_RXPSI (1 << 8)
231#define IRQ_TXSAI (1 << 6)
232#define IRQ_RXWFDI (1 << 5)
233#define IRQ_RXMPDI (1 << 4)
234#define IRQ_LDI (1 << 3)
235#define IRQ_EDI (1 << 2)
236#define IRQ_SPIBEI (1 << 1)
237#define IRQ_DEDI (1 << 0)
238
239#define KS_RXFCTR 0x9C
240#define RXFCTR_THRESHOLD_MASK 0x00FF
241
242#define KS_RXFC 0x9D
243#define RXFCTR_RXFC_MASK (0xff << 8)
244#define RXFCTR_RXFC_SHIFT (8)
245#define RXFCTR_RXFC_GET(_v) (((_v) >> 8) & 0xff)
246#define RXFCTR_RXFCT_MASK (0xff << 0)
247#define RXFCTR_RXFCT_SHIFT (0)
248
249#define KS_TXNTFSR 0x9E
250
251#define KS_MAHTR0 0xA0
252#define KS_MAHTR1 0xA2
253#define KS_MAHTR2 0xA4
254#define KS_MAHTR3 0xA6
255
256#define KS_FCLWR 0xB0
257#define KS_FCHWR 0xB2
258#define KS_FCOWR 0xB4
259
260#define KS_CIDER 0xC0
261#define CIDER_ID 0x8870
262#define CIDER_REV_MASK (0x7 << 1)
263#define CIDER_REV_SHIFT (1)
264#define CIDER_REV_GET(_v) (((_v) >> 1) & 0x7)
265
266#define KS_CGCR 0xC6
267#define KS_IACR 0xC8
268#define IACR_RDEN (1 << 12)
269#define IACR_TSEL_MASK (0x3 << 10)
270#define IACR_TSEL_SHIFT (10)
271#define IACR_TSEL_MIB (0x3 << 10)
272#define IACR_ADDR_MASK (0x1f << 0)
273#define IACR_ADDR_SHIFT (0)
274
275#define KS_IADLR 0xD0
276#define KS_IAHDR 0xD2
277
278#define KS_PMECR 0xD4
279#define PMECR_PME_DELAY (1 << 14)
280#define PMECR_PME_POL (1 << 12)
281#define PMECR_WOL_WAKEUP (1 << 11)
282#define PMECR_WOL_MAGICPKT (1 << 10)
283#define PMECR_WOL_LINKUP (1 << 9)
284#define PMECR_WOL_ENERGY (1 << 8)
285#define PMECR_AUTO_WAKE_EN (1 << 7)
286#define PMECR_WAKEUP_NORMAL (1 << 6)
287#define PMECR_WKEVT_MASK (0xf << 2)
288#define PMECR_WKEVT_SHIFT (2)
289#define PMECR_WKEVT_GET(_v) (((_v) >> 2) & 0xf)
290#define PMECR_WKEVT_ENERGY (0x1 << 2)
291#define PMECR_WKEVT_LINK (0x2 << 2)
292#define PMECR_WKEVT_MAGICPKT (0x4 << 2)
293#define PMECR_WKEVT_FRAME (0x8 << 2)
294#define PMECR_PM_MASK (0x3 << 0)
295#define PMECR_PM_SHIFT (0)
296#define PMECR_PM_NORMAL (0x0 << 0)
297#define PMECR_PM_ENERGY (0x1 << 0)
298#define PMECR_PM_SOFTDOWN (0x2 << 0)
299#define PMECR_PM_POWERSAVE (0x3 << 0)
300
301/* Standard MII PHY data */
302#define KS_P1MBCR 0xE4
303#define P1MBCR_FORCE_FDX (1 << 8)
304
305#define KS_P1MBSR 0xE6
306#define P1MBSR_AN_COMPLETE (1 << 5)
307#define P1MBSR_AN_CAPABLE (1 << 3)
308#define P1MBSR_LINK_UP (1 << 2)
309
310#define KS_PHY1ILR 0xE8
311#define KS_PHY1IHR 0xEA
312#define KS_P1ANAR 0xEC
313#define KS_P1ANLPR 0xEE
314
315#define KS_P1SCLMD 0xF4
316#define P1SCLMD_LEDOFF (1 << 15)
317#define P1SCLMD_TXIDS (1 << 14)
318#define P1SCLMD_RESTARTAN (1 << 13)
319#define P1SCLMD_DISAUTOMDIX (1 << 10)
320#define P1SCLMD_FORCEMDIX (1 << 9)
321#define P1SCLMD_AUTONEGEN (1 << 7)
322#define P1SCLMD_FORCE100 (1 << 6)
323#define P1SCLMD_FORCEFDX (1 << 5)
324#define P1SCLMD_ADV_FLOW (1 << 4)
325#define P1SCLMD_ADV_100BT_FDX (1 << 3)
326#define P1SCLMD_ADV_100BT_HDX (1 << 2)
327#define P1SCLMD_ADV_10BT_FDX (1 << 1)
328#define P1SCLMD_ADV_10BT_HDX (1 << 0)
329
330#define KS_P1CR 0xF6
331#define P1CR_HP_MDIX (1 << 15)
332#define P1CR_REV_POL (1 << 13)
333#define P1CR_OP_100M (1 << 10)
334#define P1CR_OP_FDX (1 << 9)
335#define P1CR_OP_MDI (1 << 7)
336#define P1CR_AN_DONE (1 << 6)
337#define P1CR_LINK_GOOD (1 << 5)
338#define P1CR_PNTR_FLOW (1 << 4)
339#define P1CR_PNTR_100BT_FDX (1 << 3)
340#define P1CR_PNTR_100BT_HDX (1 << 2)
341#define P1CR_PNTR_10BT_FDX (1 << 1)
342#define P1CR_PNTR_10BT_HDX (1 << 0)
343
344/* TX Frame control */
345
346#define TXFR_TXIC (1 << 15)
347#define TXFR_TXFID_MASK (0x3f << 0)
348#define TXFR_TXFID_SHIFT (0)
349
350#define KS_P1SR 0xF8
351#define P1SR_HP_MDIX (1 << 15)
352#define P1SR_REV_POL (1 << 13)
353#define P1SR_OP_100M (1 << 10)
354#define P1SR_OP_FDX (1 << 9)
355#define P1SR_OP_MDI (1 << 7)
356#define P1SR_AN_DONE (1 << 6)
357#define P1SR_LINK_GOOD (1 << 5)
358#define P1SR_PNTR_FLOW (1 << 4)
359#define P1SR_PNTR_100BT_FDX (1 << 3)
360#define P1SR_PNTR_100BT_HDX (1 << 2)
361#define P1SR_PNTR_10BT_FDX (1 << 1)
362#define P1SR_PNTR_10BT_HDX (1 << 0)
363
364#define ENUM_BUS_NONE 0 57#define ENUM_BUS_NONE 0
365#define ENUM_BUS_8BIT 1 58#define ENUM_BUS_8BIT 1
366#define ENUM_BUS_16BIT 2 59#define ENUM_BUS_16BIT 2
@@ -1475,7 +1168,7 @@ static void ks_setup(struct ks_net *ks)
1475 ks_wrreg16(ks, KS_RXFDPR, RXFDPR_RXFPAI); 1168 ks_wrreg16(ks, KS_RXFDPR, RXFDPR_RXFPAI);
1476 1169
1477 /* Setup Receive Frame Threshold - 1 frame (RXFCTFC) */ 1170 /* Setup Receive Frame Threshold - 1 frame (RXFCTFC) */
1478 ks_wrreg16(ks, KS_RXFCTR, 1 & RXFCTR_THRESHOLD_MASK); 1171 ks_wrreg16(ks, KS_RXFCTR, 1 & RXFCTR_RXFCT_MASK);
1479 1172
1480 /* Setup RxQ Command Control (RXQCR) */ 1173 /* Setup RxQ Command Control (RXQCR) */
1481 ks->rc_rxqcr = RXQCR_CMD_CNTL; 1174 ks->rc_rxqcr = RXQCR_CMD_CNTL;
@@ -1488,7 +1181,7 @@ static void ks_setup(struct ks_net *ks)
1488 */ 1181 */
1489 1182
1490 w = ks_rdreg16(ks, KS_P1MBCR); 1183 w = ks_rdreg16(ks, KS_P1MBCR);
1491 w &= ~P1MBCR_FORCE_FDX; 1184 w &= ~BMCR_FULLDPLX;
1492 ks_wrreg16(ks, KS_P1MBCR, w); 1185 ks_wrreg16(ks, KS_P1MBCR, w);
1493 1186
1494 w = TXCR_TXFCE | TXCR_TXPE | TXCR_TXCRC | TXCR_TCGIP; 1187 w = TXCR_TXFCE | TXCR_TXPE | TXCR_TXCRC | TXCR_TCGIP;
@@ -1629,7 +1322,7 @@ static int ks8851_probe(struct platform_device *pdev)
1629 ks_setup_int(ks); 1322 ks_setup_int(ks);
1630 1323
1631 data = ks_rdreg16(ks, KS_OBCR); 1324 data = ks_rdreg16(ks, KS_OBCR);
1632 ks_wrreg16(ks, KS_OBCR, data | OBCR_ODS_16MA); 1325 ks_wrreg16(ks, KS_OBCR, data | OBCR_ODS_16mA);
1633 1326
1634 /* overwriting the default MAC address */ 1327 /* overwriting the default MAC address */
1635 if (pdev->dev.of_node) { 1328 if (pdev->dev.of_node) {
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 3b0adda7cc9c..a4cd6f2cfb86 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -1048,6 +1048,8 @@ int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode)
1048 1048
1049 for (i = 0; i < QLCNIC_NUM_ILB_PKT; i++) { 1049 for (i = 0; i < QLCNIC_NUM_ILB_PKT; i++) {
1050 skb = netdev_alloc_skb(adapter->netdev, QLCNIC_ILB_PKT_SIZE); 1050 skb = netdev_alloc_skb(adapter->netdev, QLCNIC_ILB_PKT_SIZE);
1051 if (!skb)
1052 break;
1051 qlcnic_create_loopback_buff(skb->data, adapter->mac_addr); 1053 qlcnic_create_loopback_buff(skb->data, adapter->mac_addr);
1052 skb_put(skb, QLCNIC_ILB_PKT_SIZE); 1054 skb_put(skb, QLCNIC_ILB_PKT_SIZE);
1053 adapter->ahw->diag_cnt = 0; 1055 adapter->ahw->diag_cnt = 0;
diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c
index cfb67b746595..58e0ca9093d3 100644
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -482,7 +482,7 @@ static void hardware_init(struct net_device *dev)
482 write_reg_high(ioaddr, IMR, ISRh_RxErr); 482 write_reg_high(ioaddr, IMR, ISRh_RxErr);
483 483
484 lp->tx_unit_busy = 0; 484 lp->tx_unit_busy = 0;
485 lp->pac_cnt_in_tx_buf = 0; 485 lp->pac_cnt_in_tx_buf = 0;
486 lp->saved_tx_size = 0; 486 lp->saved_tx_size = 0;
487} 487}
488 488
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index c29dde064078..7562ccbbb39a 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -678,6 +678,7 @@ struct rtl8169_private {
678 struct work_struct work; 678 struct work_struct work;
679 } wk; 679 } wk;
680 680
681 unsigned irq_enabled:1;
681 unsigned supports_gmii:1; 682 unsigned supports_gmii:1;
682 dma_addr_t counters_phys_addr; 683 dma_addr_t counters_phys_addr;
683 struct rtl8169_counters *counters; 684 struct rtl8169_counters *counters;
@@ -1293,6 +1294,7 @@ static void rtl_ack_events(struct rtl8169_private *tp, u16 bits)
1293static void rtl_irq_disable(struct rtl8169_private *tp) 1294static void rtl_irq_disable(struct rtl8169_private *tp)
1294{ 1295{
1295 RTL_W16(tp, IntrMask, 0); 1296 RTL_W16(tp, IntrMask, 0);
1297 tp->irq_enabled = 0;
1296} 1298}
1297 1299
1298#define RTL_EVENT_NAPI_RX (RxOK | RxErr) 1300#define RTL_EVENT_NAPI_RX (RxOK | RxErr)
@@ -1301,6 +1303,7 @@ static void rtl_irq_disable(struct rtl8169_private *tp)
1301 1303
1302static void rtl_irq_enable(struct rtl8169_private *tp) 1304static void rtl_irq_enable(struct rtl8169_private *tp)
1303{ 1305{
1306 tp->irq_enabled = 1;
1304 RTL_W16(tp, IntrMask, tp->irq_mask); 1307 RTL_W16(tp, IntrMask, tp->irq_mask);
1305} 1308}
1306 1309
@@ -6520,9 +6523,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
6520{ 6523{
6521 struct rtl8169_private *tp = dev_instance; 6524 struct rtl8169_private *tp = dev_instance;
6522 u16 status = RTL_R16(tp, IntrStatus); 6525 u16 status = RTL_R16(tp, IntrStatus);
6523 u16 irq_mask = RTL_R16(tp, IntrMask);
6524 6526
6525 if (status == 0xffff || !(status & irq_mask)) 6527 if (!tp->irq_enabled || status == 0xffff || !(status & tp->irq_mask))
6526 return IRQ_NONE; 6528 return IRQ_NONE;
6527 6529
6528 if (unlikely(status & SYSErr)) { 6530 if (unlikely(status & SYSErr)) {
@@ -6540,7 +6542,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
6540 set_bit(RTL_FLAG_TASK_RESET_PENDING, tp->wk.flags); 6542 set_bit(RTL_FLAG_TASK_RESET_PENDING, tp->wk.flags);
6541 } 6543 }
6542 6544
6543 if (status & RTL_EVENT_NAPI) { 6545 if (status & (RTL_EVENT_NAPI | LinkChg)) {
6544 rtl_irq_disable(tp); 6546 rtl_irq_disable(tp);
6545 napi_schedule_irqoff(&tp->napi); 6547 napi_schedule_irqoff(&tp->napi);
6546 } 6548 }
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 6073387511f8..67f9bb6e941b 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -730,10 +730,10 @@ static u16 sis900_default_phy(struct net_device * net_dev)
730 status = mdio_read(net_dev, phy->phy_addr, MII_STATUS); 730 status = mdio_read(net_dev, phy->phy_addr, MII_STATUS);
731 731
732 /* Link ON & Not select default PHY & not ghost PHY */ 732 /* Link ON & Not select default PHY & not ghost PHY */
733 if ((status & MII_STAT_LINK) && !default_phy && 733 if ((status & MII_STAT_LINK) && !default_phy &&
734 (phy->phy_types != UNKNOWN)) 734 (phy->phy_types != UNKNOWN)) {
735 default_phy = phy; 735 default_phy = phy;
736 else { 736 } else {
737 status = mdio_read(net_dev, phy->phy_addr, MII_CONTROL); 737 status = mdio_read(net_dev, phy->phy_addr, MII_CONTROL);
738 mdio_write(net_dev, phy->phy_addr, MII_CONTROL, 738 mdio_write(net_dev, phy->phy_addr, MII_CONTROL,
739 status | MII_CNTL_AUTO | MII_CNTL_ISOLATE); 739 status | MII_CNTL_AUTO | MII_CNTL_ISOLATE);
@@ -741,7 +741,7 @@ static u16 sis900_default_phy(struct net_device * net_dev)
741 phy_home = phy; 741 phy_home = phy;
742 else if(phy->phy_types == LAN) 742 else if(phy->phy_types == LAN)
743 phy_lan = phy; 743 phy_lan = phy;
744 } 744 }
745 } 745 }
746 746
747 if (!default_phy && phy_home) 747 if (!default_phy && phy_home)
diff --git a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
index d8c5bc412219..4d9bcb4d0378 100644
--- a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
+++ b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
@@ -59,7 +59,7 @@ static int jumbo_frm(void *p, struct sk_buff *skb, int csum)
59 59
60 desc->des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB); 60 desc->des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB);
61 stmmac_prepare_tx_desc(priv, desc, 1, bmax, csum, 61 stmmac_prepare_tx_desc(priv, desc, 1, bmax, csum,
62 STMMAC_RING_MODE, 1, false, skb->len); 62 STMMAC_RING_MODE, 0, false, skb->len);
63 tx_q->tx_skbuff[entry] = NULL; 63 tx_q->tx_skbuff[entry] = NULL;
64 entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE); 64 entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE);
65 65
@@ -79,7 +79,8 @@ static int jumbo_frm(void *p, struct sk_buff *skb, int csum)
79 79
80 desc->des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB); 80 desc->des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB);
81 stmmac_prepare_tx_desc(priv, desc, 0, len, csum, 81 stmmac_prepare_tx_desc(priv, desc, 0, len, csum,
82 STMMAC_RING_MODE, 1, true, skb->len); 82 STMMAC_RING_MODE, 1, !skb_is_nonlinear(skb),
83 skb->len);
83 } else { 84 } else {
84 des2 = dma_map_single(priv->device, skb->data, 85 des2 = dma_map_single(priv->device, skb->data,
85 nopaged_len, DMA_TO_DEVICE); 86 nopaged_len, DMA_TO_DEVICE);
@@ -91,7 +92,8 @@ static int jumbo_frm(void *p, struct sk_buff *skb, int csum)
91 tx_q->tx_skbuff_dma[entry].is_jumbo = true; 92 tx_q->tx_skbuff_dma[entry].is_jumbo = true;
92 desc->des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB); 93 desc->des3 = cpu_to_le32(des2 + BUF_SIZE_4KiB);
93 stmmac_prepare_tx_desc(priv, desc, 1, nopaged_len, csum, 94 stmmac_prepare_tx_desc(priv, desc, 1, nopaged_len, csum,
94 STMMAC_RING_MODE, 1, true, skb->len); 95 STMMAC_RING_MODE, 0, !skb_is_nonlinear(skb),
96 skb->len);
95 } 97 }
96 98
97 tx_q->cur_tx = entry; 99 tx_q->cur_tx = entry;
@@ -111,10 +113,11 @@ static unsigned int is_jumbo_frm(int len, int enh_desc)
111 113
112static void refill_desc3(void *priv_ptr, struct dma_desc *p) 114static void refill_desc3(void *priv_ptr, struct dma_desc *p)
113{ 115{
114 struct stmmac_priv *priv = (struct stmmac_priv *)priv_ptr; 116 struct stmmac_rx_queue *rx_q = priv_ptr;
117 struct stmmac_priv *priv = rx_q->priv_data;
115 118
116 /* Fill DES3 in case of RING mode */ 119 /* Fill DES3 in case of RING mode */
117 if (priv->dma_buf_sz >= BUF_SIZE_8KiB) 120 if (priv->dma_buf_sz == BUF_SIZE_16KiB)
118 p->des3 = cpu_to_le32(le32_to_cpu(p->des2) + BUF_SIZE_8KiB); 121 p->des3 = cpu_to_le32(le32_to_cpu(p->des2) + BUF_SIZE_8KiB);
119} 122}
120 123
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 97c5e1aad88f..6a2e1031a62a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3216,14 +3216,16 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
3216 stmmac_prepare_tx_desc(priv, first, 1, nopaged_len, 3216 stmmac_prepare_tx_desc(priv, first, 1, nopaged_len,
3217 csum_insertion, priv->mode, 1, last_segment, 3217 csum_insertion, priv->mode, 1, last_segment,
3218 skb->len); 3218 skb->len);
3219 3219 } else {
3220 /* The own bit must be the latest setting done when prepare the 3220 stmmac_set_tx_owner(priv, first);
3221 * descriptor and then barrier is needed to make sure that
3222 * all is coherent before granting the DMA engine.
3223 */
3224 wmb();
3225 } 3221 }
3226 3222
3223 /* The own bit must be the latest setting done when prepare the
3224 * descriptor and then barrier is needed to make sure that
3225 * all is coherent before granting the DMA engine.
3226 */
3227 wmb();
3228
3227 netdev_tx_sent_queue(netdev_get_tx_queue(dev, queue), skb->len); 3229 netdev_tx_sent_queue(netdev_get_tx_queue(dev, queue), skb->len);
3228 3230
3229 stmmac_enable_dma_transmission(priv, priv->ioaddr); 3231 stmmac_enable_dma_transmission(priv, priv->ioaddr);
diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
index 5174d318901e..0a920c5936b2 100644
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
@@ -3657,12 +3657,16 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev,
3657 3657
3658 ret = netcp_txpipe_init(&gbe_dev->tx_pipe, netcp_device, 3658 ret = netcp_txpipe_init(&gbe_dev->tx_pipe, netcp_device,
3659 gbe_dev->dma_chan_name, gbe_dev->tx_queue_id); 3659 gbe_dev->dma_chan_name, gbe_dev->tx_queue_id);
3660 if (ret) 3660 if (ret) {
3661 of_node_put(interfaces);
3661 return ret; 3662 return ret;
3663 }
3662 3664
3663 ret = netcp_txpipe_open(&gbe_dev->tx_pipe); 3665 ret = netcp_txpipe_open(&gbe_dev->tx_pipe);
3664 if (ret) 3666 if (ret) {
3667 of_node_put(interfaces);
3665 return ret; 3668 return ret;
3669 }
3666 3670
3667 /* Create network interfaces */ 3671 /* Create network interfaces */
3668 INIT_LIST_HEAD(&gbe_dev->gbe_intf_head); 3672 INIT_LIST_HEAD(&gbe_dev->gbe_intf_head);
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index ec7e7ec24ff9..4041c75997ba 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1575,12 +1575,14 @@ static int axienet_probe(struct platform_device *pdev)
1575 ret = of_address_to_resource(np, 0, &dmares); 1575 ret = of_address_to_resource(np, 0, &dmares);
1576 if (ret) { 1576 if (ret) {
1577 dev_err(&pdev->dev, "unable to get DMA resource\n"); 1577 dev_err(&pdev->dev, "unable to get DMA resource\n");
1578 of_node_put(np);
1578 goto free_netdev; 1579 goto free_netdev;
1579 } 1580 }
1580 lp->dma_regs = devm_ioremap_resource(&pdev->dev, &dmares); 1581 lp->dma_regs = devm_ioremap_resource(&pdev->dev, &dmares);
1581 if (IS_ERR(lp->dma_regs)) { 1582 if (IS_ERR(lp->dma_regs)) {
1582 dev_err(&pdev->dev, "could not map DMA regs\n"); 1583 dev_err(&pdev->dev, "could not map DMA regs\n");
1583 ret = PTR_ERR(lp->dma_regs); 1584 ret = PTR_ERR(lp->dma_regs);
1585 of_node_put(np);
1584 goto free_netdev; 1586 goto free_netdev;
1585 } 1587 }
1586 lp->rx_irq = irq_of_parse_and_map(np, 1); 1588 lp->rx_irq = irq_of_parse_and_map(np, 1);
diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c
index cd1d8faccca5..cd6b95e673a5 100644
--- a/drivers/net/ieee802154/adf7242.c
+++ b/drivers/net/ieee802154/adf7242.c
@@ -1268,6 +1268,10 @@ static int adf7242_probe(struct spi_device *spi)
1268 INIT_DELAYED_WORK(&lp->work, adf7242_rx_cal_work); 1268 INIT_DELAYED_WORK(&lp->work, adf7242_rx_cal_work);
1269 lp->wqueue = alloc_ordered_workqueue(dev_name(&spi->dev), 1269 lp->wqueue = alloc_ordered_workqueue(dev_name(&spi->dev),
1270 WQ_MEM_RECLAIM); 1270 WQ_MEM_RECLAIM);
1271 if (unlikely(!lp->wqueue)) {
1272 ret = -ENOMEM;
1273 goto err_hw_init;
1274 }
1271 1275
1272 ret = adf7242_hw_init(lp); 1276 ret = adf7242_hw_init(lp);
1273 if (ret) 1277 if (ret)
diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c
index b6743f03dce0..3b88846de31b 100644
--- a/drivers/net/ieee802154/mac802154_hwsim.c
+++ b/drivers/net/ieee802154/mac802154_hwsim.c
@@ -324,7 +324,7 @@ static int hwsim_get_radio_nl(struct sk_buff *msg, struct genl_info *info)
324 goto out_err; 324 goto out_err;
325 } 325 }
326 326
327 genlmsg_reply(skb, info); 327 res = genlmsg_reply(skb, info);
328 break; 328 break;
329 } 329 }
330 330
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 071869db44cf..520657945b82 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -7,6 +7,8 @@ menuconfig MDIO_DEVICE
7 help 7 help
8 MDIO devices and driver infrastructure code. 8 MDIO devices and driver infrastructure code.
9 9
10if MDIO_DEVICE
11
10config MDIO_BUS 12config MDIO_BUS
11 tristate 13 tristate
12 default m if PHYLIB=m 14 default m if PHYLIB=m
@@ -179,6 +181,7 @@ config MDIO_XGENE
179 APM X-Gene SoC's. 181 APM X-Gene SoC's.
180 182
181endif 183endif
184endif
182 185
183config PHYLINK 186config PHYLINK
184 tristate 187 tristate
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 9605d4fe540b..cb86a3e90c7d 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -323,6 +323,19 @@ static int bcm54xx_config_init(struct phy_device *phydev)
323 323
324 bcm54xx_phydsp_config(phydev); 324 bcm54xx_phydsp_config(phydev);
325 325
326 /* Encode link speed into LED1 and LED3 pair (green/amber).
327 * Also flash these two LEDs on activity. This means configuring
328 * them for MULTICOLOR and encoding link/activity into them.
329 */
330 val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) |
331 BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1);
332 bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);
333
334 val = BCM_LED_MULTICOLOR_IN_PHASE |
335 BCM5482_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) |
336 BCM5482_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT);
337 bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val);
338
326 return 0; 339 return 0;
327} 340}
328 341
diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c
index bbd8c22067f3..97d45bd5b38e 100644
--- a/drivers/net/phy/dp83822.c
+++ b/drivers/net/phy/dp83822.c
@@ -15,6 +15,8 @@
15#include <linux/netdevice.h> 15#include <linux/netdevice.h>
16 16
17#define DP83822_PHY_ID 0x2000a240 17#define DP83822_PHY_ID 0x2000a240
18#define DP83825I_PHY_ID 0x2000a150
19
18#define DP83822_DEVADDR 0x1f 20#define DP83822_DEVADDR 0x1f
19 21
20#define MII_DP83822_PHYSCR 0x11 22#define MII_DP83822_PHYSCR 0x11
@@ -304,26 +306,30 @@ static int dp83822_resume(struct phy_device *phydev)
304 return 0; 306 return 0;
305} 307}
306 308
309#define DP83822_PHY_DRIVER(_id, _name) \
310 { \
311 PHY_ID_MATCH_MODEL(_id), \
312 .name = (_name), \
313 .features = PHY_BASIC_FEATURES, \
314 .soft_reset = dp83822_phy_reset, \
315 .config_init = dp83822_config_init, \
316 .get_wol = dp83822_get_wol, \
317 .set_wol = dp83822_set_wol, \
318 .ack_interrupt = dp83822_ack_interrupt, \
319 .config_intr = dp83822_config_intr, \
320 .suspend = dp83822_suspend, \
321 .resume = dp83822_resume, \
322 }
323
307static struct phy_driver dp83822_driver[] = { 324static struct phy_driver dp83822_driver[] = {
308 { 325 DP83822_PHY_DRIVER(DP83822_PHY_ID, "TI DP83822"),
309 .phy_id = DP83822_PHY_ID, 326 DP83822_PHY_DRIVER(DP83825I_PHY_ID, "TI DP83825I"),
310 .phy_id_mask = 0xfffffff0,
311 .name = "TI DP83822",
312 .features = PHY_BASIC_FEATURES,
313 .config_init = dp83822_config_init,
314 .soft_reset = dp83822_phy_reset,
315 .get_wol = dp83822_get_wol,
316 .set_wol = dp83822_set_wol,
317 .ack_interrupt = dp83822_ack_interrupt,
318 .config_intr = dp83822_config_intr,
319 .suspend = dp83822_suspend,
320 .resume = dp83822_resume,
321 },
322}; 327};
323module_phy_driver(dp83822_driver); 328module_phy_driver(dp83822_driver);
324 329
325static struct mdio_device_id __maybe_unused dp83822_tbl[] = { 330static struct mdio_device_id __maybe_unused dp83822_tbl[] = {
326 { DP83822_PHY_ID, 0xfffffff0 }, 331 { DP83822_PHY_ID, 0xfffffff0 },
332 { DP83825I_PHY_ID, 0xfffffff0 },
327 { }, 333 { },
328}; 334};
329MODULE_DEVICE_TABLE(mdio, dp83822_tbl); 335MODULE_DEVICE_TABLE(mdio, dp83822_tbl);
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index a238388eb1a5..0eec2913c289 100644
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -201,6 +201,7 @@ static int meson_gxl_ack_interrupt(struct phy_device *phydev)
201static int meson_gxl_config_intr(struct phy_device *phydev) 201static int meson_gxl_config_intr(struct phy_device *phydev)
202{ 202{
203 u16 val; 203 u16 val;
204 int ret;
204 205
205 if (phydev->interrupts == PHY_INTERRUPT_ENABLED) { 206 if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
206 val = INTSRC_ANEG_PR 207 val = INTSRC_ANEG_PR
@@ -213,6 +214,11 @@ static int meson_gxl_config_intr(struct phy_device *phydev)
213 val = 0; 214 val = 0;
214 } 215 }
215 216
217 /* Ack any pending IRQ */
218 ret = meson_gxl_ack_interrupt(phydev);
219 if (ret)
220 return ret;
221
216 return phy_write(phydev, INTSRC_MASK, val); 222 return phy_write(phydev, INTSRC_MASK, val);
217} 223}
218 224
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 49fdd1ee798e..77068c545de0 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1831,7 +1831,7 @@ int genphy_soft_reset(struct phy_device *phydev)
1831{ 1831{
1832 int ret; 1832 int ret;
1833 1833
1834 ret = phy_write(phydev, MII_BMCR, BMCR_RESET); 1834 ret = phy_set_bits(phydev, MII_BMCR, BMCR_RESET);
1835 if (ret < 0) 1835 if (ret < 0)
1836 return ret; 1836 return ret;
1837 1837
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 1d68921723dc..e9ca1c088d0b 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1763,9 +1763,6 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
1763 int skb_xdp = 1; 1763 int skb_xdp = 1;
1764 bool frags = tun_napi_frags_enabled(tfile); 1764 bool frags = tun_napi_frags_enabled(tfile);
1765 1765
1766 if (!(tun->dev->flags & IFF_UP))
1767 return -EIO;
1768
1769 if (!(tun->flags & IFF_NO_PI)) { 1766 if (!(tun->flags & IFF_NO_PI)) {
1770 if (len < sizeof(pi)) 1767 if (len < sizeof(pi))
1771 return -EINVAL; 1768 return -EINVAL;
@@ -1867,6 +1864,8 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
1867 err = skb_copy_datagram_from_iter(skb, 0, from, len); 1864 err = skb_copy_datagram_from_iter(skb, 0, from, len);
1868 1865
1869 if (err) { 1866 if (err) {
1867 err = -EFAULT;
1868drop:
1870 this_cpu_inc(tun->pcpu_stats->rx_dropped); 1869 this_cpu_inc(tun->pcpu_stats->rx_dropped);
1871 kfree_skb(skb); 1870 kfree_skb(skb);
1872 if (frags) { 1871 if (frags) {
@@ -1874,7 +1873,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
1874 mutex_unlock(&tfile->napi_mutex); 1873 mutex_unlock(&tfile->napi_mutex);
1875 } 1874 }
1876 1875
1877 return -EFAULT; 1876 return err;
1878 } 1877 }
1879 } 1878 }
1880 1879
@@ -1958,6 +1957,13 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
1958 !tfile->detached) 1957 !tfile->detached)
1959 rxhash = __skb_get_hash_symmetric(skb); 1958 rxhash = __skb_get_hash_symmetric(skb);
1960 1959
1960 rcu_read_lock();
1961 if (unlikely(!(tun->dev->flags & IFF_UP))) {
1962 err = -EIO;
1963 rcu_read_unlock();
1964 goto drop;
1965 }
1966
1961 if (frags) { 1967 if (frags) {
1962 /* Exercise flow dissector code path. */ 1968 /* Exercise flow dissector code path. */
1963 u32 headlen = eth_get_headlen(skb->data, skb_headlen(skb)); 1969 u32 headlen = eth_get_headlen(skb->data, skb_headlen(skb));
@@ -1965,6 +1971,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
1965 if (unlikely(headlen > skb_headlen(skb))) { 1971 if (unlikely(headlen > skb_headlen(skb))) {
1966 this_cpu_inc(tun->pcpu_stats->rx_dropped); 1972 this_cpu_inc(tun->pcpu_stats->rx_dropped);
1967 napi_free_frags(&tfile->napi); 1973 napi_free_frags(&tfile->napi);
1974 rcu_read_unlock();
1968 mutex_unlock(&tfile->napi_mutex); 1975 mutex_unlock(&tfile->napi_mutex);
1969 WARN_ON(1); 1976 WARN_ON(1);
1970 return -ENOMEM; 1977 return -ENOMEM;
@@ -1992,6 +1999,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
1992 } else { 1999 } else {
1993 netif_rx_ni(skb); 2000 netif_rx_ni(skb);
1994 } 2001 }
2002 rcu_read_unlock();
1995 2003
1996 stats = get_cpu_ptr(tun->pcpu_stats); 2004 stats = get_cpu_ptr(tun->pcpu_stats);
1997 u64_stats_update_begin(&stats->syncp); 2005 u64_stats_update_begin(&stats->syncp);
diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c
index 820a2fe7d027..aff995be2a31 100644
--- a/drivers/net/usb/aqc111.c
+++ b/drivers/net/usb/aqc111.c
@@ -1301,6 +1301,20 @@ static const struct driver_info trendnet_info = {
1301 .tx_fixup = aqc111_tx_fixup, 1301 .tx_fixup = aqc111_tx_fixup,
1302}; 1302};
1303 1303
1304static const struct driver_info qnap_info = {
1305 .description = "QNAP QNA-UC5G1T USB to 5GbE Adapter",
1306 .bind = aqc111_bind,
1307 .unbind = aqc111_unbind,
1308 .status = aqc111_status,
1309 .link_reset = aqc111_link_reset,
1310 .reset = aqc111_reset,
1311 .stop = aqc111_stop,
1312 .flags = FLAG_ETHER | FLAG_FRAMING_AX |
1313 FLAG_AVOID_UNLINK_URBS | FLAG_MULTI_PACKET,
1314 .rx_fixup = aqc111_rx_fixup,
1315 .tx_fixup = aqc111_tx_fixup,
1316};
1317
1304static int aqc111_suspend(struct usb_interface *intf, pm_message_t message) 1318static int aqc111_suspend(struct usb_interface *intf, pm_message_t message)
1305{ 1319{
1306 struct usbnet *dev = usb_get_intfdata(intf); 1320 struct usbnet *dev = usb_get_intfdata(intf);
@@ -1455,6 +1469,7 @@ static const struct usb_device_id products[] = {
1455 {AQC111_USB_ETH_DEV(0x0b95, 0x2790, asix111_info)}, 1469 {AQC111_USB_ETH_DEV(0x0b95, 0x2790, asix111_info)},
1456 {AQC111_USB_ETH_DEV(0x0b95, 0x2791, asix112_info)}, 1470 {AQC111_USB_ETH_DEV(0x0b95, 0x2791, asix112_info)},
1457 {AQC111_USB_ETH_DEV(0x20f4, 0xe05a, trendnet_info)}, 1471 {AQC111_USB_ETH_DEV(0x20f4, 0xe05a, trendnet_info)},
1472 {AQC111_USB_ETH_DEV(0x1c04, 0x0015, qnap_info)},
1458 { },/* END */ 1473 { },/* END */
1459}; 1474};
1460MODULE_DEVICE_TABLE(usb, products); 1475MODULE_DEVICE_TABLE(usb, products);
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 5512a1038721..3e9b2c319e45 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -851,6 +851,14 @@ static const struct usb_device_id products[] = {
851 .driver_info = 0, 851 .driver_info = 0,
852}, 852},
853 853
854/* QNAP QNA-UC5G1T USB to 5GbE Adapter (based on AQC111U) */
855{
856 USB_DEVICE_AND_INTERFACE_INFO(0x1c04, 0x0015, USB_CLASS_COMM,
857 USB_CDC_SUBCLASS_ETHERNET,
858 USB_CDC_PROTO_NONE),
859 .driver_info = 0,
860},
861
854/* WHITELIST!!! 862/* WHITELIST!!!
855 * 863 *
856 * CDC Ether uses two interfaces, not necessarily consecutive. 864 * CDC Ether uses two interfaces, not necessarily consecutive.
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 077f1b9f2761..d76dfed8d9bb 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -4335,10 +4335,8 @@ static void vxlan_destroy_tunnels(struct net *net, struct list_head *head)
4335 /* If vxlan->dev is in the same netns, it has already been added 4335 /* If vxlan->dev is in the same netns, it has already been added
4336 * to the list by the previous loop. 4336 * to the list by the previous loop.
4337 */ 4337 */
4338 if (!net_eq(dev_net(vxlan->dev), net)) { 4338 if (!net_eq(dev_net(vxlan->dev), net))
4339 gro_cells_destroy(&vxlan->gro_cells);
4340 unregister_netdevice_queue(vxlan->dev, head); 4339 unregister_netdevice_queue(vxlan->dev, head);
4341 }
4342 } 4340 }
4343 4341
4344 for (h = 0; h < PORT_HASH_SIZE; ++h) 4342 for (h = 0; h < PORT_HASH_SIZE; ++h)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
index e9822a3ec373..94132cfd1f56 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
@@ -460,9 +460,7 @@ static int iwl_mvm_ftm_range_resp_valid(struct iwl_mvm *mvm, u8 request_id,
460static void iwl_mvm_debug_range_resp(struct iwl_mvm *mvm, u8 index, 460static void iwl_mvm_debug_range_resp(struct iwl_mvm *mvm, u8 index,
461 struct cfg80211_pmsr_result *res) 461 struct cfg80211_pmsr_result *res)
462{ 462{
463 s64 rtt_avg = res->ftm.rtt_avg * 100; 463 s64 rtt_avg = div_s64(res->ftm.rtt_avg * 100, 6666);
464
465 do_div(rtt_avg, 6666);
466 464
467 IWL_DEBUG_INFO(mvm, "entry %d\n", index); 465 IWL_DEBUG_INFO(mvm, "entry %d\n", index);
468 IWL_DEBUG_INFO(mvm, "\tstatus: %d\n", res->status); 466 IWL_DEBUG_INFO(mvm, "\tstatus: %d\n", res->status);
diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index 6eedc0ec7661..76629b98c78d 100644
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -130,6 +130,8 @@ mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx,
130static void 130static void
131mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q) 131mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q)
132{ 132{
133 iowrite32(q->desc_dma, &q->regs->desc_base);
134 iowrite32(q->ndesc, &q->regs->ring_size);
133 q->head = ioread32(&q->regs->dma_idx); 135 q->head = ioread32(&q->regs->dma_idx);
134 q->tail = q->head; 136 q->tail = q->head;
135 iowrite32(q->head, &q->regs->cpu_idx); 137 iowrite32(q->head, &q->regs->cpu_idx);
@@ -180,7 +182,10 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)
180 else 182 else
181 mt76_dma_sync_idx(dev, q); 183 mt76_dma_sync_idx(dev, q);
182 184
183 wake = wake && qid < IEEE80211_NUM_ACS && q->queued < q->ndesc - 8; 185 wake = wake && q->stopped &&
186 qid < IEEE80211_NUM_ACS && q->queued < q->ndesc - 8;
187 if (wake)
188 q->stopped = false;
184 189
185 if (!q->queued) 190 if (!q->queued)
186 wake_up(&dev->tx_wait); 191 wake_up(&dev->tx_wait);
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index a033745adb2f..316167404729 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -679,19 +679,15 @@ out:
679 return ret; 679 return ret;
680} 680}
681 681
682static void 682void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,
683mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif, 683 struct ieee80211_sta *sta)
684 struct ieee80211_sta *sta)
685{ 684{
686 struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv; 685 struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;
687 int idx = wcid->idx; 686 int i, idx = wcid->idx;
688 int i;
689 687
690 rcu_assign_pointer(dev->wcid[idx], NULL); 688 rcu_assign_pointer(dev->wcid[idx], NULL);
691 synchronize_rcu(); 689 synchronize_rcu();
692 690
693 mutex_lock(&dev->mutex);
694
695 if (dev->drv->sta_remove) 691 if (dev->drv->sta_remove)
696 dev->drv->sta_remove(dev, vif, sta); 692 dev->drv->sta_remove(dev, vif, sta);
697 693
@@ -699,7 +695,15 @@ mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,
699 for (i = 0; i < ARRAY_SIZE(sta->txq); i++) 695 for (i = 0; i < ARRAY_SIZE(sta->txq); i++)
700 mt76_txq_remove(dev, sta->txq[i]); 696 mt76_txq_remove(dev, sta->txq[i]);
701 mt76_wcid_free(dev->wcid_mask, idx); 697 mt76_wcid_free(dev->wcid_mask, idx);
698}
699EXPORT_SYMBOL_GPL(__mt76_sta_remove);
702 700
701static void
702mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,
703 struct ieee80211_sta *sta)
704{
705 mutex_lock(&dev->mutex);
706 __mt76_sta_remove(dev, vif, sta);
703 mutex_unlock(&dev->mutex); 707 mutex_unlock(&dev->mutex);
704} 708}
705 709
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 5dfb0601f101..bcbfd3c4a44b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -126,6 +126,7 @@ struct mt76_queue {
126 int ndesc; 126 int ndesc;
127 int queued; 127 int queued;
128 int buf_size; 128 int buf_size;
129 bool stopped;
129 130
130 u8 buf_offset; 131 u8 buf_offset;
131 u8 hw_idx; 132 u8 hw_idx;
@@ -143,6 +144,7 @@ struct mt76_mcu_ops {
143 const struct mt76_reg_pair *rp, int len); 144 const struct mt76_reg_pair *rp, int len);
144 int (*mcu_rd_rp)(struct mt76_dev *dev, u32 base, 145 int (*mcu_rd_rp)(struct mt76_dev *dev, u32 base,
145 struct mt76_reg_pair *rp, int len); 146 struct mt76_reg_pair *rp, int len);
147 int (*mcu_restart)(struct mt76_dev *dev);
146}; 148};
147 149
148struct mt76_queue_ops { 150struct mt76_queue_ops {
@@ -693,6 +695,8 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
693 struct ieee80211_sta *sta, 695 struct ieee80211_sta *sta,
694 enum ieee80211_sta_state old_state, 696 enum ieee80211_sta_state old_state,
695 enum ieee80211_sta_state new_state); 697 enum ieee80211_sta_state new_state);
698void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,
699 struct ieee80211_sta *sta);
696 700
697struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb); 701struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb);
698 702
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c b/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
index afcd86f735b4..4dcb465095d1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
@@ -135,8 +135,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)
135 135
136out: 136out:
137 mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false); 137 mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);
138 if (dev->mt76.q_tx[MT_TXQ_BEACON].queued > 138 if (dev->mt76.q_tx[MT_TXQ_BEACON].queued > hweight8(dev->beacon_mask))
139 __sw_hweight8(dev->beacon_mask))
140 dev->beacon_check++; 139 dev->beacon_check++;
141} 140}
142 141
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index d69e82c66ab2..b3ae0aaea62a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -27,12 +27,16 @@ static void
27mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) 27mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)
28{ 28{
29 __le32 *txd = (__le32 *)skb->data; 29 __le32 *txd = (__le32 *)skb->data;
30 struct ieee80211_hdr *hdr;
31 struct ieee80211_sta *sta;
30 struct mt7603_sta *msta; 32 struct mt7603_sta *msta;
31 struct mt76_wcid *wcid; 33 struct mt76_wcid *wcid;
34 void *priv;
32 int idx; 35 int idx;
33 u32 val; 36 u32 val;
37 u8 tid;
34 38
35 if (skb->len < sizeof(MT_TXD_SIZE) + sizeof(struct ieee80211_hdr)) 39 if (skb->len < MT_TXD_SIZE + sizeof(struct ieee80211_hdr))
36 goto free; 40 goto free;
37 41
38 val = le32_to_cpu(txd[1]); 42 val = le32_to_cpu(txd[1]);
@@ -46,10 +50,19 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)
46 if (!wcid) 50 if (!wcid)
47 goto free; 51 goto free;
48 52
49 msta = container_of(wcid, struct mt7603_sta, wcid); 53 priv = msta = container_of(wcid, struct mt7603_sta, wcid);
50 val = le32_to_cpu(txd[0]); 54 val = le32_to_cpu(txd[0]);
51 skb_set_queue_mapping(skb, FIELD_GET(MT_TXD0_Q_IDX, val)); 55 skb_set_queue_mapping(skb, FIELD_GET(MT_TXD0_Q_IDX, val));
52 56
57 val &= ~(MT_TXD0_P_IDX | MT_TXD0_Q_IDX);
58 val |= FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_HW_QUEUE_MGMT);
59 txd[0] = cpu_to_le32(val);
60
61 sta = container_of(priv, struct ieee80211_sta, drv_priv);
62 hdr = (struct ieee80211_hdr *) &skb->data[MT_TXD_SIZE];
63 tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;
64 ieee80211_sta_set_buffered(sta, tid, true);
65
53 spin_lock_bh(&dev->ps_lock); 66 spin_lock_bh(&dev->ps_lock);
54 __skb_queue_tail(&msta->psq, skb); 67 __skb_queue_tail(&msta->psq, skb);
55 if (skb_queue_len(&msta->psq) >= 64) { 68 if (skb_queue_len(&msta->psq) >= 64) {
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/init.c b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
index 15cc8f33b34d..d54dda67d036 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
@@ -112,7 +112,7 @@ static void
112mt7603_phy_init(struct mt7603_dev *dev) 112mt7603_phy_init(struct mt7603_dev *dev)
113{ 113{
114 int rx_chains = dev->mt76.antenna_mask; 114 int rx_chains = dev->mt76.antenna_mask;
115 int tx_chains = __sw_hweight8(rx_chains) - 1; 115 int tx_chains = hweight8(rx_chains) - 1;
116 116
117 mt76_rmw(dev, MT_WF_RMAC_RMCR, 117 mt76_rmw(dev, MT_WF_RMAC_RMCR,
118 (MT_WF_RMAC_RMCR_SMPS_MODE | 118 (MT_WF_RMAC_RMCR_SMPS_MODE |
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 0a0115861b51..5e31d7da96fc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -1072,7 +1072,7 @@ out:
1072 case MT_PHY_TYPE_HT: 1072 case MT_PHY_TYPE_HT:
1073 final_rate_flags |= IEEE80211_TX_RC_MCS; 1073 final_rate_flags |= IEEE80211_TX_RC_MCS;
1074 final_rate &= GENMASK(5, 0); 1074 final_rate &= GENMASK(5, 0);
1075 if (i > 15) 1075 if (final_rate > 15)
1076 return false; 1076 return false;
1077 break; 1077 break;
1078 default: 1078 default:
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/main.c b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
index b10775ed92e6..cc0fe0933b2d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
@@ -5,6 +5,7 @@
5#include <linux/pci.h> 5#include <linux/pci.h>
6#include <linux/module.h> 6#include <linux/module.h>
7#include "mt7603.h" 7#include "mt7603.h"
8#include "mac.h"
8#include "eeprom.h" 9#include "eeprom.h"
9 10
10static int 11static int
@@ -386,6 +387,15 @@ mt7603_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps)
386} 387}
387 388
388static void 389static void
390mt7603_ps_set_more_data(struct sk_buff *skb)
391{
392 struct ieee80211_hdr *hdr;
393
394 hdr = (struct ieee80211_hdr *) &skb->data[MT_TXD_SIZE];
395 hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);
396}
397
398static void
389mt7603_release_buffered_frames(struct ieee80211_hw *hw, 399mt7603_release_buffered_frames(struct ieee80211_hw *hw,
390 struct ieee80211_sta *sta, 400 struct ieee80211_sta *sta,
391 u16 tids, int nframes, 401 u16 tids, int nframes,
@@ -399,6 +409,8 @@ mt7603_release_buffered_frames(struct ieee80211_hw *hw,
399 409
400 __skb_queue_head_init(&list); 410 __skb_queue_head_init(&list);
401 411
412 mt7603_wtbl_set_ps(dev, msta, false);
413
402 spin_lock_bh(&dev->ps_lock); 414 spin_lock_bh(&dev->ps_lock);
403 skb_queue_walk_safe(&msta->psq, skb, tmp) { 415 skb_queue_walk_safe(&msta->psq, skb, tmp) {
404 if (!nframes) 416 if (!nframes)
@@ -409,11 +421,15 @@ mt7603_release_buffered_frames(struct ieee80211_hw *hw,
409 421
410 skb_set_queue_mapping(skb, MT_TXQ_PSD); 422 skb_set_queue_mapping(skb, MT_TXQ_PSD);
411 __skb_unlink(skb, &msta->psq); 423 __skb_unlink(skb, &msta->psq);
424 mt7603_ps_set_more_data(skb);
412 __skb_queue_tail(&list, skb); 425 __skb_queue_tail(&list, skb);
413 nframes--; 426 nframes--;
414 } 427 }
415 spin_unlock_bh(&dev->ps_lock); 428 spin_unlock_bh(&dev->ps_lock);
416 429
430 if (!skb_queue_empty(&list))
431 ieee80211_sta_eosp(sta);
432
417 mt7603_ps_tx_list(dev, &list); 433 mt7603_ps_tx_list(dev, &list);
418 434
419 if (nframes) 435 if (nframes)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
index 4b0713f1fd5e..d06905ea8cc6 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
@@ -433,7 +433,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)
433{ 433{
434 struct cfg80211_chan_def *chandef = &dev->mt76.chandef; 434 struct cfg80211_chan_def *chandef = &dev->mt76.chandef;
435 struct ieee80211_hw *hw = mt76_hw(dev); 435 struct ieee80211_hw *hw = mt76_hw(dev);
436 int n_chains = __sw_hweight8(dev->mt76.antenna_mask); 436 int n_chains = hweight8(dev->mt76.antenna_mask);
437 struct { 437 struct {
438 u8 control_chan; 438 u8 control_chan;
439 u8 center_chan; 439 u8 center_chan;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c
index e13fea80d970..b920be1f5718 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/soc.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/soc.c
@@ -23,9 +23,9 @@ mt76_wmac_probe(struct platform_device *pdev)
23 } 23 }
24 24
25 mem_base = devm_ioremap_resource(&pdev->dev, res); 25 mem_base = devm_ioremap_resource(&pdev->dev, res);
26 if (!mem_base) { 26 if (IS_ERR(mem_base)) {
27 dev_err(&pdev->dev, "Failed to get memory resource\n"); 27 dev_err(&pdev->dev, "Failed to get memory resource\n");
28 return -EINVAL; 28 return PTR_ERR(mem_base);
29 } 29 }
30 30
31 mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), &mt7603_ops, 31 mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), &mt7603_ops,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h
index 0290ba5869a5..736f81752b5b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h
@@ -46,7 +46,7 @@ static const struct mt76_reg_pair common_mac_reg_table[] = {
46 { MT_MM20_PROT_CFG, 0x01742004 }, 46 { MT_MM20_PROT_CFG, 0x01742004 },
47 { MT_MM40_PROT_CFG, 0x03f42084 }, 47 { MT_MM40_PROT_CFG, 0x03f42084 },
48 { MT_TXOP_CTRL_CFG, 0x0000583f }, 48 { MT_TXOP_CTRL_CFG, 0x0000583f },
49 { MT_TX_RTS_CFG, 0x00092b20 }, 49 { MT_TX_RTS_CFG, 0x00ffff20 },
50 { MT_EXP_ACK_TIME, 0x002400ca }, 50 { MT_EXP_ACK_TIME, 0x002400ca },
51 { MT_TXOP_HLDR_ET, 0x00000002 }, 51 { MT_TXOP_HLDR_ET, 0x00000002 },
52 { MT_XIFS_TIME_CFG, 0x33a41010 }, 52 { MT_XIFS_TIME_CFG, 0x33a41010 },
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index 91718647da02..e5a06f74a6f7 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -229,7 +229,7 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,
229 struct usb_device *usb_dev = interface_to_usbdev(usb_intf); 229 struct usb_device *usb_dev = interface_to_usbdev(usb_intf);
230 struct mt76x02_dev *dev; 230 struct mt76x02_dev *dev;
231 struct mt76_dev *mdev; 231 struct mt76_dev *mdev;
232 u32 asic_rev, mac_rev; 232 u32 mac_rev;
233 int ret; 233 int ret;
234 234
235 mdev = mt76_alloc_device(&usb_intf->dev, sizeof(*dev), &mt76x0u_ops, 235 mdev = mt76_alloc_device(&usb_intf->dev, sizeof(*dev), &mt76x0u_ops,
@@ -262,10 +262,14 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,
262 goto err; 262 goto err;
263 } 263 }
264 264
265 asic_rev = mt76_rr(dev, MT_ASIC_VERSION); 265 mdev->rev = mt76_rr(dev, MT_ASIC_VERSION);
266 mac_rev = mt76_rr(dev, MT_MAC_CSR0); 266 mac_rev = mt76_rr(dev, MT_MAC_CSR0);
267 dev_info(mdev->dev, "ASIC revision: %08x MAC revision: %08x\n", 267 dev_info(mdev->dev, "ASIC revision: %08x MAC revision: %08x\n",
268 asic_rev, mac_rev); 268 mdev->rev, mac_rev);
269 if (!is_mt76x0(dev)) {
270 ret = -ENODEV;
271 goto err;
272 }
269 273
270 /* Note: vendor driver skips this check for MT76X0U */ 274 /* Note: vendor driver skips this check for MT76X0U */
271 if (!(mt76_rr(dev, MT_EFUSE_CTRL) & MT_EFUSE_CTRL_SEL)) 275 if (!(mt76_rr(dev, MT_EFUSE_CTRL) & MT_EFUSE_CTRL_SEL))
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 6915cce5def9..07061eb4d1e1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -51,6 +51,7 @@ struct mt76x02_calibration {
51 u16 false_cca; 51 u16 false_cca;
52 s8 avg_rssi_all; 52 s8 avg_rssi_all;
53 s8 agc_gain_adjust; 53 s8 agc_gain_adjust;
54 s8 agc_lowest_gain;
54 s8 low_gain; 55 s8 low_gain;
55 56
56 s8 temp_vco; 57 s8 temp_vco;
@@ -114,8 +115,11 @@ struct mt76x02_dev {
114 struct mt76x02_dfs_pattern_detector dfs_pd; 115 struct mt76x02_dfs_pattern_detector dfs_pd;
115 116
116 /* edcca monitor */ 117 /* edcca monitor */
118 unsigned long ed_trigger_timeout;
117 bool ed_tx_blocked; 119 bool ed_tx_blocked;
118 bool ed_monitor; 120 bool ed_monitor;
121 u8 ed_monitor_enabled;
122 u8 ed_monitor_learning;
119 u8 ed_trigger; 123 u8 ed_trigger;
120 u8 ed_silent; 124 u8 ed_silent;
121 ktime_t ed_time; 125 ktime_t ed_time;
@@ -188,6 +192,13 @@ void mt76x02_mac_start(struct mt76x02_dev *dev);
188 192
189void mt76x02_init_debugfs(struct mt76x02_dev *dev); 193void mt76x02_init_debugfs(struct mt76x02_dev *dev);
190 194
195static inline bool is_mt76x0(struct mt76x02_dev *dev)
196{
197 return mt76_chip(&dev->mt76) == 0x7610 ||
198 mt76_chip(&dev->mt76) == 0x7630 ||
199 mt76_chip(&dev->mt76) == 0x7650;
200}
201
191static inline bool is_mt76x2(struct mt76x02_dev *dev) 202static inline bool is_mt76x2(struct mt76x02_dev *dev)
192{ 203{
193 return mt76_chip(&dev->mt76) == 0x7612 || 204 return mt76_chip(&dev->mt76) == 0x7612 ||
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c b/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c
index 7580c5c986ff..b1d6fd4861e3 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c
@@ -116,6 +116,32 @@ static int read_agc(struct seq_file *file, void *data)
116 return 0; 116 return 0;
117} 117}
118 118
119static int
120mt76_edcca_set(void *data, u64 val)
121{
122 struct mt76x02_dev *dev = data;
123 enum nl80211_dfs_regions region = dev->dfs_pd.region;
124
125 dev->ed_monitor_enabled = !!val;
126 dev->ed_monitor = dev->ed_monitor_enabled &&
127 region == NL80211_DFS_ETSI;
128 mt76x02_edcca_init(dev, true);
129
130 return 0;
131}
132
133static int
134mt76_edcca_get(void *data, u64 *val)
135{
136 struct mt76x02_dev *dev = data;
137
138 *val = dev->ed_monitor_enabled;
139 return 0;
140}
141
142DEFINE_DEBUGFS_ATTRIBUTE(fops_edcca, mt76_edcca_get, mt76_edcca_set,
143 "%lld\n");
144
119void mt76x02_init_debugfs(struct mt76x02_dev *dev) 145void mt76x02_init_debugfs(struct mt76x02_dev *dev)
120{ 146{
121 struct dentry *dir; 147 struct dentry *dir;
@@ -127,6 +153,7 @@ void mt76x02_init_debugfs(struct mt76x02_dev *dev)
127 debugfs_create_u8("temperature", 0400, dir, &dev->cal.temp); 153 debugfs_create_u8("temperature", 0400, dir, &dev->cal.temp);
128 debugfs_create_bool("tpc", 0600, dir, &dev->enable_tpc); 154 debugfs_create_bool("tpc", 0600, dir, &dev->enable_tpc);
129 155
156 debugfs_create_file("edcca", 0400, dir, dev, &fops_edcca);
130 debugfs_create_file("ampdu_stat", 0400, dir, dev, &fops_ampdu_stat); 157 debugfs_create_file("ampdu_stat", 0400, dir, dev, &fops_ampdu_stat);
131 debugfs_create_file("dfs_stats", 0400, dir, dev, &fops_dfs_stat); 158 debugfs_create_file("dfs_stats", 0400, dir, dev, &fops_dfs_stat);
132 debugfs_create_devm_seqfile(dev->mt76.dev, "txpower", dir, 159 debugfs_create_devm_seqfile(dev->mt76.dev, "txpower", dir,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c b/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
index e4649103efd4..17d12d212d1b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
@@ -885,7 +885,8 @@ mt76x02_dfs_set_domain(struct mt76x02_dev *dev,
885 if (dfs_pd->region != region) { 885 if (dfs_pd->region != region) {
886 tasklet_disable(&dfs_pd->dfs_tasklet); 886 tasklet_disable(&dfs_pd->dfs_tasklet);
887 887
888 dev->ed_monitor = region == NL80211_DFS_ETSI; 888 dev->ed_monitor = dev->ed_monitor_enabled &&
889 region == NL80211_DFS_ETSI;
889 mt76x02_edcca_init(dev, true); 890 mt76x02_edcca_init(dev, true);
890 891
891 dfs_pd->region = region; 892 dfs_pd->region = region;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 91ff6598eccf..9ed231abe916 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -67,12 +67,39 @@ int mt76x02_mac_shared_key_setup(struct mt76x02_dev *dev, u8 vif_idx,
67} 67}
68EXPORT_SYMBOL_GPL(mt76x02_mac_shared_key_setup); 68EXPORT_SYMBOL_GPL(mt76x02_mac_shared_key_setup);
69 69
70void mt76x02_mac_wcid_sync_pn(struct mt76x02_dev *dev, u8 idx,
71 struct ieee80211_key_conf *key)
72{
73 enum mt76x02_cipher_type cipher;
74 u8 key_data[32];
75 u32 iv, eiv;
76 u64 pn;
77
78 cipher = mt76x02_mac_get_key_info(key, key_data);
79 iv = mt76_rr(dev, MT_WCID_IV(idx));
80 eiv = mt76_rr(dev, MT_WCID_IV(idx) + 4);
81
82 pn = (u64)eiv << 16;
83 if (cipher == MT_CIPHER_TKIP) {
84 pn |= (iv >> 16) & 0xff;
85 pn |= (iv & 0xff) << 8;
86 } else if (cipher >= MT_CIPHER_AES_CCMP) {
87 pn |= iv & 0xffff;
88 } else {
89 return;
90 }
91
92 atomic64_set(&key->tx_pn, pn);
93}
94
95
70int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx, 96int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,
71 struct ieee80211_key_conf *key) 97 struct ieee80211_key_conf *key)
72{ 98{
73 enum mt76x02_cipher_type cipher; 99 enum mt76x02_cipher_type cipher;
74 u8 key_data[32]; 100 u8 key_data[32];
75 u8 iv_data[8]; 101 u8 iv_data[8];
102 u64 pn;
76 103
77 cipher = mt76x02_mac_get_key_info(key, key_data); 104 cipher = mt76x02_mac_get_key_info(key, key_data);
78 if (cipher == MT_CIPHER_NONE && key) 105 if (cipher == MT_CIPHER_NONE && key)
@@ -85,9 +112,22 @@ int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,
85 if (key) { 112 if (key) {
86 mt76_rmw_field(dev, MT_WCID_ATTR(idx), MT_WCID_ATTR_PAIRWISE, 113 mt76_rmw_field(dev, MT_WCID_ATTR(idx), MT_WCID_ATTR_PAIRWISE,
87 !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)); 114 !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE));
115
116 pn = atomic64_read(&key->tx_pn);
117
88 iv_data[3] = key->keyidx << 6; 118 iv_data[3] = key->keyidx << 6;
89 if (cipher >= MT_CIPHER_TKIP) 119 if (cipher >= MT_CIPHER_TKIP) {
90 iv_data[3] |= 0x20; 120 iv_data[3] |= 0x20;
121 put_unaligned_le32(pn >> 16, &iv_data[4]);
122 }
123
124 if (cipher == MT_CIPHER_TKIP) {
125 iv_data[0] = (pn >> 8) & 0xff;
126 iv_data[1] = (iv_data[0] | 0x20) & 0x7f;
127 iv_data[2] = pn & 0xff;
128 } else if (cipher >= MT_CIPHER_AES_CCMP) {
129 put_unaligned_le16((pn & 0xffff), &iv_data[0]);
130 }
91 } 131 }
92 132
93 mt76_wr_copy(dev, MT_WCID_IV(idx), iv_data, sizeof(iv_data)); 133 mt76_wr_copy(dev, MT_WCID_IV(idx), iv_data, sizeof(iv_data));
@@ -920,6 +960,7 @@ void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable)
920 } 960 }
921 } 961 }
922 mt76x02_edcca_tx_enable(dev, true); 962 mt76x02_edcca_tx_enable(dev, true);
963 dev->ed_monitor_learning = true;
923 964
924 /* clear previous CCA timer value */ 965 /* clear previous CCA timer value */
925 mt76_rr(dev, MT_ED_CCA_TIMER); 966 mt76_rr(dev, MT_ED_CCA_TIMER);
@@ -929,6 +970,10 @@ EXPORT_SYMBOL_GPL(mt76x02_edcca_init);
929 970
930#define MT_EDCCA_TH 92 971#define MT_EDCCA_TH 92
931#define MT_EDCCA_BLOCK_TH 2 972#define MT_EDCCA_BLOCK_TH 2
973#define MT_EDCCA_LEARN_TH 50
974#define MT_EDCCA_LEARN_CCA 180
975#define MT_EDCCA_LEARN_TIMEOUT (20 * HZ)
976
932static void mt76x02_edcca_check(struct mt76x02_dev *dev) 977static void mt76x02_edcca_check(struct mt76x02_dev *dev)
933{ 978{
934 ktime_t cur_time; 979 ktime_t cur_time;
@@ -951,11 +996,23 @@ static void mt76x02_edcca_check(struct mt76x02_dev *dev)
951 dev->ed_trigger = 0; 996 dev->ed_trigger = 0;
952 } 997 }
953 998
954 if (dev->ed_trigger > MT_EDCCA_BLOCK_TH && 999 if (dev->cal.agc_lowest_gain &&
955 !dev->ed_tx_blocked) 1000 dev->cal.false_cca > MT_EDCCA_LEARN_CCA &&
1001 dev->ed_trigger > MT_EDCCA_LEARN_TH) {
1002 dev->ed_monitor_learning = false;
1003 dev->ed_trigger_timeout = jiffies + 20 * HZ;
1004 } else if (!dev->ed_monitor_learning &&
1005 time_is_after_jiffies(dev->ed_trigger_timeout)) {
1006 dev->ed_monitor_learning = true;
1007 mt76x02_edcca_tx_enable(dev, true);
1008 }
1009
1010 if (dev->ed_monitor_learning)
1011 return;
1012
1013 if (dev->ed_trigger > MT_EDCCA_BLOCK_TH && !dev->ed_tx_blocked)
956 mt76x02_edcca_tx_enable(dev, false); 1014 mt76x02_edcca_tx_enable(dev, false);
957 else if (dev->ed_silent > MT_EDCCA_BLOCK_TH && 1015 else if (dev->ed_silent > MT_EDCCA_BLOCK_TH && dev->ed_tx_blocked)
958 dev->ed_tx_blocked)
959 mt76x02_edcca_tx_enable(dev, true); 1016 mt76x02_edcca_tx_enable(dev, true);
960} 1017}
961 1018
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
index 6b1f25d2f64c..caeeef96c42f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
@@ -177,6 +177,8 @@ int mt76x02_mac_shared_key_setup(struct mt76x02_dev *dev, u8 vif_idx,
177 u8 key_idx, struct ieee80211_key_conf *key); 177 u8 key_idx, struct ieee80211_key_conf *key);
178int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx, 178int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,
179 struct ieee80211_key_conf *key); 179 struct ieee80211_key_conf *key);
180void mt76x02_mac_wcid_sync_pn(struct mt76x02_dev *dev, u8 idx,
181 struct ieee80211_key_conf *key);
180void mt76x02_mac_wcid_setup(struct mt76x02_dev *dev, u8 idx, u8 vif_idx, 182void mt76x02_mac_wcid_setup(struct mt76x02_dev *dev, u8 idx, u8 vif_idx,
181 u8 *mac); 183 u8 *mac);
182void mt76x02_mac_wcid_set_drop(struct mt76x02_dev *dev, u8 idx, bool drop); 184void mt76x02_mac_wcid_set_drop(struct mt76x02_dev *dev, u8 idx, bool drop);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 1229f19f2b02..daaed1220147 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -19,6 +19,7 @@
19#include <linux/irq.h> 19#include <linux/irq.h>
20 20
21#include "mt76x02.h" 21#include "mt76x02.h"
22#include "mt76x02_mcu.h"
22#include "mt76x02_trace.h" 23#include "mt76x02_trace.h"
23 24
24struct beacon_bc_data { 25struct beacon_bc_data {
@@ -418,9 +419,66 @@ static bool mt76x02_tx_hang(struct mt76x02_dev *dev)
418 return i < 4; 419 return i < 4;
419} 420}
420 421
422static void mt76x02_key_sync(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
423 struct ieee80211_sta *sta,
424 struct ieee80211_key_conf *key, void *data)
425{
426 struct mt76x02_dev *dev = hw->priv;
427 struct mt76_wcid *wcid;
428
429 if (!sta)
430 return;
431
432 wcid = (struct mt76_wcid *) sta->drv_priv;
433
434 if (wcid->hw_key_idx != key->keyidx || wcid->sw_iv)
435 return;
436
437 mt76x02_mac_wcid_sync_pn(dev, wcid->idx, key);
438}
439
440static void mt76x02_reset_state(struct mt76x02_dev *dev)
441{
442 int i;
443
444 lockdep_assert_held(&dev->mt76.mutex);
445
446 clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
447
448 rcu_read_lock();
449 ieee80211_iter_keys_rcu(dev->mt76.hw, NULL, mt76x02_key_sync, NULL);
450 rcu_read_unlock();
451
452 for (i = 0; i < ARRAY_SIZE(dev->mt76.wcid); i++) {
453 struct ieee80211_sta *sta;
454 struct ieee80211_vif *vif;
455 struct mt76x02_sta *msta;
456 struct mt76_wcid *wcid;
457 void *priv;
458
459 wcid = rcu_dereference_protected(dev->mt76.wcid[i],
460 lockdep_is_held(&dev->mt76.mutex));
461 if (!wcid)
462 continue;
463
464 priv = msta = container_of(wcid, struct mt76x02_sta, wcid);
465 sta = container_of(priv, struct ieee80211_sta, drv_priv);
466
467 priv = msta->vif;
468 vif = container_of(priv, struct ieee80211_vif, drv_priv);
469
470 __mt76_sta_remove(&dev->mt76, vif, sta);
471 memset(msta, 0, sizeof(*msta));
472 }
473
474 dev->vif_mask = 0;
475 dev->beacon_mask = 0;
476}
477
421static void mt76x02_watchdog_reset(struct mt76x02_dev *dev) 478static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
422{ 479{
423 u32 mask = dev->mt76.mmio.irqmask; 480 u32 mask = dev->mt76.mmio.irqmask;
481 bool restart = dev->mt76.mcu_ops->mcu_restart;
424 int i; 482 int i;
425 483
426 ieee80211_stop_queues(dev->mt76.hw); 484 ieee80211_stop_queues(dev->mt76.hw);
@@ -434,6 +492,9 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
434 492
435 mutex_lock(&dev->mt76.mutex); 493 mutex_lock(&dev->mt76.mutex);
436 494
495 if (restart)
496 mt76x02_reset_state(dev);
497
437 if (dev->beacon_mask) 498 if (dev->beacon_mask)
438 mt76_clear(dev, MT_BEACON_TIME_CFG, 499 mt76_clear(dev, MT_BEACON_TIME_CFG,
439 MT_BEACON_TIME_CFG_BEACON_TX | 500 MT_BEACON_TIME_CFG_BEACON_TX |
@@ -452,20 +513,21 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
452 /* let fw reset DMA */ 513 /* let fw reset DMA */
453 mt76_set(dev, 0x734, 0x3); 514 mt76_set(dev, 0x734, 0x3);
454 515
516 if (restart)
517 dev->mt76.mcu_ops->mcu_restart(&dev->mt76);
518
455 for (i = 0; i < ARRAY_SIZE(dev->mt76.q_tx); i++) 519 for (i = 0; i < ARRAY_SIZE(dev->mt76.q_tx); i++)
456 mt76_queue_tx_cleanup(dev, i, true); 520 mt76_queue_tx_cleanup(dev, i, true);
457 521
458 for (i = 0; i < ARRAY_SIZE(dev->mt76.q_rx); i++) 522 for (i = 0; i < ARRAY_SIZE(dev->mt76.q_rx); i++)
459 mt76_queue_rx_reset(dev, i); 523 mt76_queue_rx_reset(dev, i);
460 524
461 mt76_wr(dev, MT_MAC_SYS_CTRL, 525 mt76x02_mac_start(dev);
462 MT_MAC_SYS_CTRL_ENABLE_TX | MT_MAC_SYS_CTRL_ENABLE_RX); 526
463 mt76_set(dev, MT_WPDMA_GLO_CFG,
464 MT_WPDMA_GLO_CFG_TX_DMA_EN | MT_WPDMA_GLO_CFG_RX_DMA_EN);
465 if (dev->ed_monitor) 527 if (dev->ed_monitor)
466 mt76_set(dev, MT_TXOP_CTRL_CFG, MT_TXOP_ED_CCA_EN); 528 mt76_set(dev, MT_TXOP_CTRL_CFG, MT_TXOP_ED_CCA_EN);
467 529
468 if (dev->beacon_mask) 530 if (dev->beacon_mask && !restart)
469 mt76_set(dev, MT_BEACON_TIME_CFG, 531 mt76_set(dev, MT_BEACON_TIME_CFG,
470 MT_BEACON_TIME_CFG_BEACON_TX | 532 MT_BEACON_TIME_CFG_BEACON_TX |
471 MT_BEACON_TIME_CFG_TBTT_EN); 533 MT_BEACON_TIME_CFG_TBTT_EN);
@@ -486,9 +548,13 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
486 napi_schedule(&dev->mt76.napi[i]); 548 napi_schedule(&dev->mt76.napi[i]);
487 } 549 }
488 550
489 ieee80211_wake_queues(dev->mt76.hw); 551 if (restart) {
490 552 mt76x02_mcu_function_select(dev, Q_SELECT, 1);
491 mt76_txq_schedule_all(&dev->mt76); 553 ieee80211_restart_hw(dev->mt76.hw);
554 } else {
555 ieee80211_wake_queues(dev->mt76.hw);
556 mt76_txq_schedule_all(&dev->mt76);
557 }
492} 558}
493 559
494static void mt76x02_check_tx_hang(struct mt76x02_dev *dev) 560static void mt76x02_check_tx_hang(struct mt76x02_dev *dev)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
index a020c757ba5c..a54b63a96eae 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
@@ -194,6 +194,8 @@ bool mt76x02_phy_adjust_vga_gain(struct mt76x02_dev *dev)
194 ret = true; 194 ret = true;
195 } 195 }
196 196
197 dev->cal.agc_lowest_gain = dev->cal.agc_gain_adjust >= limit;
198
197 return ret; 199 return ret;
198} 200}
199EXPORT_SYMBOL_GPL(mt76x02_phy_adjust_vga_gain); 201EXPORT_SYMBOL_GPL(mt76x02_phy_adjust_vga_gain);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
index 43f07461c8d3..6fb52b596d42 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
@@ -85,8 +85,9 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
85 85
86 mt76x02_insert_hdr_pad(skb); 86 mt76x02_insert_hdr_pad(skb);
87 87
88 txwi = skb_push(skb, sizeof(struct mt76x02_txwi)); 88 txwi = (struct mt76x02_txwi *)(skb->data - sizeof(struct mt76x02_txwi));
89 mt76x02_mac_write_txwi(dev, txwi, skb, wcid, sta, len); 89 mt76x02_mac_write_txwi(dev, txwi, skb, wcid, sta, len);
90 skb_push(skb, sizeof(struct mt76x02_txwi));
90 91
91 pid = mt76_tx_status_skb_add(mdev, wcid, skb); 92 pid = mt76_tx_status_skb_add(mdev, wcid, skb);
92 txwi->pktid = pid; 93 txwi->pktid = pid;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index a48c261b0c63..cd072ac614f7 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -237,6 +237,8 @@ int mt76x02_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
237 struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv; 237 struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;
238 int idx = 0; 238 int idx = 0;
239 239
240 memset(msta, 0, sizeof(*msta));
241
240 idx = mt76_wcid_alloc(dev->mt76.wcid_mask, ARRAY_SIZE(dev->mt76.wcid)); 242 idx = mt76_wcid_alloc(dev->mt76.wcid_mask, ARRAY_SIZE(dev->mt76.wcid));
241 if (idx < 0) 243 if (idx < 0)
242 return -ENOSPC; 244 return -ENOSPC;
@@ -274,6 +276,8 @@ mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif,
274 struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv; 276 struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;
275 struct mt76_txq *mtxq; 277 struct mt76_txq *mtxq;
276 278
279 memset(mvif, 0, sizeof(*mvif));
280
277 mvif->idx = idx; 281 mvif->idx = idx;
278 mvif->group_wcid.idx = MT_VIF_WCID(idx); 282 mvif->group_wcid.idx = MT_VIF_WCID(idx);
279 mvif->group_wcid.hw_key_idx = -1; 283 mvif->group_wcid.hw_key_idx = -1;
@@ -289,6 +293,12 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
289 struct mt76x02_dev *dev = hw->priv; 293 struct mt76x02_dev *dev = hw->priv;
290 unsigned int idx = 0; 294 unsigned int idx = 0;
291 295
296 /* Allow to change address in HW if we create first interface. */
297 if (!dev->vif_mask &&
298 (((vif->addr[0] ^ dev->mt76.macaddr[0]) & ~GENMASK(4, 1)) ||
299 memcmp(vif->addr + 1, dev->mt76.macaddr + 1, ETH_ALEN - 1)))
300 mt76x02_mac_setaddr(dev, vif->addr);
301
292 if (vif->addr[0] & BIT(1)) 302 if (vif->addr[0] & BIT(1))
293 idx = 1 + (((dev->mt76.macaddr[0] ^ vif->addr[0]) >> 2) & 7); 303 idx = 1 + (((dev->mt76.macaddr[0] ^ vif->addr[0]) >> 2) & 7);
294 304
@@ -311,10 +321,6 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
311 if (dev->vif_mask & BIT(idx)) 321 if (dev->vif_mask & BIT(idx))
312 return -EBUSY; 322 return -EBUSY;
313 323
314 /* Allow to change address in HW if we create first interface. */
315 if (!dev->vif_mask && !ether_addr_equal(dev->mt76.macaddr, vif->addr))
316 mt76x02_mac_setaddr(dev, vif->addr);
317
318 dev->vif_mask |= BIT(idx); 324 dev->vif_mask |= BIT(idx);
319 325
320 mt76x02_vif_init(dev, vif, idx); 326 mt76x02_vif_init(dev, vif, idx);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c
index f8534362e2c8..a30ef2c5a9db 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c
@@ -106,7 +106,7 @@ void mt76_write_mac_initvals(struct mt76x02_dev *dev)
106 { MT_TX_SW_CFG1, 0x00010000 }, 106 { MT_TX_SW_CFG1, 0x00010000 },
107 { MT_TX_SW_CFG2, 0x00000000 }, 107 { MT_TX_SW_CFG2, 0x00000000 },
108 { MT_TXOP_CTRL_CFG, 0x0400583f }, 108 { MT_TXOP_CTRL_CFG, 0x0400583f },
109 { MT_TX_RTS_CFG, 0x00100020 }, 109 { MT_TX_RTS_CFG, 0x00ffff20 },
110 { MT_TX_TIMEOUT_CFG, 0x000a2290 }, 110 { MT_TX_TIMEOUT_CFG, 0x000a2290 },
111 { MT_TX_RETRY_CFG, 0x47f01f0f }, 111 { MT_TX_RETRY_CFG, 0x47f01f0f },
112 { MT_EXP_ACK_TIME, 0x002c00dc }, 112 { MT_EXP_ACK_TIME, 0x002c00dc },
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
index 6c619f1c65c9..d7abe3d73bad 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
@@ -71,6 +71,7 @@ int mt76x2_mcu_load_cr(struct mt76x02_dev *dev, u8 type, u8 temp_level,
71 71
72void mt76x2_cleanup(struct mt76x02_dev *dev); 72void mt76x2_cleanup(struct mt76x02_dev *dev);
73 73
74int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard);
74void mt76x2_reset_wlan(struct mt76x02_dev *dev, bool enable); 75void mt76x2_reset_wlan(struct mt76x02_dev *dev, bool enable);
75void mt76x2_init_txpower(struct mt76x02_dev *dev, 76void mt76x2_init_txpower(struct mt76x02_dev *dev,
76 struct ieee80211_supported_band *sband); 77 struct ieee80211_supported_band *sband);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index 984d9c4c2e1a..d3927a13e92e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -77,7 +77,7 @@ mt76x2_fixup_xtal(struct mt76x02_dev *dev)
77 } 77 }
78} 78}
79 79
80static int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard) 80int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard)
81{ 81{
82 const u8 *macaddr = dev->mt76.macaddr; 82 const u8 *macaddr = dev->mt76.macaddr;
83 u32 val; 83 u32 val;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c
index 03e24ae7f66c..605dc66ae83b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c
@@ -165,9 +165,30 @@ error:
165 return -ENOENT; 165 return -ENOENT;
166} 166}
167 167
168static int
169mt76pci_mcu_restart(struct mt76_dev *mdev)
170{
171 struct mt76x02_dev *dev;
172 int ret;
173
174 dev = container_of(mdev, struct mt76x02_dev, mt76);
175
176 mt76x02_mcu_cleanup(dev);
177 mt76x2_mac_reset(dev, true);
178
179 ret = mt76pci_load_firmware(dev);
180 if (ret)
181 return ret;
182
183 mt76_wr(dev, MT_WPDMA_RST_IDX, ~0);
184
185 return 0;
186}
187
168int mt76x2_mcu_init(struct mt76x02_dev *dev) 188int mt76x2_mcu_init(struct mt76x02_dev *dev)
169{ 189{
170 static const struct mt76_mcu_ops mt76x2_mcu_ops = { 190 static const struct mt76_mcu_ops mt76x2_mcu_ops = {
191 .mcu_restart = mt76pci_mcu_restart,
171 .mcu_send_msg = mt76x02_mcu_msg_send, 192 .mcu_send_msg = mt76x02_mcu_msg_send,
172 }; 193 };
173 int ret; 194 int ret;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
index 1848e8ab2e21..769a9b972044 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
@@ -260,10 +260,15 @@ mt76x2_phy_set_gain_val(struct mt76x02_dev *dev)
260 gain_val[0] = dev->cal.agc_gain_cur[0] - dev->cal.agc_gain_adjust; 260 gain_val[0] = dev->cal.agc_gain_cur[0] - dev->cal.agc_gain_adjust;
261 gain_val[1] = dev->cal.agc_gain_cur[1] - dev->cal.agc_gain_adjust; 261 gain_val[1] = dev->cal.agc_gain_cur[1] - dev->cal.agc_gain_adjust;
262 262
263 if (dev->mt76.chandef.width >= NL80211_CHAN_WIDTH_40) 263 val = 0x1836 << 16;
264 if (!mt76x2_has_ext_lna(dev) &&
265 dev->mt76.chandef.width >= NL80211_CHAN_WIDTH_40)
264 val = 0x1e42 << 16; 266 val = 0x1e42 << 16;
265 else 267
266 val = 0x1836 << 16; 268 if (mt76x2_has_ext_lna(dev) &&
269 dev->mt76.chandef.chan->band == NL80211_BAND_2GHZ &&
270 dev->mt76.chandef.width < NL80211_CHAN_WIDTH_40)
271 val = 0x0f36 << 16;
267 272
268 val |= 0xf8; 273 val |= 0xf8;
269 274
@@ -280,6 +285,7 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)
280{ 285{
281 u8 *gain = dev->cal.agc_gain_init; 286 u8 *gain = dev->cal.agc_gain_init;
282 u8 low_gain_delta, gain_delta; 287 u8 low_gain_delta, gain_delta;
288 u32 agc_35, agc_37;
283 bool gain_change; 289 bool gain_change;
284 int low_gain; 290 int low_gain;
285 u32 val; 291 u32 val;
@@ -318,6 +324,16 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)
318 else 324 else
319 low_gain_delta = 14; 325 low_gain_delta = 14;
320 326
327 agc_37 = 0x2121262c;
328 if (dev->mt76.chandef.chan->band == NL80211_BAND_2GHZ)
329 agc_35 = 0x11111516;
330 else if (low_gain == 2)
331 agc_35 = agc_37 = 0x08080808;
332 else if (dev->mt76.chandef.width == NL80211_CHAN_WIDTH_80)
333 agc_35 = 0x10101014;
334 else
335 agc_35 = 0x11111116;
336
321 if (low_gain == 2) { 337 if (low_gain == 2) {
322 mt76_wr(dev, MT_BBP(RXO, 18), 0xf000a990); 338 mt76_wr(dev, MT_BBP(RXO, 18), 0xf000a990);
323 mt76_wr(dev, MT_BBP(AGC, 35), 0x08080808); 339 mt76_wr(dev, MT_BBP(AGC, 35), 0x08080808);
@@ -326,15 +342,13 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)
326 dev->cal.agc_gain_adjust = 0; 342 dev->cal.agc_gain_adjust = 0;
327 } else { 343 } else {
328 mt76_wr(dev, MT_BBP(RXO, 18), 0xf000a991); 344 mt76_wr(dev, MT_BBP(RXO, 18), 0xf000a991);
329 if (dev->mt76.chandef.width == NL80211_CHAN_WIDTH_80)
330 mt76_wr(dev, MT_BBP(AGC, 35), 0x10101014);
331 else
332 mt76_wr(dev, MT_BBP(AGC, 35), 0x11111116);
333 mt76_wr(dev, MT_BBP(AGC, 37), 0x2121262C);
334 gain_delta = 0; 345 gain_delta = 0;
335 dev->cal.agc_gain_adjust = low_gain_delta; 346 dev->cal.agc_gain_adjust = low_gain_delta;
336 } 347 }
337 348
349 mt76_wr(dev, MT_BBP(AGC, 35), agc_35);
350 mt76_wr(dev, MT_BBP(AGC, 37), agc_37);
351
338 dev->cal.agc_gain_cur[0] = gain[0] - gain_delta; 352 dev->cal.agc_gain_cur[0] = gain[0] - gain_delta;
339 dev->cal.agc_gain_cur[1] = gain[1] - gain_delta; 353 dev->cal.agc_gain_cur[1] = gain[1] - gain_delta;
340 mt76x2_phy_set_gain_val(dev); 354 mt76x2_phy_set_gain_val(dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
index ddb6b2c48e01..ac0f13d46299 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
@@ -21,11 +21,10 @@
21#include "mt76x2u.h" 21#include "mt76x2u.h"
22 22
23static const struct usb_device_id mt76x2u_device_table[] = { 23static const struct usb_device_id mt76x2u_device_table[] = {
24 { USB_DEVICE(0x0e8d, 0x7612) }, /* Alfa AWUS036ACM */
25 { USB_DEVICE(0x0b05, 0x1833) }, /* Asus USB-AC54 */ 24 { USB_DEVICE(0x0b05, 0x1833) }, /* Asus USB-AC54 */
26 { USB_DEVICE(0x0b05, 0x17eb) }, /* Asus USB-AC55 */ 25 { USB_DEVICE(0x0b05, 0x17eb) }, /* Asus USB-AC55 */
27 { USB_DEVICE(0x0b05, 0x180b) }, /* Asus USB-N53 B1 */ 26 { USB_DEVICE(0x0b05, 0x180b) }, /* Asus USB-N53 B1 */
28 { USB_DEVICE(0x0e8d, 0x7612) }, /* Aukey USB-AC1200 */ 27 { USB_DEVICE(0x0e8d, 0x7612) }, /* Aukey USBAC1200 - Alfa AWUS036ACM */
29 { USB_DEVICE(0x057c, 0x8503) }, /* Avm FRITZ!WLAN AC860 */ 28 { USB_DEVICE(0x057c, 0x8503) }, /* Avm FRITZ!WLAN AC860 */
30 { USB_DEVICE(0x7392, 0xb711) }, /* Edimax EW 7722 UAC */ 29 { USB_DEVICE(0x7392, 0xb711) }, /* Edimax EW 7722 UAC */
31 { USB_DEVICE(0x0846, 0x9053) }, /* Netgear A6210 */ 30 { USB_DEVICE(0x0846, 0x9053) }, /* Netgear A6210 */
@@ -66,6 +65,10 @@ static int mt76x2u_probe(struct usb_interface *intf,
66 65
67 mdev->rev = mt76_rr(dev, MT_ASIC_VERSION); 66 mdev->rev = mt76_rr(dev, MT_ASIC_VERSION);
68 dev_info(mdev->dev, "ASIC revision: %08x\n", mdev->rev); 67 dev_info(mdev->dev, "ASIC revision: %08x\n", mdev->rev);
68 if (!is_mt76x2(dev)) {
69 err = -ENODEV;
70 goto err;
71 }
69 72
70 err = mt76x2u_register_device(dev); 73 err = mt76x2u_register_device(dev);
71 if (err < 0) 74 if (err < 0)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c
index 5e84b4535cb1..3b82345756ea 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c
@@ -93,7 +93,6 @@ int mt76x2u_mac_reset(struct mt76x02_dev *dev)
93 mt76_wr(dev, MT_TX_LINK_CFG, 0x1020); 93 mt76_wr(dev, MT_TX_LINK_CFG, 0x1020);
94 mt76_wr(dev, MT_AUTO_RSP_CFG, 0x13); 94 mt76_wr(dev, MT_AUTO_RSP_CFG, 0x13);
95 mt76_wr(dev, MT_MAX_LEN_CFG, 0x2f00); 95 mt76_wr(dev, MT_MAX_LEN_CFG, 0x2f00);
96 mt76_wr(dev, MT_TX_RTS_CFG, 0x92b20);
97 96
98 mt76_wr(dev, MT_WMM_AIFSN, 0x2273); 97 mt76_wr(dev, MT_WMM_AIFSN, 0x2273);
99 mt76_wr(dev, MT_WMM_CWMIN, 0x2344); 98 mt76_wr(dev, MT_WMM_CWMIN, 0x2344);
diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index 5a349fe3e576..2585df512335 100644
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -289,8 +289,11 @@ mt76_tx(struct mt76_dev *dev, struct ieee80211_sta *sta,
289 dev->queue_ops->tx_queue_skb(dev, q, skb, wcid, sta); 289 dev->queue_ops->tx_queue_skb(dev, q, skb, wcid, sta);
290 dev->queue_ops->kick(dev, q); 290 dev->queue_ops->kick(dev, q);
291 291
292 if (q->queued > q->ndesc - 8) 292 if (q->queued > q->ndesc - 8 && !q->stopped) {
293 ieee80211_stop_queue(dev->hw, skb_get_queue_mapping(skb)); 293 ieee80211_stop_queue(dev->hw, skb_get_queue_mapping(skb));
294 q->stopped = true;
295 }
296
294 spin_unlock_bh(&q->lock); 297 spin_unlock_bh(&q->lock);
295} 298}
296EXPORT_SYMBOL_GPL(mt76_tx); 299EXPORT_SYMBOL_GPL(mt76_tx);
@@ -374,7 +377,10 @@ mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
374 if (last_skb) { 377 if (last_skb) {
375 mt76_queue_ps_skb(dev, sta, last_skb, true); 378 mt76_queue_ps_skb(dev, sta, last_skb, true);
376 dev->queue_ops->kick(dev, hwq); 379 dev->queue_ops->kick(dev, hwq);
380 } else {
381 ieee80211_sta_eosp(sta);
377 } 382 }
383
378 spin_unlock_bh(&hwq->lock); 384 spin_unlock_bh(&hwq->lock);
379} 385}
380EXPORT_SYMBOL_GPL(mt76_release_buffered_frames); 386EXPORT_SYMBOL_GPL(mt76_release_buffered_frames);
@@ -577,6 +583,9 @@ void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq)
577 struct mt76_txq *mtxq = (struct mt76_txq *) txq->drv_priv; 583 struct mt76_txq *mtxq = (struct mt76_txq *) txq->drv_priv;
578 struct mt76_queue *hwq = mtxq->hwq; 584 struct mt76_queue *hwq = mtxq->hwq;
579 585
586 if (!test_bit(MT76_STATE_RUNNING, &dev->state))
587 return;
588
580 spin_lock_bh(&hwq->lock); 589 spin_lock_bh(&hwq->lock);
581 if (list_empty(&mtxq->list)) 590 if (list_empty(&mtxq->list))
582 list_add_tail(&mtxq->list, &hwq->swq); 591 list_add_tail(&mtxq->list, &hwq->swq);
diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index ae6ada370597..4c1abd492405 100644
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -655,7 +655,11 @@ static void mt76u_tx_tasklet(unsigned long data)
655 spin_lock_bh(&q->lock); 655 spin_lock_bh(&q->lock);
656 } 656 }
657 mt76_txq_schedule(dev, q); 657 mt76_txq_schedule(dev, q);
658 wake = i < IEEE80211_NUM_ACS && q->queued < q->ndesc - 8; 658
659 wake = q->stopped && q->queued < q->ndesc - 8;
660 if (wake)
661 q->stopped = false;
662
659 if (!q->queued) 663 if (!q->queued)
660 wake_up(&dev->tx_wait); 664 wake_up(&dev->tx_wait);
661 665
diff --git a/drivers/net/wireless/mediatek/mt7601u/usb.c b/drivers/net/wireless/mediatek/mt7601u/usb.c
index d8b7863f7926..6ae7f14dc9bf 100644
--- a/drivers/net/wireless/mediatek/mt7601u/usb.c
+++ b/drivers/net/wireless/mediatek/mt7601u/usb.c
@@ -303,6 +303,10 @@ static int mt7601u_probe(struct usb_interface *usb_intf,
303 mac_rev = mt7601u_rr(dev, MT_MAC_CSR0); 303 mac_rev = mt7601u_rr(dev, MT_MAC_CSR0);
304 dev_info(dev->dev, "ASIC revision: %08x MAC revision: %08x\n", 304 dev_info(dev->dev, "ASIC revision: %08x MAC revision: %08x\n",
305 asic_rev, mac_rev); 305 asic_rev, mac_rev);
306 if ((asic_rev >> 16) != 0x7601) {
307 ret = -ENODEV;
308 goto err;
309 }
306 310
307 /* Note: vendor driver skips this check for MT7601U */ 311 /* Note: vendor driver skips this check for MT7601U */
308 if (!(mt7601u_rr(dev, MT_EFUSE_CTRL) & MT_EFUSE_CTRL_SEL)) 312 if (!(mt7601u_rr(dev, MT_EFUSE_CTRL) & MT_EFUSE_CTRL_SEL))
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 197b0f5b63e7..44bd6f04c145 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1150,13 +1150,16 @@ static void qeth_notify_skbs(struct qeth_qdio_out_q *q,
1150 1150
1151static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf) 1151static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf)
1152{ 1152{
1153 struct sk_buff *skb;
1154
1153 /* release may never happen from within CQ tasklet scope */ 1155 /* release may never happen from within CQ tasklet scope */
1154 WARN_ON_ONCE(atomic_read(&buf->state) == QETH_QDIO_BUF_IN_CQ); 1156 WARN_ON_ONCE(atomic_read(&buf->state) == QETH_QDIO_BUF_IN_CQ);
1155 1157
1156 if (atomic_read(&buf->state) == QETH_QDIO_BUF_PENDING) 1158 if (atomic_read(&buf->state) == QETH_QDIO_BUF_PENDING)
1157 qeth_notify_skbs(buf->q, buf, TX_NOTIFY_GENERALERROR); 1159 qeth_notify_skbs(buf->q, buf, TX_NOTIFY_GENERALERROR);
1158 1160
1159 __skb_queue_purge(&buf->skb_list); 1161 while ((skb = __skb_dequeue(&buf->skb_list)) != NULL)
1162 consume_skb(skb);
1160} 1163}
1161 1164
1162static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue, 1165static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 8efb2e8ff8f4..c3067fd3bd9e 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -629,8 +629,7 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb,
629 } /* else fall through */ 629 } /* else fall through */
630 630
631 QETH_TXQ_STAT_INC(queue, tx_dropped); 631 QETH_TXQ_STAT_INC(queue, tx_dropped);
632 QETH_TXQ_STAT_INC(queue, tx_errors); 632 kfree_skb(skb);
633 dev_kfree_skb_any(skb);
634 netif_wake_queue(dev); 633 netif_wake_queue(dev);
635 return NETDEV_TX_OK; 634 return NETDEV_TX_OK;
636} 635}
@@ -645,6 +644,8 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
645 struct qeth_card *card = dev_get_drvdata(&gdev->dev); 644 struct qeth_card *card = dev_get_drvdata(&gdev->dev);
646 int rc; 645 int rc;
647 646
647 qeth_l2_vnicc_set_defaults(card);
648
648 if (gdev->dev.type == &qeth_generic_devtype) { 649 if (gdev->dev.type == &qeth_generic_devtype) {
649 rc = qeth_l2_create_device_attributes(&gdev->dev); 650 rc = qeth_l2_create_device_attributes(&gdev->dev);
650 if (rc) 651 if (rc)
@@ -652,8 +653,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
652 } 653 }
653 654
654 hash_init(card->mac_htable); 655 hash_init(card->mac_htable);
655 card->info.hwtrap = 0;
656 qeth_l2_vnicc_set_defaults(card);
657 return 0; 656 return 0;
658} 657}
659 658
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 7e68d9d16859..53712cf26406 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2096,8 +2096,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb,
2096 2096
2097tx_drop: 2097tx_drop:
2098 QETH_TXQ_STAT_INC(queue, tx_dropped); 2098 QETH_TXQ_STAT_INC(queue, tx_dropped);
2099 QETH_TXQ_STAT_INC(queue, tx_errors); 2099 kfree_skb(skb);
2100 dev_kfree_skb_any(skb);
2101 netif_wake_queue(dev); 2100 netif_wake_queue(dev);
2102 return NETDEV_TX_OK; 2101 return NETDEV_TX_OK;
2103} 2102}
@@ -2253,14 +2252,15 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
2253 struct qeth_card *card = dev_get_drvdata(&gdev->dev); 2252 struct qeth_card *card = dev_get_drvdata(&gdev->dev);
2254 int rc; 2253 int rc;
2255 2254
2255 hash_init(card->ip_htable);
2256
2256 if (gdev->dev.type == &qeth_generic_devtype) { 2257 if (gdev->dev.type == &qeth_generic_devtype) {
2257 rc = qeth_l3_create_device_attributes(&gdev->dev); 2258 rc = qeth_l3_create_device_attributes(&gdev->dev);
2258 if (rc) 2259 if (rc)
2259 return rc; 2260 return rc;
2260 } 2261 }
2261 hash_init(card->ip_htable); 2262
2262 hash_init(card->ip_mc_htable); 2263 hash_init(card->ip_mc_htable);
2263 card->info.hwtrap = 0;
2264 return 0; 2264 return 0;
2265} 2265}
2266 2266
generated by cgit v1.2.2 (git 2.25.0) at 2026-01-02 21:58:16 -0500