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

Merge tag 'usb-6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB / Thunderbolt fixes from Greg KH:
 "Here are two small fixes for 6.8-rc5:

   - thunderbolt to fix a reported issue on many platforms

   - dwc3 driver revert of a commit that caused problems in -rc1

  Both of these changes have been in linux-next for over a week with no
  reported issues"

* tag 'usb-6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  Revert "usb: dwc3: Support EBC feature of DWC_usb31"
  thunderbolt: Fix setting the CNS bit in ROUTER_CS_5
parents ac00b654 7d708c14

drivers/thunderbolt/tb_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ struct tb_regs_switch_header { 
#define ROUTER_CS_5_WOP				BIT(1)

#define ROUTER_CS_5_WOU				BIT(2)

#define ROUTER_CS_5_WOD				BIT(3)

#define ROUTER_CS_5_C3S				BIT(23)

#define ROUTER_CS_5_CNS				BIT(23)

#define ROUTER_CS_5_PTO				BIT(24)

#define ROUTER_CS_5_UTO				BIT(25)

#define ROUTER_CS_5_HCO				BIT(26)

drivers/thunderbolt/usb4.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ int usb4_switch_setup(struct tb_switch *sw) 
	}



	/* TBT3 supported by the CM */

	val |= ROUTER_CS_5_C3S;

	val &= ~ROUTER_CS_5_CNS;



	return tb_sw_write(sw, &val, TB_CFG_SWITCH, ROUTER_CS_5, 1);

}

drivers/usb/dwc3/core.h

+0 −1
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ 
/* Global HWPARAMS4 Register */

#define DWC3_GHWPARAMS4_HIBER_SCRATCHBUFS(n)	(((n) & (0x0f << 13)) >> 13)

#define DWC3_MAX_HIBER_SCRATCHBUFS		15

#define DWC3_EXT_BUFF_CONTROL		BIT(21)



/* Global HWPARAMS6 Register */

#define DWC3_GHWPARAMS6_BCSUPPORT		BIT(14)

drivers/usb/dwc3/gadget.c

+0 −6
Original line number Diff line number Diff line
@@ -673,12 +673,6 @@ static int dwc3_gadget_set_ep_config(struct dwc3_ep *dep, unsigned int action) 
		params.param1 |= DWC3_DEPCFG_BINTERVAL_M1(bInterval_m1);

	}



	if (dep->endpoint.fifo_mode) {

		if (!(dwc->hwparams.hwparams4 & DWC3_EXT_BUFF_CONTROL))

			return -EINVAL;

		params.param1 |= DWC3_DEPCFG_EBC_HWO_NOWB | DWC3_DEPCFG_USE_EBC;

	}



	return dwc3_send_gadget_ep_cmd(dep, DWC3_DEPCMD_SETEPCONFIG, &params);

}

drivers/usb/dwc3/gadget.h

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ struct dwc3; 
#define DWC3_DEPCFG_XFER_NOT_READY_EN	BIT(10)

#define DWC3_DEPCFG_FIFO_ERROR_EN	BIT(11)

#define DWC3_DEPCFG_STREAM_EVENT_EN	BIT(13)

#define DWC3_DEPCFG_EBC_HWO_NOWB	BIT(14)

#define DWC3_DEPCFG_USE_EBC		BIT(15)

#define DWC3_DEPCFG_BINTERVAL_M1(n)	(((n) & 0xff) << 16)

#define DWC3_DEPCFG_STREAM_CAPABLE	BIT(24)

#define DWC3_DEPCFG_EP_NUMBER(n)	(((n) & 0x1f) << 25)