summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-17 12:11:16 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-17 12:12:10 -0400
commitf227dd8774c94a35c9b93b4a900213fd9796aac6 (patch)
tree0ce01fc5e622163a0c44cbe62a88c73560ef5911
parent4810d0037c6b4f9f8a83af516b814afb2ca5c639 (diff)
downloadlongterm-queue-5.2-f227dd8774c94a35c9b93b4a900213fd9796aac6.tar.gz
usb: no cdns3 driver until v5.4+
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/series2
-rw-r--r--queue/usb-cdns3-ep0-fix-some-endian-issues.patch93
-rw-r--r--queue/usb-cdns3-trace-fix-some-endian-issues.patch33
3 files changed, 0 insertions, 128 deletions
diff --git a/queue/series b/queue/series
index 758a5a68..109f13dc 100644
--- a/queue/series
+++ b/queue/series
@@ -68,8 +68,6 @@ Input-elan_i2c-only-increment-wakeup-count-on-touch.patch
usb-dwc3-pci-add-support-for-the-Intel-Tiger-Lake-PC.patch
usb-dwc3-pci-add-support-for-the-Intel-Jasper-Lake.patch
usb-gadget-udc-gr_udc-fix-memleak-on-error-handling-.patch
-usb-cdns3-ep0-fix-some-endian-issues.patch
-usb-cdns3-trace-fix-some-endian-issues.patch
hwmon-adm1275-Make-sure-we-are-reading-enough-data-f.patch
drm-amdgpu-gfx10-fix-race-condition-for-kiq.patch
drm-amdgpu-fix-preemption-unit-test.patch
diff --git a/queue/usb-cdns3-ep0-fix-some-endian-issues.patch b/queue/usb-cdns3-ep0-fix-some-endian-issues.patch
deleted file mode 100644
index 3e5ae2a5..00000000
--- a/queue/usb-cdns3-ep0-fix-some-endian-issues.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 9f81d45c79271def8a9b90447b04b9c6323291f9 Mon Sep 17 00:00:00 2001
-From: Peter Chen <peter.chen@nxp.com>
-Date: Wed, 3 Jun 2020 14:53:54 +0800
-Subject: [PATCH] usb: cdns3: ep0: fix some endian issues
-
-commit 9f81d45c79271def8a9b90447b04b9c6323291f9 upstream.
-
-It is found by sparse.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Signed-off-by: Peter Chen <peter.chen@nxp.com>
-Signed-off-by: Felipe Balbi <balbi@kernel.org>
-
-diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
-index 61ec5bb2b0ca..5aa69980e7ff 100644
---- a/drivers/usb/cdns3/ep0.c
-+++ b/drivers/usb/cdns3/ep0.c
-@@ -37,18 +37,18 @@ static void cdns3_ep0_run_transfer(struct cdns3_device *priv_dev,
- struct cdns3_usb_regs __iomem *regs = priv_dev->regs;
- struct cdns3_endpoint *priv_ep = priv_dev->eps[0];
-
-- priv_ep->trb_pool[0].buffer = TRB_BUFFER(dma_addr);
-- priv_ep->trb_pool[0].length = TRB_LEN(length);
-+ priv_ep->trb_pool[0].buffer = cpu_to_le32(TRB_BUFFER(dma_addr));
-+ priv_ep->trb_pool[0].length = cpu_to_le32(TRB_LEN(length));
-
- if (zlp) {
-- priv_ep->trb_pool[0].control = TRB_CYCLE | TRB_TYPE(TRB_NORMAL);
-- priv_ep->trb_pool[1].buffer = TRB_BUFFER(dma_addr);
-- priv_ep->trb_pool[1].length = TRB_LEN(0);
-- priv_ep->trb_pool[1].control = TRB_CYCLE | TRB_IOC |
-- TRB_TYPE(TRB_NORMAL);
-+ priv_ep->trb_pool[0].control = cpu_to_le32(TRB_CYCLE | TRB_TYPE(TRB_NORMAL));
-+ priv_ep->trb_pool[1].buffer = cpu_to_le32(TRB_BUFFER(dma_addr));
-+ priv_ep->trb_pool[1].length = cpu_to_le32(TRB_LEN(0));
-+ priv_ep->trb_pool[1].control = cpu_to_le32(TRB_CYCLE | TRB_IOC |
-+ TRB_TYPE(TRB_NORMAL));
- } else {
-- priv_ep->trb_pool[0].control = TRB_CYCLE | TRB_IOC |
-- TRB_TYPE(TRB_NORMAL);
-+ priv_ep->trb_pool[0].control = cpu_to_le32(TRB_CYCLE | TRB_IOC |
-+ TRB_TYPE(TRB_NORMAL));
- priv_ep->trb_pool[1].control = 0;
- }
-
-@@ -264,11 +264,11 @@ static int cdns3_req_ep0_get_status(struct cdns3_device *priv_dev,
- case USB_RECIP_INTERFACE:
- return cdns3_ep0_delegate_req(priv_dev, ctrl);
- case USB_RECIP_ENDPOINT:
-- index = cdns3_ep_addr_to_index(ctrl->wIndex);
-+ index = cdns3_ep_addr_to_index(le16_to_cpu(ctrl->wIndex));
- priv_ep = priv_dev->eps[index];
-
- /* check if endpoint is stalled or stall is pending */
-- cdns3_select_ep(priv_dev, ctrl->wIndex);
-+ cdns3_select_ep(priv_dev, le16_to_cpu(ctrl->wIndex));
- if (EP_STS_STALL(readl(&priv_dev->regs->ep_sts)) ||
- (priv_ep->flags & EP_STALL_PENDING))
- usb_status = BIT(USB_ENDPOINT_HALT);
-@@ -381,10 +381,10 @@ static int cdns3_ep0_feature_handle_endpoint(struct cdns3_device *priv_dev,
- if (!(ctrl->wIndex & ~USB_DIR_IN))
- return 0;
-
-- index = cdns3_ep_addr_to_index(ctrl->wIndex);
-+ index = cdns3_ep_addr_to_index(le16_to_cpu(ctrl->wIndex));
- priv_ep = priv_dev->eps[index];
-
-- cdns3_select_ep(priv_dev, ctrl->wIndex);
-+ cdns3_select_ep(priv_dev, le16_to_cpu(ctrl->wIndex));
-
- if (set)
- __cdns3_gadget_ep_set_halt(priv_ep);
-@@ -445,7 +445,7 @@ static int cdns3_req_ep0_set_sel(struct cdns3_device *priv_dev,
- if (priv_dev->gadget.state < USB_STATE_ADDRESS)
- return -EINVAL;
-
-- if (ctrl_req->wLength != 6) {
-+ if (le16_to_cpu(ctrl_req->wLength) != 6) {
- dev_err(priv_dev->dev, "Set SEL should be 6 bytes, got %d\n",
- ctrl_req->wLength);
- return -EINVAL;
-@@ -469,7 +469,7 @@ static int cdns3_req_ep0_set_isoch_delay(struct cdns3_device *priv_dev,
- if (ctrl_req->wIndex || ctrl_req->wLength)
- return -EINVAL;
-
-- priv_dev->isoch_delay = ctrl_req->wValue;
-+ priv_dev->isoch_delay = le16_to_cpu(ctrl_req->wValue);
-
- return 0;
- }
---
-2.27.0
-
diff --git a/queue/usb-cdns3-trace-fix-some-endian-issues.patch b/queue/usb-cdns3-trace-fix-some-endian-issues.patch
deleted file mode 100644
index 74399673..00000000
--- a/queue/usb-cdns3-trace-fix-some-endian-issues.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 65b7cf48c211ece5e2560a334eb9608e48775a8f Mon Sep 17 00:00:00 2001
-From: Peter Chen <peter.chen@nxp.com>
-Date: Wed, 3 Jun 2020 14:53:55 +0800
-Subject: [PATCH] usb: cdns3: trace: fix some endian issues
-
-commit 65b7cf48c211ece5e2560a334eb9608e48775a8f upstream.
-
-It is found by sparse.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Signed-off-by: Peter Chen <peter.chen@nxp.com>
-Signed-off-by: Felipe Balbi <balbi@kernel.org>
-
-diff --git a/drivers/usb/cdns3/trace.h b/drivers/usb/cdns3/trace.h
-index 755c56582257..0a2a3269bfac 100644
---- a/drivers/usb/cdns3/trace.h
-+++ b/drivers/usb/cdns3/trace.h
-@@ -404,9 +404,9 @@ DECLARE_EVENT_CLASS(cdns3_log_trb,
- TP_fast_assign(
- __assign_str(name, priv_ep->name);
- __entry->trb = trb;
-- __entry->buffer = trb->buffer;
-- __entry->length = trb->length;
-- __entry->control = trb->control;
-+ __entry->buffer = le32_to_cpu(trb->buffer);
-+ __entry->length = le32_to_cpu(trb->length);
-+ __entry->control = le32_to_cpu(trb->control);
- __entry->type = usb_endpoint_type(priv_ep->endpoint.desc);
- __entry->last_stream_id = priv_ep->last_stream_id;
- ),
---
-2.27.0
-