rockchip: rk356x: add dwc3 xhci usb trb quirk
This commit is contained in:
sbwml
parent
b91d4f6486
commit
de4445862f
165
patches-6.1/012-rk356x-add-dwc3-xhci-usb-trb-quirk.patch
Normal file
165
patches-6.1/012-rk356x-add-dwc3-xhci-usb-trb-quirk.patch
Normal file
@ -0,0 +1,165 @@
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||||
index cc4848914..5262580ae 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||||
@@ -297,6 +297,7 @@ usb_host0_xhci: usb@fcc00000 {
|
||||
power-domains = <&power RK3568_PD_PIPE>;
|
||||
resets = <&cru SRST_USB3OTG0>;
|
||||
snps,dis_u2_susphy_quirk;
|
||||
+ snps,xhci-trb-ent-quirk;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -315,6 +316,7 @@ usb_host1_xhci: usb@fd000000 {
|
||||
power-domains = <&power RK3568_PD_PIPE>;
|
||||
resets = <&cru SRST_USB3OTG1>;
|
||||
snps,dis_u2_susphy_quirk;
|
||||
+ snps,xhci-trb-ent-quirk;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
|
||||
index 476b63618..2241fcc31 100644
|
||||
--- a/drivers/usb/dwc3/core.c
|
||||
+++ b/drivers/usb/dwc3/core.c
|
||||
@@ -1551,6 +1551,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
|
||||
"snps,dis-del-phy-power-chg-quirk");
|
||||
dwc->dis_tx_ipgap_linecheck_quirk = device_property_read_bool(dev,
|
||||
"snps,dis-tx-ipgap-linecheck-quirk");
|
||||
+ dwc->xhci_trb_ent_quirk = device_property_read_bool(dev,
|
||||
+ "snps,xhci-trb-ent-quirk");
|
||||
dwc->resume_hs_terminations = device_property_read_bool(dev,
|
||||
"snps,resume-hs-terminations");
|
||||
dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev,
|
||||
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
|
||||
index 8f9959ba9..992d1cdf9 100644
|
||||
--- a/drivers/usb/dwc3/core.h
|
||||
+++ b/drivers/usb/dwc3/core.h
|
||||
@@ -1098,6 +1098,9 @@ struct dwc3_scratchpad_array {
|
||||
* change quirk.
|
||||
* @dis_tx_ipgap_linecheck_quirk: set if we disable u2mac linestate
|
||||
* check during HS transmit.
|
||||
+ * @xhci_trb_ent_quirk: set if need to enable the Evaluate Next TRB(ENT)
|
||||
+ * flag in the TRB data structure to force xHC to
|
||||
+ * pre-fetch the next TRB of a TD.
|
||||
* @resume-hs-terminations: Set if we enable quirk for fixing improper crc
|
||||
* generation after resume from suspend.
|
||||
* @parkmode_disable_ss_quirk: set if we need to disable all SuperSpeed
|
||||
@@ -1315,6 +1318,7 @@ struct dwc3 {
|
||||
unsigned dis_u2_freeclk_exists_quirk:1;
|
||||
unsigned dis_del_phy_power_chg_quirk:1;
|
||||
unsigned dis_tx_ipgap_linecheck_quirk:1;
|
||||
+ unsigned xhci_trb_ent_quirk:1;
|
||||
unsigned resume_hs_terminations:1;
|
||||
unsigned parkmode_disable_ss_quirk:1;
|
||||
unsigned gfladj_refclk_lpm_sel:1;
|
||||
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
|
||||
index f6f13e7f1..08a528693 100644
|
||||
--- a/drivers/usb/dwc3/host.c
|
||||
+++ b/drivers/usb/dwc3/host.c
|
||||
@@ -66,7 +66,7 @@ static int dwc3_host_get_irq(struct dwc3 *dwc)
|
||||
|
||||
int dwc3_host_init(struct dwc3 *dwc)
|
||||
{
|
||||
- struct property_entry props[4];
|
||||
+ struct property_entry props[5];
|
||||
struct platform_device *xhci;
|
||||
int ret, irq;
|
||||
int prop_idx = 0;
|
||||
@@ -97,6 +97,9 @@ int dwc3_host_init(struct dwc3 *dwc)
|
||||
if (dwc->usb3_lpm_capable)
|
||||
props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb3-lpm-capable");
|
||||
|
||||
+ if (dwc->xhci_trb_ent_quirk)
|
||||
+ props[prop_idx++] = PROPERTY_ENTRY_BOOL("xhci-trb-ent-quirk");
|
||||
+
|
||||
if (dwc->usb2_lpm_disable)
|
||||
props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb2-lpm-disable");
|
||||
|
||||
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
|
||||
index 5fb55bf19..44e3c87d2 100644
|
||||
--- a/drivers/usb/host/xhci-plat.c
|
||||
+++ b/drivers/usb/host/xhci-plat.c
|
||||
@@ -301,6 +301,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
|
||||
if (device_property_read_bool(tmpdev, "quirk-broken-port-ped"))
|
||||
xhci->quirks |= XHCI_BROKEN_PORT_PED;
|
||||
|
||||
+ if (device_property_read_bool(tmpdev, "xhci-trb-ent-quirk"))
|
||||
+ xhci->quirks |= XHCI_TRB_ENT_QUIRK;
|
||||
+
|
||||
device_property_read_u32(tmpdev, "imod-interval-ns",
|
||||
&xhci->imod_interval);
|
||||
}
|
||||
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
|
||||
index 343709af4..785e5263f 100644
|
||||
--- a/drivers/usb/host/xhci-ring.c
|
||||
+++ b/drivers/usb/host/xhci-ring.c
|
||||
@@ -3526,6 +3526,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
|
||||
bool more_trbs_coming = true;
|
||||
bool need_zero_pkt = false;
|
||||
bool first_trb = true;
|
||||
+ bool en_trb_ent = true;
|
||||
unsigned int num_trbs;
|
||||
unsigned int start_cycle, num_sgs = 0;
|
||||
unsigned int enqd_len, block_len, trb_buff_len, full_len;
|
||||
@@ -3562,6 +3563,13 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
|
||||
if (urb->transfer_flags & URB_ZERO_PACKET && urb_priv->num_tds > 1)
|
||||
need_zero_pkt = true;
|
||||
|
||||
+ /*
|
||||
+ * Don't enable the ENT flag in the TRB if
|
||||
+ * the EP support bulk streaming protocol.
|
||||
+ */
|
||||
+ if (urb->stream_id)
|
||||
+ en_trb_ent = false;
|
||||
+
|
||||
td = &urb_priv->td[0];
|
||||
|
||||
/*
|
||||
@@ -3590,6 +3598,13 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
|
||||
first_trb = false;
|
||||
if (start_cycle == 0)
|
||||
field |= TRB_CYCLE;
|
||||
+ /*
|
||||
+ * Don't enable the ENT flag in the TRB if the
|
||||
+ * transfer length of the first TRB isn't an
|
||||
+ * integer multiple of the EP maxpacket.
|
||||
+ */
|
||||
+ if (trb_buff_len % usb_endpoint_maxp(&urb->ep->desc))
|
||||
+ en_trb_ent = false;
|
||||
} else
|
||||
field |= ring->cycle_state;
|
||||
|
||||
@@ -3598,6 +3613,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
|
||||
*/
|
||||
if (enqd_len + trb_buff_len < full_len) {
|
||||
field |= TRB_CHAIN;
|
||||
+ if (xhci->quirks & XHCI_TRB_ENT_QUIRK && en_trb_ent)
|
||||
+ field |= TRB_ENT;
|
||||
if (trb_is_link(ring->enqueue + 1)) {
|
||||
if (xhci_align_td(xhci, urb, enqd_len,
|
||||
&trb_buff_len,
|
||||
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
|
||||
index c9f06c5e4..e57460e21 100644
|
||||
--- a/drivers/usb/host/xhci.h
|
||||
+++ b/drivers/usb/host/xhci.h
|
||||
@@ -1525,7 +1525,11 @@ static inline const char *xhci_trb_type_string(u8 type)
|
||||
#define TRB_SEGMENT_SIZE (TRBS_PER_SEGMENT*16)
|
||||
#define TRB_SEGMENT_SHIFT (ilog2(TRB_SEGMENT_SIZE))
|
||||
/* TRB buffer pointers can't cross 64KB boundaries */
|
||||
+#ifdef CONFIG_ARCH_ROCKCHIP
|
||||
+#define TRB_MAX_BUFF_SHIFT 12
|
||||
+#else
|
||||
#define TRB_MAX_BUFF_SHIFT 16
|
||||
+#endif
|
||||
#define TRB_MAX_BUFF_SIZE (1 << TRB_MAX_BUFF_SHIFT)
|
||||
/* How much data is left before the 64KB boundary? */
|
||||
#define TRB_BUFF_LEN_UP_TO_BOUNDARY(addr) (TRB_MAX_BUFF_SIZE - \
|
||||
@@ -1842,6 +1846,7 @@ struct xhci_hcd {
|
||||
#define XHCI_STATE_HALTED (1 << 1)
|
||||
#define XHCI_STATE_REMOVING (1 << 2)
|
||||
unsigned long long quirks;
|
||||
+#define XHCI_TRB_ENT_QUIRK BIT_ULL(63)
|
||||
#define XHCI_LINK_TRB_QUIRK BIT_ULL(0)
|
||||
#define XHCI_RESET_EP_QUIRK BIT_ULL(1) /* Deprecated */
|
||||
#define XHCI_NEC_HOST BIT_ULL(2)
|
||||
Loading…
Reference in New Issue
Block a user