* [PATCH] mtu3: fix setup packet response for HNP and SRP request
@ 2019-06-12 6:28 Macpaul Lin
2019-06-12 8:46 ` Chunfeng Yun
0 siblings, 1 reply; 2+ messages in thread
From: Macpaul Lin @ 2019-06-12 6:28 UTC (permalink / raw)
To: Chunfeng Yun, Greg Kroah-Hartman, Matthias Brugger, Macpaul Lin,
linux-usb, linux-arm-kernel, linux-mediatek, linux-kernel
Cc: wsd_upstream
1. Add OTG_HNP_REQD and OTG_SRP_REQD definitions in ch9.h.
2. When OTG_HNP_REQD and OTG_SRP_REQD has been received,
usb hardware must not enter TEST mode but need to response setup packet.
3. Add otg_srp_reqd and otg_hnp_reqd in struct ssusb_mtk for futher
implementation.
Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>
---
drivers/usb/mtu3/mtu3.h | 4 ++++
drivers/usb/mtu3/mtu3_gadget_ep0.c | 13 +++++++++++++
include/uapi/linux/usb/ch9.h | 5 +++++
3 files changed, 22 insertions(+)
diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
index 76ecf12fdf62..bb8a31bc6e4d 100644
--- a/drivers/usb/mtu3/mtu3.h
+++ b/drivers/usb/mtu3/mtu3.h
@@ -226,6 +226,8 @@ struct otg_switch_mtk {
* @dma_clk: dma_bus_ck clock for AXI bus etc
* @dr_mode: works in which mode:
* host only, device only or dual-role mode
+ * @otg_srp_reqd: used for SRP request handling.
+ * @otg_hnp_reqd: used for HNP request handling.
* @u2_ports: number of usb2.0 host ports
* @u3_ports: number of usb3.0 host ports
* @u3p_dis_msk: mask of disabling usb3 ports, for example, bit0==1 to
@@ -252,6 +254,8 @@ struct ssusb_mtk {
/* otg */
struct otg_switch_mtk otg_switch;
enum usb_dr_mode dr_mode;
+ bool otg_srp_reqd;
+ bool otg_hnp_reqd;
bool is_host;
int u2_ports;
int u3_ports;
diff --git a/drivers/usb/mtu3/mtu3_gadget_ep0.c b/drivers/usb/mtu3/mtu3_gadget_ep0.c
index 4da216c99726..1247c43a63e6 100644
--- a/drivers/usb/mtu3/mtu3_gadget_ep0.c
+++ b/drivers/usb/mtu3/mtu3_gadget_ep0.c
@@ -285,11 +285,24 @@ static int handle_test_mode(struct mtu3 *mtu, struct usb_ctrlrequest *setup)
dev_dbg(mtu->dev, "TEST_PACKET\n");
mtu->test_mode_nr = TEST_PACKET_MODE;
break;
+ case OTG_SRP_REQD:
+ dev_dbg(mtu->dev, "OTG_SRP_REQD\n");
+ mtu->ssusb->otg_srp_reqd = 1;
+ break;
+ case OTG_HNP_REQD:
+ dev_dbg(mtu->dev, "OTG_HNP_REQD\n");
+ mtu->ssusb->otg_hnp_reqd = 1;
+ break;
default:
handled = -EINVAL;
goto out;
}
+ if (mtu->ssusb->otg_srp_reqd || mtu->ssusb->otg_hnp_reqd) {
+ mtu->ep0_state = MU3D_EP0_STATE_SETUP;
+ goto out;
+ }
+
mtu->test_mode = true;
/* no TX completion interrupt, and need restart platform after test */
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index d5a5caec8fbc..545918c83fd1 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -143,6 +143,11 @@
#define TEST_SE0_NAK 3
#define TEST_PACKET 4
#define TEST_FORCE_EN 5
+/*
+ * OTG HNP and SRP REQD
+ */
+#define OTG_SRP_REQD 6
+#define OTG_HNP_REQD 7
/* Status Type */
#define USB_STATUS_TYPE_STANDARD 0
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mtu3: fix setup packet response for HNP and SRP request
2019-06-12 6:28 [PATCH] mtu3: fix setup packet response for HNP and SRP request Macpaul Lin
@ 2019-06-12 8:46 ` Chunfeng Yun
0 siblings, 0 replies; 2+ messages in thread
From: Chunfeng Yun @ 2019-06-12 8:46 UTC (permalink / raw)
To: Macpaul Lin
Cc: Greg Kroah-Hartman, Matthias Brugger, linux-usb,
linux-arm-kernel, linux-mediatek, linux-kernel, wsd_upstream
Hi Macpaul,
On Wed, 2019-06-12 at 14:28 +0800, Macpaul Lin wrote:
> 1. Add OTG_HNP_REQD and OTG_SRP_REQD definitions in ch9.h.
> 2. When OTG_HNP_REQD and OTG_SRP_REQD has been received,
> usb hardware must not enter TEST mode but need to response setup packet.
> 3. Add otg_srp_reqd and otg_hnp_reqd in struct ssusb_mtk for futher
> implementation.
>
> Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>
> ---
> drivers/usb/mtu3/mtu3.h | 4 ++++
> drivers/usb/mtu3/mtu3_gadget_ep0.c | 13 +++++++++++++
> include/uapi/linux/usb/ch9.h | 5 +++++
> 3 files changed, 22 insertions(+)
The driver currently doesn't support HNP/SRP, so there will be something
wrong when connected with PET to run compliance test, and I prefer not
to support it, because it's rarely used in normal case, thanks
>
> diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
> index 76ecf12fdf62..bb8a31bc6e4d 100644
> --- a/drivers/usb/mtu3/mtu3.h
> +++ b/drivers/usb/mtu3/mtu3.h
> @@ -226,6 +226,8 @@ struct otg_switch_mtk {
> * @dma_clk: dma_bus_ck clock for AXI bus etc
> * @dr_mode: works in which mode:
> * host only, device only or dual-role mode
> + * @otg_srp_reqd: used for SRP request handling.
> + * @otg_hnp_reqd: used for HNP request handling.
> * @u2_ports: number of usb2.0 host ports
> * @u3_ports: number of usb3.0 host ports
> * @u3p_dis_msk: mask of disabling usb3 ports, for example, bit0==1 to
> @@ -252,6 +254,8 @@ struct ssusb_mtk {
> /* otg */
> struct otg_switch_mtk otg_switch;
> enum usb_dr_mode dr_mode;
> + bool otg_srp_reqd;
> + bool otg_hnp_reqd;
> bool is_host;
> int u2_ports;
> int u3_ports;
> diff --git a/drivers/usb/mtu3/mtu3_gadget_ep0.c b/drivers/usb/mtu3/mtu3_gadget_ep0.c
> index 4da216c99726..1247c43a63e6 100644
> --- a/drivers/usb/mtu3/mtu3_gadget_ep0.c
> +++ b/drivers/usb/mtu3/mtu3_gadget_ep0.c
> @@ -285,11 +285,24 @@ static int handle_test_mode(struct mtu3 *mtu, struct usb_ctrlrequest *setup)
> dev_dbg(mtu->dev, "TEST_PACKET\n");
> mtu->test_mode_nr = TEST_PACKET_MODE;
> break;
> + case OTG_SRP_REQD:
> + dev_dbg(mtu->dev, "OTG_SRP_REQD\n");
> + mtu->ssusb->otg_srp_reqd = 1;
> + break;
> + case OTG_HNP_REQD:
> + dev_dbg(mtu->dev, "OTG_HNP_REQD\n");
> + mtu->ssusb->otg_hnp_reqd = 1;
> + break;
> default:
> handled = -EINVAL;
> goto out;
> }
>
> + if (mtu->ssusb->otg_srp_reqd || mtu->ssusb->otg_hnp_reqd) {
> + mtu->ep0_state = MU3D_EP0_STATE_SETUP;
> + goto out;
> + }
> +
> mtu->test_mode = true;
>
> /* no TX completion interrupt, and need restart platform after test */
> diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
> index d5a5caec8fbc..545918c83fd1 100644
> --- a/include/uapi/linux/usb/ch9.h
> +++ b/include/uapi/linux/usb/ch9.h
> @@ -143,6 +143,11 @@
> #define TEST_SE0_NAK 3
> #define TEST_PACKET 4
> #define TEST_FORCE_EN 5
> +/*
> + * OTG HNP and SRP REQD
> + */
> +#define OTG_SRP_REQD 6
> +#define OTG_HNP_REQD 7
>
> /* Status Type */
> #define USB_STATUS_TYPE_STANDARD 0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-12 8:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-12 6:28 [PATCH] mtu3: fix setup packet response for HNP and SRP request Macpaul Lin
2019-06-12 8:46 ` Chunfeng Yun
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).