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

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

Pull networking fixes from Jakub Kicinski:
 "Networking fixes, including fixes from can and bpf.

  Closing three hw-dependent regressions. Any fixes of note are in the
  'old code' category. Nothing blocking release from our perspective.

  Current release - regressions:

   - stmmac: revert "stmmac: align RX buffers"

   - usb: asix: ax88772: move embedded PHY detection as early as
     possible

   - usb: asix: do not call phy_disconnect() for ax88178

   - Revert "net: really fix the build...", from Kalle to fix QCA6390

  Current release - new code bugs:

   - phy: mediatek: add the missing suspend/resume callbacks

  Previous releases - regressions:

   - qrtr: fix another OOB Read in qrtr_endpoint_post

   - stmmac: dwmac-rk: fix unbalanced pm_runtime_enable warnings

  Previous releases - always broken:

   - inet: use siphash in exception handling

   - ip_gre: add validation for csum_start

   - bpf: fix ringbuf helper function compatibility

   - rtnetlink: return correct error on changing device netns

   - e1000e: do not try to recover the NVM checksum on Tiger Lake"

* tag 'net-5.14-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (43 commits)
  Revert "net: really fix the build..."
  net: hns3: fix get wrong pfc_en when query PFC configuration
  net: hns3: fix GRO configuration error after reset
  net: hns3: change the method of getting cmd index in debugfs
  net: hns3: fix duplicate node in VLAN list
  net: hns3: fix speed unknown issue in bond 4
  net: hns3: add waiting time before cmdq memory is released
  net: hns3: clear hardware resource when loading driver
  net: fix NULL pointer reference in cipso_v4_doi_free
  rtnetlink: Return correct error on changing device netns
  net: dsa: hellcreek: Adjust schedule look ahead window
  net: dsa: hellcreek: Fix incorrect setting of GCL
  cxgb4: dont touch blocked freelist bitmap after free
  ipv4: use siphash instead of Jenkins in fnhe_hashfun()
  ipv6: use siphash in rt6_exception_hash()
  can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters
  net: usb: asix: ax88772: fix boolconv.cocci warnings
  net/sched: ets: fix crash when flipping from 'strict' to 'quantum'
  qede: Fix memset corruption
  net: stmmac: fix kernel panic due to NULL pointer dereference of buf->xdp
  ...
parents 1a6d80ff 9ebc2758

drivers/bus/mhi/core/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ void mhi_rddm_prepare(struct mhi_controller *mhi_cntrl, 
		      struct image_info *img_info);

void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl);

int mhi_prepare_channel(struct mhi_controller *mhi_cntrl,

			struct mhi_chan *mhi_chan, unsigned int flags);

			struct mhi_chan *mhi_chan);

int mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl,

		       struct mhi_chan *mhi_chan);

void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl,

drivers/bus/mhi/core/main.c

+3 −6
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ static void mhi_unprepare_channel(struct mhi_controller *mhi_cntrl, 
}



int mhi_prepare_channel(struct mhi_controller *mhi_cntrl,

			struct mhi_chan *mhi_chan, unsigned int flags)

			struct mhi_chan *mhi_chan)

{

	int ret = 0;

	struct device *dev = &mhi_chan->mhi_dev->dev;
@@ -1455,9 +1455,6 @@ int mhi_prepare_channel(struct mhi_controller *mhi_cntrl, 
	if (ret)

		goto error_pm_state;



	if (mhi_chan->dir == DMA_FROM_DEVICE)

		mhi_chan->pre_alloc = !!(flags & MHI_CH_INBOUND_ALLOC_BUFS);

	

	/* Pre-allocate buffer for xfer ring */

	if (mhi_chan->pre_alloc) {

		int nr_el = get_nr_avail_ring_elements(mhi_cntrl,
@@ -1613,7 +1610,7 @@ void mhi_reset_chan(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan) 
}



/* Move channel to start state */

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev, unsigned int flags)

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev)

{

	int ret, dir;

	struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
@@ -1624,7 +1621,7 @@ int mhi_prepare_for_transfer(struct mhi_device *mhi_dev, unsigned int flags) 
		if (!mhi_chan)

			continue;



		ret = mhi_prepare_channel(mhi_cntrl, mhi_chan, flags);

		ret = mhi_prepare_channel(mhi_cntrl, mhi_chan);

		if (ret)

			goto error_open_chan;

	}

drivers/net/can/usb/esd_usb2.c

+2 −2
Original line number Diff line number Diff line
@@ -224,8 +224,8 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, 
	if (id == ESD_EV_CAN_ERROR_EXT) {

		u8 state = msg->msg.rx.data[0];

		u8 ecc = msg->msg.rx.data[1];

		u8 txerr = msg->msg.rx.data[2];

		u8 rxerr = msg->msg.rx.data[3];

		u8 rxerr = msg->msg.rx.data[2];

		u8 txerr = msg->msg.rx.data[3];



		skb = alloc_can_err_skb(priv->netdev, &cf);

		if (skb == NULL) {

drivers/net/dsa/hirschmann/hellcreek.c

+4 −4
Original line number Diff line number Diff line
@@ -1472,9 +1472,6 @@ static void hellcreek_setup_gcl(struct hellcreek *hellcreek, int port, 
		u16 data;

		u8 gates;



		cur++;

		next++;



		if (i == schedule->num_entries)

			gates = initial->gate_mask ^

				cur->gate_mask;
@@ -1503,6 +1500,9 @@ static void hellcreek_setup_gcl(struct hellcreek *hellcreek, int port, 
			(initial->gate_mask <<

			 TR_GCLCMD_INIT_GATE_STATES_SHIFT);

		hellcreek_write(hellcreek, data, TR_GCLCMD);



		cur++;

		next++;

	}

}
@@ -1550,7 +1550,7 @@ static bool hellcreek_schedule_startable(struct hellcreek *hellcreek, int port) 
	/* Calculate difference to admin base time */

	base_time_ns = ktime_to_ns(hellcreek_port->current_schedule->base_time);



	return base_time_ns - current_ns < (s64)8 * NSEC_PER_SEC;

	return base_time_ns - current_ns < (s64)4 * NSEC_PER_SEC;

}



static void hellcreek_start_schedule(struct hellcreek *hellcreek, int port)

drivers/net/dsa/mv88e6xxx/serdes.c

+6 −5
Original line number Diff line number Diff line
@@ -1277,15 +1277,16 @@ static int mv88e6393x_serdes_port_errata(struct mv88e6xxx_chip *chip, int lane) 
	int err;



	/* mv88e6393x family errata 4.6:

	 * Cannot clear PwrDn bit on SERDES on port 0 if device is configured

	 * CPU_MGD mode or P0_mode is configured for [x]MII.

	 * Workaround: Set Port0 SERDES register 4.F002 bit 5=0 and bit 15=1.

	 * Cannot clear PwrDn bit on SERDES if device is configured CPU_MGD

	 * mode or P0_mode is configured for [x]MII.

	 * Workaround: Set SERDES register 4.F002 bit 5=0 and bit 15=1.

	 *

	 * It seems that after this workaround the SERDES is automatically

	 * powered up (the bit is cleared), so power it down.

	 */

	if (lane == MV88E6393X_PORT0_LANE) {

		err = mv88e6390_serdes_read(chip, MV88E6393X_PORT0_LANE,

	if (lane == MV88E6393X_PORT0_LANE || lane == MV88E6393X_PORT9_LANE ||

	    lane == MV88E6393X_PORT10_LANE) {

		err = mv88e6390_serdes_read(chip, lane,

					    MDIO_MMD_PHYXS,

					    MV88E6393X_SERDES_POC, &reg);

		if (err)