Commit 8c245fe7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from ieee802154, bluetooth and netfilter.

  Current release - regressions:

   - eth: mlx5: fix wrong reserved field in hca_cap_2 in mlx5_ifc

   - eth: am65-cpsw: fix forever loop in cleanup code

  Current release - new code bugs:

   - eth: mlx5: HWS, fixed double-free in error flow of creating SQ

  Previous releases - regressions:

   - core: avoid potential underflow in qdisc_pkt_len_init() with UFO

   - core: test for not too small csum_start in virtio_net_hdr_to_skb()

   - vrf: revert "vrf: remove unnecessary RCU-bh critical section"

   - bluetooth:
       - fix uaf in l2cap_connect
       - fix possible crash on mgmt_index_removed

   - dsa: improve shutdown sequence

   - eth: mlx5e: SHAMPO, fix overflow of hd_per_wq

   - eth: ip_gre: fix drops of small packets in ipgre_xmit

  Previous releases - always broken:

   - core: fix gso_features_check to check for both
     dev->gso_{ipv4_,}max_size

   - core: fix tcp fraglist segmentation after pull from frag_list

   - netfilter: nf_tables: prevent nf_skb_duplicated corruption

   - sctp: set sk_state back to CLOSED if autobind fails in
     sctp_listen_start

   - mac802154: fix potential RCU dereference issue in
     mac802154_scan_worker

   - eth: fec: restart PPS after link state change"

* tag 'net-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (48 commits)
  sctp: set sk_state back to CLOSED if autobind fails in sctp_listen_start
  dt-bindings: net: xlnx,axi-ethernet: Add missing reg minItems
  doc: net: napi: Update documentation for napi_schedule_irqoff
  net/ncsi: Disable the ncsi work before freeing the associated structure
  net: phy: qt2025: Fix warning: unused import DeviceId
  gso: fix udp gso fraglist segmentation after pull from frag_list
  bridge: mcast: Fail MDB get request on empty entry
  vrf: revert "vrf: Remove unnecessary RCU-bh critical section"
  net: ethernet: ti: am65-cpsw: Fix forever loop in cleanup code
  net: phy: realtek: Check the index value in led_hw_control_get
  ppp: do not assume bh is held in ppp_channel_bridge_input()
  selftests: rds: move include.sh to TEST_FILES
  net: test for not too small csum_start in virtio_net_hdr_to_skb()
  net: gso: fix tcp fraglist segmentation after pull from frag_list
  ipv4: ip_gre: Fix drops of small packets in ipgre_xmit
  net: stmmac: dwmac4: extend timeout for VLAN Tag register busy bit check
  net: add more sanity checks to qdisc_pkt_len_init()
  net: avoid potential underflow in qdisc_pkt_len_init() with UFO
  net: ethernet: ti: cpsw_ale: Fix warning on some platforms
  net: microchip: Make FDMA config symbol invisible
  ...
parents 9c02404b 8beee4d8

Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ properties: 
      and length of the AXI DMA controller IO space, unless

      axistream-connected is specified, in which case the reg

      attribute of the node referenced by it is used.

    minItems: 1

    maxItems: 2



  interrupts:
@@ -181,7 +182,7 @@ examples: 
        clock-names = "s_axi_lite_clk", "axis_clk", "ref_clk", "mgt_clk";

        clocks = <&axi_clk>, <&axi_clk>, <&pl_enet_ref_clk>, <&mgt_clk>;

        phy-mode = "mii";

        reg = <0x00 0x40000000 0x00 0x40000>;

        reg = <0x40000000 0x40000>;

        xlnx,rxcsum = <0x2>;

        xlnx,rxmem = <0x800>;

        xlnx,txcsum = <0x2>;

Documentation/networking/napi.rst

+2 −3
Original line number Diff line number Diff line
@@ -144,9 +144,8 @@ IRQ should only be unmasked after a successful call to napi_complete_done(): 


napi_schedule_irqoff() is a variant of napi_schedule() which takes advantage

of guarantees given by being invoked in IRQ context (no need to

mask interrupts). Note that PREEMPT_RT forces all interrupts

to be threaded so the interrupt may need to be marked ``IRQF_NO_THREAD``

to avoid issues on real-time kernel configurations.

mask interrupts). napi_schedule_irqoff() will fall back to napi_schedule() if

IRQs are threaded (such as if ``PREEMPT_RT`` is enabled).



Instance to queue mapping

-------------------------

drivers/bluetooth/btmrvl_sdio.c

+1 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int btmrvl_sdio_probe_of(struct device *dev, 
		} else {

			ret = devm_request_irq(dev, cfg->irq_bt,

					       btmrvl_wake_irq_bt,

					       0, "bt_wake", card);

					       IRQF_NO_AUTOEN, "bt_wake", card);

			if (ret) {

				dev_err(dev,

					"Failed to request irq_bt %d (%d)\n",
@@ -101,7 +101,6 @@ static int btmrvl_sdio_probe_of(struct device *dev, 


			/* Configure wakeup (enabled by default) */

			device_init_wakeup(dev, true);

			disable_irq(cfg->irq_bt);

		}

	}

drivers/net/ethernet/freescale/fec.h

+9 −0
Original line number Diff line number Diff line
@@ -691,10 +691,19 @@ struct fec_enet_private { 
	/* XDP BPF Program */

	struct bpf_prog *xdp_prog;



	struct {

		int pps_enable;

		u64 ns_sys, ns_phc;

		u32 at_corr;

		u8 at_inc_corr;

	} ptp_saved_state;



	u64 ethtool_stats[];

};



void fec_ptp_init(struct platform_device *pdev, int irq_idx);

void fec_ptp_restore_state(struct fec_enet_private *fep);

void fec_ptp_save_state(struct fec_enet_private *fep);

void fec_ptp_stop(struct platform_device *pdev);

void fec_ptp_start_cyclecounter(struct net_device *ndev);

int fec_ptp_set(struct net_device *ndev, struct kernel_hwtstamp_config *config,

drivers/net/ethernet/freescale/fec_main.c

+10 −1
Original line number Diff line number Diff line
@@ -1077,6 +1077,8 @@ fec_restart(struct net_device *ndev) 
	u32 rcntl = OPT_FRAME_SIZE | 0x04;

	u32 ecntl = FEC_ECR_ETHEREN;



	fec_ptp_save_state(fep);



	/* Whack a reset.  We should wait for this.

	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC

	 * instead of reset MAC itself.
@@ -1244,8 +1246,10 @@ fec_restart(struct net_device *ndev) 
	writel(ecntl, fep->hwp + FEC_ECNTRL);

	fec_enet_active_rxring(ndev);



	if (fep->bufdesc_ex)

	if (fep->bufdesc_ex) {

		fec_ptp_start_cyclecounter(ndev);

		fec_ptp_restore_state(fep);

	}



	/* Enable interrupts we wish to service */

	if (fep->link)
@@ -1336,6 +1340,8 @@ fec_stop(struct net_device *ndev) 
			netdev_err(ndev, "Graceful transmit stop did not complete!\n");

	}



	fec_ptp_save_state(fep);



	/* Whack a reset.  We should wait for this.

	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC

	 * instead of reset MAC itself.
@@ -1366,6 +1372,9 @@ fec_stop(struct net_device *ndev) 
		val = readl(fep->hwp + FEC_ECNTRL);

		val |= FEC_ECR_EN1588;

		writel(val, fep->hwp + FEC_ECNTRL);



		fec_ptp_start_cyclecounter(ndev);

		fec_ptp_restore_state(fep);

	}

}