From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Neal Liu <neal_liu@aspeedtech.com>
Cc: Felipe Balbi <balbi@kernel.org>, Joel Stanley <joel@jms.id.au>,
Andrew Jeffery <andrew@aj.id.au>,
Cai Huoqing <caihuoqing@baidu.com>,
Tao Ren <rentao.bupt@gmail.com>,
Julia Lawall <julia.lawall@inria.fr>,
kernel test robot <lkp@intel.com>,
Sasha Levin <sashal@kernel.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, BMC-SW@aspeedtech.com
Subject: Re: [PATCH v2 4/4] usb: aspeed-vhub: support test mode feature
Date: Tue, 30 Nov 2021 12:47:04 +0100 [thread overview]
Message-ID: <YaYPOAB3Anfhh5AA@kroah.com> (raw)
In-Reply-To: <20211130104256.3106797-5-neal_liu@aspeedtech.com>
On Tue, Nov 30, 2021 at 06:42:56PM +0800, Neal Liu wrote:
> Support aspeed usb vhub set feature to test mode.
>
> Signed-off-by: Neal Liu <neal_liu@aspeedtech.com>
> ---
> drivers/usb/gadget/udc/aspeed-vhub/dev.c | 18 ++++++++++++++----
> drivers/usb/gadget/udc/aspeed-vhub/hub.c | 22 ++++++++++++++++------
> 2 files changed, 30 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/usb/gadget/udc/aspeed-vhub/dev.c b/drivers/usb/gadget/udc/aspeed-vhub/dev.c
> index d918e8b2af3c..4462f4b73b04 100644
> --- a/drivers/usb/gadget/udc/aspeed-vhub/dev.c
> +++ b/drivers/usb/gadget/udc/aspeed-vhub/dev.c
> @@ -110,15 +110,25 @@ static int ast_vhub_dev_feature(struct ast_vhub_dev *d,
> u16 wIndex, u16 wValue,
> bool is_set)
> {
> + u32 val;
> +
> DDBG(d, "%s_FEATURE(dev val=%02x)\n",
> is_set ? "SET" : "CLEAR", wValue);
>
> - if (wValue != USB_DEVICE_REMOTE_WAKEUP)
> - return std_req_driver;
> + if (wValue == USB_DEVICE_REMOTE_WAKEUP) {
> + d->wakeup_en = is_set;
> + return std_req_complete;
>
> - d->wakeup_en = is_set;
> + } else if (wValue == USB_DEVICE_TEST_MODE) {
If you return, no need for an else statement, right?
> + val = readl(d->vhub->regs + AST_VHUB_CTRL);
> + val &= ~GENMASK(10, 8);
> + val |= VHUB_CTRL_SET_TEST_MODE((wIndex >> 8) & 0x7);
> + writel(val, d->vhub->regs + AST_VHUB_CTRL);
>
> - return std_req_complete;
> + return std_req_complete;
> + }
> +
> + return std_req_driver;
> }
>
> static int ast_vhub_ep_feature(struct ast_vhub_dev *d,
> diff --git a/drivers/usb/gadget/udc/aspeed-vhub/hub.c b/drivers/usb/gadget/udc/aspeed-vhub/hub.c
> index 93f27a745760..e52805fbdebd 100644
> --- a/drivers/usb/gadget/udc/aspeed-vhub/hub.c
> +++ b/drivers/usb/gadget/udc/aspeed-vhub/hub.c
> @@ -212,17 +212,27 @@ static int ast_vhub_hub_dev_feature(struct ast_vhub_ep *ep,
> u16 wIndex, u16 wValue,
> bool is_set)
> {
> + u32 val;
> +
> EPDBG(ep, "%s_FEATURE(dev val=%02x)\n",
> is_set ? "SET" : "CLEAR", wValue);
>
> - if (wValue != USB_DEVICE_REMOTE_WAKEUP)
> - return std_req_stall;
> + if (wValue == USB_DEVICE_REMOTE_WAKEUP) {
> + ep->vhub->wakeup_en = is_set;
> + EPDBG(ep, "Hub remote wakeup %s\n",
> + is_set ? "enabled" : "disabled");
> + return std_req_complete;
>
> - ep->vhub->wakeup_en = is_set;
> - EPDBG(ep, "Hub remote wakeup %s\n",
> - is_set ? "enabled" : "disabled");
> + } else if (wValue == USB_DEVICE_TEST_MODE) {
Same here, no need for else.
thanks,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-11-30 11:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-30 10:42 [PATCH v2 0/4] Refactor Aspeed USB vhub driver Neal Liu
2021-11-30 10:42 ` [PATCH v2 1/4] usb: aspeed-vhub: add qualifier descriptor Neal Liu
2021-11-30 11:45 ` Greg Kroah-Hartman
2021-12-01 5:43 ` Neal Liu
2021-12-01 6:18 ` Greg Kroah-Hartman
2021-12-01 6:31 ` Neal Liu
2021-11-30 10:42 ` [PATCH v2 2/4] usb: aspeed-vhub: support auto remote wakeup feature Neal Liu
2021-11-30 10:42 ` [PATCH v2 3/4] usb: aspeed-vhub: fix ep0 OUT ack received wrong length issue Neal Liu
2021-11-30 11:47 ` Greg Kroah-Hartman
2021-12-01 2:17 ` Neal Liu
2021-11-30 10:42 ` [PATCH v2 4/4] usb: aspeed-vhub: support test mode feature Neal Liu
2021-11-30 11:47 ` Greg Kroah-Hartman [this message]
2021-12-01 3:36 ` Neal Liu
-- strict thread matches above, loose matches on Subject: below --
2021-11-30 11:38 [PATCH v2 0/4] Refactor Aspeed USB vhub driver Neal Liu
2021-11-30 11:38 ` [PATCH v2 4/4] usb: aspeed-vhub: support test mode feature Neal Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YaYPOAB3Anfhh5AA@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=BMC-SW@aspeedtech.com \
--cc=andrew@aj.id.au \
--cc=balbi@kernel.org \
--cc=caihuoqing@baidu.com \
--cc=joel@jms.id.au \
--cc=julia.lawall@inria.fr \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=lkp@intel.com \
--cc=neal_liu@aspeedtech.com \
--cc=rentao.bupt@gmail.com \
--cc=sashal@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).