From patchwork Thu Jun 22 07:14:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 779361 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wtXx36CHLz9sBR for ; Thu, 22 Jun 2017 17:18:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="L8x1uSzl"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 9474CC21CDB; Thu, 22 Jun 2017 07:13:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8B9ACC21CE1; Thu, 22 Jun 2017 07:11:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3E6E8C21C70; Thu, 22 Jun 2017 07:10:33 +0000 (UTC) Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by lists.denx.de (Postfix) with ESMTPS id 88310C21C8D for ; Thu, 22 Jun 2017 07:10:28 +0000 (UTC) Received: by mail-io0-f193.google.com with SMTP id m19so3058295ioe.1 for ; Thu, 22 Jun 2017 00:10:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4GTQlP9E8TCtXHe+DEF+yN6krLDGctSlnPoqI3EyBh0=; b=L8x1uSzlhEdzpoRU7xwHuEdUkCRlAS2udpYbh7uSIPJ1MAKdPJ1IdbJ6jEQRBRbVIq T+4OptQ/R9YlaP9esvdhypp0WvPndK5T5VQT3myY3Uw6NSuK+5A895n1VFgYX4w2mmBx 2seYixVocGFQK8fNPz84+mujp3U8Moy07zctjDOZahv64ZBqh6mgCJdnlKMiK6jwvY8n KKb5vLtxtLaoQNsPVIj0dKX9viXr83UHurBBquCBq5G1X4MjLGsb2X06v7UhA6HDZwkC o57F2t8LLBXJDmKb5MTbg6PlTMiKoDzQmw91k16aR2BUZjBVlrTbVwsA62AJqDIMlw6q D7GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4GTQlP9E8TCtXHe+DEF+yN6krLDGctSlnPoqI3EyBh0=; b=Yp+9NhkaXAmNT7fCB/olBiw6bt+3Ak1fqCYtRpMKJ3/3w9Ko+oePUKdh3gavDcXyKE oUzH2oX2h5mv+itlDEPigcvn4YPLiDvEdUBfKv8kmkRSMtjU2ZxWWC1geQXiUD57x4ul 6p3+XAnMN2WayH8fR0J6ibhuBNhplIX5TWv0QYhUvDXFY56Gq+IElKGHi65NKzZJ+lO+ J2aoxsaFB8NTQb0SQBdo2NmpFKwecVWAcKcLLt2wmTpb4XglFR3gAtyJK61jMZwyfI4A UnSee7AkQhEpO9q0+dzPg8uuounHLDkwk9AJ+h0KA30Z2V0OwQsxG1S9/m7ZOic070JA tisQ== X-Gm-Message-State: AKS2vOyc1RFUAJNRo3vV74LYiS8xwLpH/M27sCTSRQEx/RYocf6UOd5r sGE7oS5FjagdcQ== X-Received: by 10.107.6.38 with SMTP id 38mr930291iog.233.1498115427471; Thu, 22 Jun 2017 00:10:27 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-157-139.windriver.com. [147.11.157.139]) by smtp.gmail.com with ESMTPSA id f127sm344056itf.27.2017.06.22.00.10.26 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jun 2017 00:10:26 -0700 (PDT) From: Bin Meng To: Marek Vasut , U-Boot Mailing List Date: Thu, 22 Jun 2017 00:14:05 -0700 Message-Id: <1498115652-19409-12-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1498115652-19409-1-git-send-email-bmeng.cn@gmail.com> References: <1498115652-19409-1-git-send-email-bmeng.cn@gmail.com> Cc: Stefan Roese Subject: [U-Boot] [PATCH v2 11/18] usb: xhci: Get rid of CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" xHC reports supported maximum number of ports in the HCSPARAMS1 register, so it's unnecessary to use a hardcoded config option CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS. Signed-off-by: Bin Meng Reviewed-by: Simon Glass Reviewed-by: Stefan Roese Tested-by: Stefan Roese --- Changes in v2: None drivers/usb/host/xhci.c | 8 +++++--- drivers/usb/host/xhci.h | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 2acb0e6..8631e27 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -668,12 +668,14 @@ static int xhci_submit_root(struct usb_device *udev, unsigned long pipe, uint32_t reg; volatile uint32_t *status_reg; struct xhci_ctrl *ctrl = xhci_get_ctrl(udev); + struct xhci_hccr *hccr = ctrl->hccr; struct xhci_hcor *hcor = ctrl->hcor; + int max_ports = HCS_MAX_PORTS(xhci_readl(&hccr->cr_hcsparams1)); if ((req->requesttype & USB_RT_PORT) && - le16_to_cpu(req->index) > CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS) { - printf("The request port(%d) is not configured\n", - le16_to_cpu(req->index) - 1); + le16_to_cpu(req->index) > max_ports) { + printf("The request port(%d) exceeds maximum port number\n", + le16_to_cpu(req->index) - 1); return -EINVAL; } diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 3cf08e4..b9602ba 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -172,9 +172,7 @@ struct xhci_hcor { volatile uint64_t or_dcbaap; volatile uint32_t or_config; volatile uint32_t reserved_2[241]; - struct xhci_hcor_port_regs portregs[CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS]; - - uint32_t reserved_4[CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS * 254]; + struct xhci_hcor_port_regs portregs[MAX_HC_PORTS]; }; /* USBCMD - USB command - command bitmasks */