Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-12
+1
-1
drivers/thunderbolt/tb_regs.h
+1
-1
drivers/thunderbolt/tb_regs.h
···
203
203
#define ROUTER_CS_5_WOP BIT(1)
204
204
#define ROUTER_CS_5_WOU BIT(2)
205
205
#define ROUTER_CS_5_WOD BIT(3)
206
-
#define ROUTER_CS_5_C3S BIT(23)
206
+
#define ROUTER_CS_5_CNS BIT(23)
207
207
#define ROUTER_CS_5_PTO BIT(24)
208
208
#define ROUTER_CS_5_UTO BIT(25)
209
209
#define ROUTER_CS_5_HCO BIT(26)
+1
-1
drivers/thunderbolt/usb4.c
+1
-1
drivers/thunderbolt/usb4.c
-1
drivers/usb/dwc3/core.h
-1
drivers/usb/dwc3/core.h
···
376
376
/* Global HWPARAMS4 Register */
377
377
#define DWC3_GHWPARAMS4_HIBER_SCRATCHBUFS(n) (((n) & (0x0f << 13)) >> 13)
378
378
#define DWC3_MAX_HIBER_SCRATCHBUFS 15
379
-
#define DWC3_EXT_BUFF_CONTROL BIT(21)
380
379
381
380
/* Global HWPARAMS6 Register */
382
381
#define DWC3_GHWPARAMS6_BCSUPPORT BIT(14)
-6
drivers/usb/dwc3/gadget.c
-6
drivers/usb/dwc3/gadget.c
···
673
673
params.param1 |= DWC3_DEPCFG_BINTERVAL_M1(bInterval_m1);
674
674
}
675
675
676
-
if (dep->endpoint.fifo_mode) {
677
-
if (!(dwc->hwparams.hwparams4 & DWC3_EXT_BUFF_CONTROL))
678
-
return -EINVAL;
679
-
params.param1 |= DWC3_DEPCFG_EBC_HWO_NOWB | DWC3_DEPCFG_USE_EBC;
680
-
}
681
-
682
676
return dwc3_send_gadget_ep_cmd(dep, DWC3_DEPCMD_SETEPCONFIG, ¶ms);
683
677
}
684
678
-2
drivers/usb/dwc3/gadget.h
-2
drivers/usb/dwc3/gadget.h
···
26
26
#define DWC3_DEPCFG_XFER_NOT_READY_EN BIT(10)
27
27
#define DWC3_DEPCFG_FIFO_ERROR_EN BIT(11)
28
28
#define DWC3_DEPCFG_STREAM_EVENT_EN BIT(13)
29
-
#define DWC3_DEPCFG_EBC_HWO_NOWB BIT(14)
30
-
#define DWC3_DEPCFG_USE_EBC BIT(15)
31
29
#define DWC3_DEPCFG_BINTERVAL_M1(n) (((n) & 0xff) << 16)
32
30
#define DWC3_DEPCFG_STREAM_CAPABLE BIT(24)
33
31
#define DWC3_DEPCFG_EP_NUMBER(n) (((n) & 0x1f) << 25)