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

Merge tag 'net-5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf.

  Current release - regressions:

   - vhost_net: fix OoB on sendmsg() failure

   - mlx5: bridge, fix uninitialized variable usage

   - bnxt_en: fix error recovery regression

  Current release - new code bugs:

   - bpf, mm: fix lockdep warning triggered by stack_map_get_build_id_offset()

  Previous releases - regressions:

   - r6040: restore MDIO clock frequency after MAC reset

   - tcp: fix tp->undo_retrans accounting in tcp_sacktag_one()

   - dsa: flush switchdev workqueue before tearing down CPU/DSA ports

  Previous releases - always broken:

   - ptp: dp83640: don't define PAGE0, avoid compiler warning

   - igc: fix tunnel segmentation offloads

   - phylink: update SFP selected interface on advertising changes

   - stmmac: fix system hang caused by eee_ctrl_timer during suspend/resume

   - mlx5e: fix mutual exclusion between CQE compression and HW TS

  Misc:

   - bpf, cgroups: fix cgroup v2 fallback on v1/v2 mixed mode

   - sfc: fallback for lack of xdp tx queues

   - hns3: add option to turn off page pool feature"

* tag 'net-5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (67 commits)
  mlxbf_gige: clear valid_polarity upon open
  igc: fix tunnel offloading
  net/{mlx5|nfp|bnxt}: Remove unnecessary RTNL lock assert
  net: wan: wanxl: define CROSS_COMPILE_M68K
  selftests: nci: replace unsigned int with int
  net: dsa: flush switchdev workqueue before tearing down CPU/DSA ports
  Revert "net: phy: Uniform PHY driver access"
  net: dsa: destroy the phylink instance on any error in dsa_slave_phy_setup
  ptp: dp83640: don't define PAGE0
  bnx2x: Fix enabling network interfaces without VFs
  Revert "Revert "ipv4: fix memory leaks in ip_cmsg_send() callers""
  tcp: fix tp->undo_retrans accounting in tcp_sacktag_one()
  net-caif: avoid user-triggerable WARN_ON(1)
  bpf, selftests: Add test case for mixed cgroup v1/v2
  bpf, selftests: Add cgroup v1 net_cls classid helpers
  bpf, cgroups: Fix cgroup v2 fallback on v1/v2 mixed mode
  bpf: Add oversize check before call kvcalloc()
  net: hns3: fix the timing issue of VF clearing interrupt sources
  net: hns3: fix the exception when query imp info
  net: hns3: disable mac in flr process
  ...
parents 3c0d2a46 ee8a9600

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ properties: 
      - const: allwinner,sun8i-v3s-emac

      - const: allwinner,sun50i-a64-emac

      - items:

          - const: allwinner,sun50i-h6-emac

          - enum:

              - allwinner,sun20i-d1-emac

              - allwinner,sun50i-h6-emac

          - const: allwinner,sun50i-a64-emac



  reg:

drivers/net/dsa/lantiq_gswip.c

+6 −0
Original line number Diff line number Diff line
@@ -1885,6 +1885,12 @@ static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gph 


	reset_control_assert(gphy_fw->reset);



	/* The vendor BSP uses a 200ms delay after asserting the reset line.

	 * Without this some users are observing that the PHY is not coming up

	 * on the MDIO bus.

	 */

	msleep(200);



	ret = request_firmware(&fw, gphy_fw->fw_name, dev);

	if (ret) {

		dev_err(dev, "failed to load firmware: %s, error: %i\n",

drivers/net/dsa/qca8k.c

+22 −8
Original line number Diff line number Diff line
@@ -643,10 +643,8 @@ qca8k_mdio_busy_wait(struct mii_bus *bus, u32 reg, u32 mask) 
}



static int

qca8k_mdio_write(struct mii_bus *salve_bus, int phy, int regnum, u16 data)

qca8k_mdio_write(struct mii_bus *bus, int phy, int regnum, u16 data)

{

	struct qca8k_priv *priv = salve_bus->priv;

	struct mii_bus *bus = priv->bus;

	u16 r1, r2, page;

	u32 val;

	int ret;
@@ -682,10 +680,8 @@ qca8k_mdio_write(struct mii_bus *salve_bus, int phy, int regnum, u16 data) 
}



static int

qca8k_mdio_read(struct mii_bus *salve_bus, int phy, int regnum)

qca8k_mdio_read(struct mii_bus *bus, int phy, int regnum)

{

	struct qca8k_priv *priv = salve_bus->priv;

	struct mii_bus *bus = priv->bus;

	u16 r1, r2, page;

	u32 val;

	int ret;
@@ -726,6 +722,24 @@ qca8k_mdio_read(struct mii_bus *salve_bus, int phy, int regnum) 
	return ret;

}



static int

qca8k_internal_mdio_write(struct mii_bus *slave_bus, int phy, int regnum, u16 data)

{

	struct qca8k_priv *priv = slave_bus->priv;

	struct mii_bus *bus = priv->bus;



	return qca8k_mdio_write(bus, phy, regnum, data);

}



static int

qca8k_internal_mdio_read(struct mii_bus *slave_bus, int phy, int regnum)

{

	struct qca8k_priv *priv = slave_bus->priv;

	struct mii_bus *bus = priv->bus;



	return qca8k_mdio_read(bus, phy, regnum);

}



static int

qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data)

{
@@ -775,8 +789,8 @@ qca8k_mdio_register(struct qca8k_priv *priv, struct device_node *mdio) 


	bus->priv = (void *)priv;

	bus->name = "qca8k slave mii";

	bus->read = qca8k_mdio_read;

	bus->write = qca8k_mdio_write;

	bus->read = qca8k_internal_mdio_read;

	bus->write = qca8k_internal_mdio_write;

	snprintf(bus->id, MII_BUS_ID_SIZE, "qca8k-%d",

		 ds->index);

drivers/net/ethernet/8390/ne.c

+7 −15
Original line number Diff line number Diff line
@@ -922,13 +922,16 @@ static void __init ne_add_devices(void) 
	}

}



#ifdef MODULE

static int __init ne_init(void)

{

	int retval;



	if (IS_MODULE(CONFIG_NE2000))

		ne_add_devices();



	retval = platform_driver_probe(&ne_driver, ne_drv_probe);

	if (retval) {



	if (IS_MODULE(CONFIG_NE2000) && retval) {

		if (io[0] == 0)

			pr_notice("ne.c: You must supply \"io=0xNNN\""

			       " value(s) for ISA cards.\n");
@@ -941,18 +944,8 @@ static int __init ne_init(void) 
	return retval;

}

module_init(ne_init);

#else /* MODULE */

static int __init ne_init(void)

{

	int retval = platform_driver_probe(&ne_driver, ne_drv_probe);



	/* Unregister unused platform_devices. */

	ne_loop_rm_unreg(0);

	return retval;

}

module_init(ne_init);



#ifdef CONFIG_NETDEV_LEGACY_INIT

#if !defined(MODULE) && defined(CONFIG_NETDEV_LEGACY_INIT)

struct net_device * __init ne_probe(int unit)

{

	int this_dev;
@@ -994,7 +987,6 @@ struct net_device * __init ne_probe(int unit) 
	return ERR_PTR(-ENODEV);

}

#endif

#endif /* MODULE */



static void __exit ne_exit(void)

{

drivers/net/ethernet/amd/ni65.c

+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static void ni65_stop_start(struct net_device *dev,struct priv *p) 
#ifdef XMT_VIA_SKB

			skb_save[i] = p->tmd_skb[i];

#endif

			buffer[i] = (u32) isa_bus_to_virt(tmdp->u.buffer);

			buffer[i] = (unsigned long)isa_bus_to_virt(tmdp->u.buffer);

			blen[i] = tmdp->blen;

			tmdp->u.s.status = 0x0;

		}