Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Iss6141 trial2 #6455

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions arch/arm64/boot/dts/broadcom/rp1.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,6 @@
snps,dis_rxdet_inp3_quirk;
snps,parkmode-disable-ss-quirk;
snps,parkmode-disable-hs-quirk;
snps,parkmode-disable-fsls-quirk;
snps,tx-max-burst = /bits/ 8 <8>;
snps,tx-thr-num-pkt = /bits/ 8 <2>;
interrupts = <RP1_INT_USBHOST0_0 IRQ_TYPE_EDGE_RISING>;
Expand All @@ -1095,7 +1094,6 @@
snps,dis_rxdet_inp3_quirk;
snps,parkmode-disable-ss-quirk;
snps,parkmode-disable-hs-quirk;
snps,parkmode-disable-fsls-quirk;
snps,tx-max-burst = /bits/ 8 <8>;
snps,tx-thr-num-pkt = /bits/ 8 <2>;
interrupts = <RP1_INT_USBHOST1_0 IRQ_TYPE_EDGE_RISING>;
Expand Down
3 changes: 2 additions & 1 deletion drivers/usb/dwc3/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,8 @@ static void dwc3_set_axi_pipe_limit(struct dwc3 *dwc)
}
cfg = dwc3_readl(dwc->regs, DWC3_GSBUSCFG1);
cfg &= ~DWC3_GSBUSCFG1_PIPETRANSLIMIT(15);
cfg |= DWC3_GSBUSCFG1_PIPETRANSLIMIT(dwc->axi_pipe_limit - 1);
cfg |= DWC3_GSBUSCFG1_PIPETRANSLIMIT(dwc->axi_pipe_limit - 1)
cfg |= DWC3_GSBUSCFG1_EN1KPAGE;

dwc3_writel(dwc->regs, DWC3_GSBUSCFG1, cfg);
}
Expand Down
1 change: 1 addition & 0 deletions drivers/usb/dwc3/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@

/* Global SoC Bus Configuration Register 1 */
#define DWC3_GSBUSCFG1_PIPETRANSLIMIT(n) (((n) & 0xf) << 8)
#define DWC3_GSBUSCFG1_EN1KPAGE (1 << 12)

/* Global Debug LSP MUX Select */
#define DWC3_GDBGLSPMUX_ENDBC BIT(15) /* Host only */
Expand Down
2 changes: 2 additions & 0 deletions drivers/usb/host/xhci-ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,8 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci,

trace_xhci_ring_ep_doorbell(slot_id, DB_VALUE(ep_index, stream_id));

/* Incurs ~1.2us round-trip time (and wakes the link) */
readl(db_addr);
writel(DB_VALUE(ep_index, stream_id), db_addr);
/* flush the write */
readl(db_addr);
Expand Down
4 changes: 2 additions & 2 deletions include/net/bluetooth/hci.h
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,8 @@ enum {
/* HCI timeouts */
#define HCI_DISCONN_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */
#define HCI_PAIRING_TIMEOUT msecs_to_jiffies(60000) /* 60 seconds */
#define HCI_INIT_TIMEOUT msecs_to_jiffies(10000) /* 10 seconds */
#define HCI_CMD_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */
#define HCI_INIT_TIMEOUT msecs_to_jiffies(20000) /* 20 seconds */
#define HCI_CMD_TIMEOUT msecs_to_jiffies(20000) /* 20 seconds */
#define HCI_NCMD_TIMEOUT msecs_to_jiffies(4000) /* 4 seconds */
#define HCI_ACL_TX_TIMEOUT msecs_to_jiffies(45000) /* 45 seconds */
#define HCI_AUTO_OFF_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */
Expand Down
Loading