From: Frank Wunderlich <linux@fw-web.de>
To: u-boot@lists.denx.de
Subject: [RESEND PATCH v2 04/11] usb: xhci: convert to HCS_MAX_PORTS()
Date: Wed, 2 Sep 2020 08:13:36 +0200 [thread overview]
Message-ID: <20200902061343.3185-4-linux@fw-web.de> (raw)
In-Reply-To: <20200902061343.3185-1-linux@fw-web.de>
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
Use HCS_MAX_PORTS(p) instead of
((p & HCS_MAX_PORTS_MASK) >> HCS_MAX_PORTS_SHIFT)
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
drivers/usb/host/xhci.c | 3 +--
include/usb/xhci.h | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 51edeb22c1..5f3a0fba4b 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1257,8 +1257,7 @@ static int xhci_lowlevel_init(struct xhci_ctrl *ctrl)
return -ENOMEM;
reg = xhci_readl(&hccr->cr_hcsparams1);
- descriptor.hub.bNbrPorts = ((reg & HCS_MAX_PORTS_MASK) >>
- HCS_MAX_PORTS_SHIFT);
+ descriptor.hub.bNbrPorts = HCS_MAX_PORTS(reg);
printf("Register %x NbrPorts %d\n", reg, descriptor.hub.bNbrPorts);
/* Port Indicators */
diff --git a/include/usb/xhci.h b/include/usb/xhci.h
index 3de46cd95e..cf4c0208b2 100644
--- a/include/usb/xhci.h
+++ b/include/usb/xhci.h
@@ -101,8 +101,6 @@ struct xhci_hccr {
/* bits 8:18, Max Interrupters */
#define HCS_MAX_INTRS(p) (((p) >> 8) & 0x7ff)
/* bits 24:31, Max Ports - max value is 0x7F = 127 ports */
-#define HCS_MAX_PORTS_SHIFT 24
-#define HCS_MAX_PORTS_MASK (0xff << HCS_MAX_PORTS_SHIFT)
#define HCS_MAX_PORTS(p) (((p) >> 24) & 0xff)
/* HCSPARAMS2 - hcs_params2 - bitmasks */
--
2.25.1
next prev parent reply other threads:[~2020-09-02 6:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 6:13 [RESEND PATCH v2 01/11] usb: xhci: add a member hci_version in xhci_ctrl struct Frank Wunderlich
2020-09-02 6:13 ` [RESEND PATCH v2 02/11] usb: xhci: create one unified function to calculate TRB TD remainder Frank Wunderlich
2020-09-02 6:13 ` [RESEND PATCH v2 03/11] usb: xhci: add quirks flag to support MediaTek xHCI 0.96 Frank Wunderlich
2020-09-02 6:13 ` Frank Wunderlich [this message]
2020-09-04 6:54 ` [RESEND PATCH v2 04/11] usb: xhci: convert to HCS_MAX_PORTS() Bin Meng
2020-09-02 6:13 ` [RESEND PATCH v2 05/11] usb: xhci: convert to TRB_TYPE() Frank Wunderlich
2020-09-04 9:23 ` Bin Meng
2020-09-02 6:13 ` [RESEND PATCH v2 06/11] usb: xhci: convert to TRB_INTR_TARGET() Frank Wunderlich
2020-09-02 6:13 ` [RESEND PATCH v2 07/11] usb: xhci: convert to TRB_LEN() Frank Wunderlich
2020-09-02 6:13 ` [RESEND PATCH v2 08/11] usb: xhci: convert to TRB_TX_TYPE() Frank Wunderlich
2020-09-02 6:13 ` [RESEND PATCH v2 09/11] usb: xhci: convert to EP_TYPE() Frank Wunderlich
2020-09-02 6:13 ` [RESEND PATCH v2 10/11] usb: xhci: use macros with parameter to fill ep_info2 Frank Wunderlich
2020-09-02 6:13 ` [RESEND PATCH v2 11/11] usb: xhci: convert to readx_poll_sleep_timeout() Frank Wunderlich
2020-09-02 10:38 ` [RESEND PATCH v2 01/11] usb: xhci: add a member hci_version in xhci_ctrl struct Marek Vasut
2020-09-02 13:21 ` Bin Meng
2020-09-04 0:59 ` Bin Meng
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=20200902061343.3185-4-linux@fw-web.de \
--to=linux@fw-web.de \
--cc=u-boot@lists.denx.de \
/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