Commit f2afccfe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.3-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from wireless and can.

  Current release - regressions:

   - wifi: mac80211:
      - fix potential null pointer dereference
      - fix receiving mesh packets in forwarding=0 networks
      - fix mesh forwarding

  Current release - new code bugs:

   - virtio/vsock: fix leaks due to missing skb owner

  Previous releases - regressions:

   - raw: fix NULL deref in raw_get_next().

   - sctp: check send stream number after wait_for_sndbuf

   - qrtr:
      - fix a refcount bug in qrtr_recvmsg()
      - do not do DEL_SERVER broadcast after DEL_CLIENT

   - wifi: brcmfmac: fix SDIO suspend/resume regression

   - wifi: mt76: fix use-after-free in fw features query.

   - can: fix race between isotp_sendsmg() and isotp_release()

   - eth: mtk_eth_soc: fix remaining throughput regression

   - eth: ice: reset FDIR counter in FDIR init stage

  Previous releases - always broken:

   - core: don't let netpoll invoke NAPI if in xmit context

   - icmp: guard against too small mtu

   - ipv6: fix an uninit variable access bug in __ip6_make_skb()

   - wifi: mac80211: fix the size calculation of
     ieee80211_ie_len_eht_cap()

   - can: fix poll() to not report false EPOLLOUT events

   - eth: gve: secure enough bytes in the first TX desc for all TCP
     pkts"

* tag 'net-6.3-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (47 commits)
  net: stmmac: check fwnode for phy device before scanning for phy
  net: stmmac: Add queue reset into stmmac_xdp_open() function
  selftests: net: rps_default_mask.sh: delete veth link specifically
  net: fec: make use of MDIO C45 quirk
  can: isotp: fix race between isotp_sendsmg() and isotp_release()
  can: isotp: isotp_ops: fix poll() to not report false EPOLLOUT events
  can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get SOCK_RXQ_OVFL infos
  can: j1939: j1939_tp_tx_dat_new(): fix out-of-bounds memory access
  gve: Secure enough bytes in the first TX desc for all TCP pkts
  netlink: annotate lockless accesses to nlk->max_recvmsg_len
  ethtool: reset #lanes when lanes is omitted
  ping: Fix potentail NULL deref for /proc/net/icmp.
  raw: Fix NULL deref in raw_get_next().
  ice: Reset FDIR counter in FDIR init stage
  ice: fix wrong fallback logic for FDIR
  net: stmmac: fix up RX flow hash indirection table when setting channels
  net: ethernet: ti: am65-cpsw: Fix mdio cleanup in probe
  wifi: mt76: ignore key disable commands
  wifi: ath11k: reduce the MHI timeout to 20s
  ipv6: Fix an uninit variable access bug in __ip6_make_skb()
  ...
parents 8f2e1a85 8fbc10b9

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -5601,7 +5601,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { 
	 * .port_set_upstream_port method.

	 */

	.set_egress_port = mv88e6393x_set_egress_port,

	.watchdog_ops = &mv88e6390_watchdog_ops,

	.watchdog_ops = &mv88e6393x_watchdog_ops,

	.mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu,

	.pot_clear = mv88e6xxx_g2_pot_clear,

	.reset = mv88e6352_g1_reset,

drivers/net/dsa/mv88e6xxx/global2.c

+20 −0
Original line number Diff line number Diff line
@@ -943,6 +943,26 @@ const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops = { 
	.irq_free = mv88e6390_watchdog_free,

};



static int mv88e6393x_watchdog_action(struct mv88e6xxx_chip *chip, int irq)

{

	mv88e6390_watchdog_action(chip, irq);



	/* Fix for clearing the force WD event bit.

	 * Unreleased erratum on mv88e6393x.

	 */

	mv88e6xxx_g2_write(chip, MV88E6390_G2_WDOG_CTL,

			   MV88E6390_G2_WDOG_CTL_UPDATE |

			   MV88E6390_G2_WDOG_CTL_PTR_EVENT);



	return IRQ_HANDLED;

}



const struct mv88e6xxx_irq_ops mv88e6393x_watchdog_ops = {

	.irq_action = mv88e6393x_watchdog_action,

	.irq_setup = mv88e6390_watchdog_setup,

	.irq_free = mv88e6390_watchdog_free,

};



static irqreturn_t mv88e6xxx_g2_watchdog_thread_fn(int irq, void *dev_id)

{

	struct mv88e6xxx_chip *chip = dev_id;

drivers/net/dsa/mv88e6xxx/global2.h

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ int mv88e6xxx_g2_device_mapping_write(struct mv88e6xxx_chip *chip, int target, 
extern const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops;

extern const struct mv88e6xxx_irq_ops mv88e6250_watchdog_ops;

extern const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops;

extern const struct mv88e6xxx_irq_ops mv88e6393x_watchdog_ops;



extern const struct mv88e6xxx_avb_ops mv88e6165_avb_ops;

extern const struct mv88e6xxx_avb_ops mv88e6352_avb_ops;

drivers/net/ethernet/freescale/fec.h

+5 −0
Original line number Diff line number Diff line
@@ -507,6 +507,11 @@ struct bufdesc_ex { 
/* i.MX6Q adds pm_qos support */

#define FEC_QUIRK_HAS_PMQOS			BIT(23)



/* Not all FEC hardware block MDIOs support accesses in C45 mode.

 * Older blocks in the ColdFire parts do not support it.

 */

#define FEC_QUIRK_HAS_MDIO_C45		BIT(24)



struct bufdesc_prop {

	int qid;

	/* Address of Rx and Tx buffers */

drivers/net/ethernet/freescale/fec_main.c

+20 −12
Original line number Diff line number Diff line
@@ -100,18 +100,19 @@ struct fec_devinfo { 


static const struct fec_devinfo fec_imx25_info = {

	.quirks = FEC_QUIRK_USE_GASKET | FEC_QUIRK_MIB_CLEAR |

		  FEC_QUIRK_HAS_FRREG,

		  FEC_QUIRK_HAS_FRREG | FEC_QUIRK_HAS_MDIO_C45,

};



static const struct fec_devinfo fec_imx27_info = {

	.quirks = FEC_QUIRK_MIB_CLEAR | FEC_QUIRK_HAS_FRREG,

	.quirks = FEC_QUIRK_MIB_CLEAR | FEC_QUIRK_HAS_FRREG |

		  FEC_QUIRK_HAS_MDIO_C45,

};



static const struct fec_devinfo fec_imx28_info = {

	.quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME |

		  FEC_QUIRK_SINGLE_MDIO | FEC_QUIRK_HAS_RACC |

		  FEC_QUIRK_HAS_FRREG | FEC_QUIRK_CLEAR_SETUP_MII |

		  FEC_QUIRK_NO_HARD_RESET,

		  FEC_QUIRK_NO_HARD_RESET | FEC_QUIRK_HAS_MDIO_C45,

};



static const struct fec_devinfo fec_imx6q_info = {
@@ -119,11 +120,12 @@ static const struct fec_devinfo fec_imx6q_info = { 
		  FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |

		  FEC_QUIRK_HAS_VLAN | FEC_QUIRK_ERR006358 |

		  FEC_QUIRK_HAS_RACC | FEC_QUIRK_CLEAR_SETUP_MII |

		  FEC_QUIRK_HAS_PMQOS,

		  FEC_QUIRK_HAS_PMQOS | FEC_QUIRK_HAS_MDIO_C45,

};



static const struct fec_devinfo fec_mvf600_info = {

	.quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_RACC,

	.quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_RACC |

		  FEC_QUIRK_HAS_MDIO_C45,

};



static const struct fec_devinfo fec_imx6x_info = {
@@ -132,7 +134,8 @@ static const struct fec_devinfo fec_imx6x_info = { 
		  FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB |

		  FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE |

		  FEC_QUIRK_HAS_RACC | FEC_QUIRK_HAS_COALESCE |

		  FEC_QUIRK_CLEAR_SETUP_MII | FEC_QUIRK_HAS_MULTI_QUEUES,

		  FEC_QUIRK_CLEAR_SETUP_MII | FEC_QUIRK_HAS_MULTI_QUEUES |

		  FEC_QUIRK_HAS_MDIO_C45,

};



static const struct fec_devinfo fec_imx6ul_info = {
@@ -140,7 +143,8 @@ static const struct fec_devinfo fec_imx6ul_info = { 
		  FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |

		  FEC_QUIRK_HAS_VLAN | FEC_QUIRK_ERR007885 |

		  FEC_QUIRK_BUG_CAPTURE | FEC_QUIRK_HAS_RACC |

		  FEC_QUIRK_HAS_COALESCE | FEC_QUIRK_CLEAR_SETUP_MII,

		  FEC_QUIRK_HAS_COALESCE | FEC_QUIRK_CLEAR_SETUP_MII |

		  FEC_QUIRK_HAS_MDIO_C45,

};



static const struct fec_devinfo fec_imx8mq_info = {
@@ -150,7 +154,8 @@ static const struct fec_devinfo fec_imx8mq_info = { 
		  FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE |

		  FEC_QUIRK_HAS_RACC | FEC_QUIRK_HAS_COALESCE |

		  FEC_QUIRK_CLEAR_SETUP_MII | FEC_QUIRK_HAS_MULTI_QUEUES |

		  FEC_QUIRK_HAS_EEE | FEC_QUIRK_WAKEUP_FROM_INT2,

		  FEC_QUIRK_HAS_EEE | FEC_QUIRK_WAKEUP_FROM_INT2 |

		  FEC_QUIRK_HAS_MDIO_C45,

};



static const struct fec_devinfo fec_imx8qm_info = {
@@ -160,14 +165,15 @@ static const struct fec_devinfo fec_imx8qm_info = { 
		  FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE |

		  FEC_QUIRK_HAS_RACC | FEC_QUIRK_HAS_COALESCE |

		  FEC_QUIRK_CLEAR_SETUP_MII | FEC_QUIRK_HAS_MULTI_QUEUES |

		  FEC_QUIRK_DELAYED_CLKS_SUPPORT,

		  FEC_QUIRK_DELAYED_CLKS_SUPPORT | FEC_QUIRK_HAS_MDIO_C45,

};



static const struct fec_devinfo fec_s32v234_info = {

	.quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |

		  FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |

		  FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB |

		  FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE,

		  FEC_QUIRK_ERR007885 | FEC_QUIRK_BUG_CAPTURE |

		  FEC_QUIRK_HAS_MDIO_C45,

};



static struct platform_device_id fec_devtype[] = {
@@ -2434,8 +2440,10 @@ static int fec_enet_mii_init(struct platform_device *pdev) 
	fep->mii_bus->name = "fec_enet_mii_bus";

	fep->mii_bus->read = fec_enet_mdio_read_c22;

	fep->mii_bus->write = fec_enet_mdio_write_c22;

	if (fep->quirks & FEC_QUIRK_HAS_MDIO_C45) {

		fep->mii_bus->read_c45 = fec_enet_mdio_read_c45;

		fep->mii_bus->write_c45 = fec_enet_mdio_write_c45;

	}

	snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",

		pdev->name, fep->dev_id + 1);

	fep->mii_bus->priv = fep;