| Message ID | 1598434161-10272-1-git-send-email-chunfeng.yun@mediatek.com |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
| Series | [RESEND,v2,01/11] usb: xhci: add a member hci_version in xhci_ctrl struct | expand |
Hi, any change to get this series into 2020-10? i'm asking because tom write that merge window for next will be opened soon. imho that means that current release cycle allows only fixes, right? usb for mt7622/23 needs these patches to work properly (currently only controller is detected with my dts-patches) regards Frank
On 8/27/20 3:31 PM, Frank Wunderlich wrote: > Hi, Hi, > any change to get this series into 2020-10? We're already at rc3, so no. > i'm asking because tom write that merge window for next will be opened soon. imho that means that current release cycle allows only fixes, right? It is mostly fixes since rc2 or so. > usb for mt7622/23 needs these patches to work properly (currently only controller is detected with my dts-patches) Then resend them, so they can be reviewed, CC this email address (because I don't see them in my mailbox) and then they can be included in next. Thanks
On Thu, 2020-08-27 at 20:05 +0200, Marek Vasut wrote: > On 8/27/20 3:31 PM, Frank Wunderlich wrote: > > Hi, > > Hi, > > > any change to get this series into 2020-10? > > We're already at rc3, so no. > > > i'm asking because tom write that merge window for next will be opened soon. imho that means that current release cycle allows only fixes, right? > > It is mostly fixes since rc2 or so. > > > usb for mt7622/23 needs these patches to work properly (currently only controller is detected with my dts-patches) > > Then resend them, so they can be reviewed, CC this email address > (because I don't see them in my mailbox) and then they can be included > in next. Sorry, I don't know what happens, seems always rejected by your malibox. I'll ask for help from helpdesk. And I use ping to test network, it's fine. ping -c 4 62.245.181.138 PING 62.245.181.138 (62.245.181.138) 56(84) bytes of data. 64 bytes from 62.245.181.138: icmp_req=1 ttl=48 time=234 ms 64 bytes from 62.245.181.138: icmp_req=3 ttl=48 time=232 ms But always receive the following email when I send out patches. ------------------------------------------------ elivery has failed to these recipients or groups: marex@denx.de A problem occurred while delivering this message to this email address. Try sending this message again. If the problem continues, please contact your helpdesk. The following organization rejected your message: mail-in.m-online.net [62.245.181.138]. Diagnostic information for administrators: Generating server: mailgw01.mediatek.com marex@denx.de mail-in.m-online.net [62.245.181.138] Remote Server returned '<mail-in.m-online.net [62.245.181.138] #5.0.0 SMTP; mail-in.m-online.net {mxin-1.m-online.net} ESMTP>' > > Thanks
Hi Frank,
Would you please forward this mail to Marek, he doesn't receive email
sent from MediaTek, thanks a lot
Hi Marek,
I always receive eth following massage, it seems the same for my
workmate,
---
Delivery has failed to these recipients or groups:
marex@denx.de
A problem occurred while delivering this message to this email address.
Try sending this message again. If the problem continues, please contact
your helpdesk.
The following organization rejected your message: mail-in.m-online.net
[212.114.242.10].
Diagnostic information for administrators:
Generating server: mailgw01.mediatek.com
marex@denx.de
mail-in.m-online.net [212.114.242.10]
Remote Server returned '<mail-in.m-online.net [212.114.242.10] #5.0.0
SMTP; mail-in.m-online.net {mxin-2.m-online.net} ESMTP>'
---
I ping the IP 212.114.242.10, it's ok,
ping -c 4 212.114.242.10
PING 212.114.242.10 (212.114.242.10) 56(84) bytes of data.
64 bytes from 212.114.242.10: icmp_req=1 ttl=48 time=215 ms
64 bytes from 212.114.242.10: icmp_req=2 ttl=48 time=214 ms
64 bytes from 212.114.242.10: icmp_req=3 ttl=48 time=214 ms
64 bytes from 212.114.242.10: icmp_req=4 ttl=48 time=217 ms
--- 212.114.242.10 ping statistics ---
4 packets transmitted, 4 received, 0% packet loss, time 3004ms
rtt min/avg/max/mdev = 214.301/215.550/217.519/1.396 ms
But don't know why you can't receive email from me, it's indeed sent
out, we can find it in patchwork.
On Thu, 2020-08-27 at 20:05 +0200, Marek Vasut wrote:
> On 8/27/20 3:31 PM, Frank Wunderlich wrote:
> > Hi,
>
> Hi,
>
> > any change to get this series into 2020-10?
>
> We're already at rc3, so no.
>
> > i'm asking because tom write that merge window for next will be opened soon. imho that means that current release cycle allows only fixes, right?
>
> It is mostly fixes since rc2 or so.
>
> > usb for mt7622/23 needs these patches to work properly (currently only controller is detected with my dts-patches)
>
> Then resend them, so they can be reviewed, CC this email address
> (because I don't see them in my mailbox) and then they can be included
> in next.
>
> Thanks
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 092ed6e..79bfc34 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -682,7 +682,7 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe, field |= TRB_ISP; /* Set the TRB length, TD size, and interrupter fields. */ - if (HC_VERSION(xhci_readl(&ctrl->hccr->cr_capbase)) < 0x100) + if (ctrl->hci_version < 0x100) remainder = xhci_td_remainder(length - running_total); else remainder = xhci_v1_0_td_remainder(running_total, @@ -830,7 +830,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe, field |= 0x1; /* xHCI 1.0 6.4.1.2.1: Transfer Type field */ - if (HC_VERSION(xhci_readl(&ctrl->hccr->cr_capbase)) >= 0x100) { + if (ctrl->hci_version >= 0x100) { if (length > 0) { if (req->requesttype & USB_DIR_IN) field |= (TRB_DATA_IN << TRB_TX_TYPE_SHIFT); diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 126dabc..4be1411 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1283,6 +1283,7 @@ static int xhci_lowlevel_init(struct xhci_ctrl *ctrl) reg = HC_VERSION(xhci_readl(&hccr->cr_capbase)); printf("USB XHCI %x.%02x\n", reg >> 8, reg & 0xff); + ctrl->hci_version = reg; return 0; } diff --git a/include/usb/xhci.h b/include/usb/xhci.h index 7d34103..a3e5914 100644 --- a/include/usb/xhci.h +++ b/include/usb/xhci.h @@ -1227,6 +1227,7 @@ struct xhci_ctrl { struct xhci_scratchpad *scratchpad; struct xhci_virt_device *devs[MAX_HC_SLOTS]; int rootdev; + u16 hci_version; }; unsigned long trb_addr(struct xhci_segment *seg, union xhci_trb *trb);
Add a member to save xHCI version, it's used some times. Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> --- v2: no changes --- drivers/usb/host/xhci-ring.c | 4 ++-- drivers/usb/host/xhci.c | 1 + include/usb/xhci.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)