Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1041317ybp; Thu, 17 Oct 2019 07:14:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqx9qdV4VQA+CyoW1YlEqLqo6rwuCJ4sncc7HfQpDAOYeV3X3wP3AA8U0OM0caYfxBHtmVyh X-Received: by 2002:a17:906:670c:: with SMTP id a12mr3672667ejp.273.1571321681095; Thu, 17 Oct 2019 07:14:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571321681; cv=none; d=google.com; s=arc-20160816; b=n6TW1nTmO3s8oJKL69C7wL9ClkeczSlv908Zkw1pF+6BhumFITn1WQy0mt4u+nFjuE XtvlNl1f32NT9TW/jelSIRs5cnuqbBZWmLRaEASVZocgPDl8tLf+2Qpj6SMusZ+FdQiy hH9nYQbhgaylvMpJibzGS4D5lP5jRA1dbxefr9Su7mChPCByQazYAG5tGd1nbeGY4SzE 3EfNrV4RmU/vOMB7Wha264G5mJV7V7RRB1gT+DA2K12Z/OzHQdTyEQzmH6Cz4BGIHxup e2R05vLpeL2nTacSqofMWUt9FW14+iurJrJR+HzpGTwiIdb4Olx1DVE5K/UiBBA59aZL HTnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=W+s8We2vAQ6Q/FitsGR2rswjYS0qG966WvUvztmNJ8k=; b=l7L1mS0ajelHpNm1X3fWQU3wpKlYwbv3QKI0WxyujjrcXrvbNxvklS/GIMCO9z/adB HRNRiSSzb0naK0epRd9rze1xHJisvlVn6unVVJic7rNUG5vy2XkQnhfNm1ub6x70EKmD ylhRxGxHzhur/JNA6WYuE55X3JEANtVifSVkdcSaAtgWxdIFNb8dK8ieK0nQwIgQDkH+ Zl3DMZZMh4flAJz4TMD7P9oi11FPkebkBjKuCw722ef29UKwe9QDITqASSzqnmeHdozg IEOBVrkybnOAnOOZkChgPQ1lK7JIs5MDOrronROl/cZJZc7/9gqCK1vLL3r1nK6QOvAh jrQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ydgxTh+E; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v19si1686053edm.103.2019.10.17.07.14.17; Thu, 17 Oct 2019 07:14:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ydgxTh+E; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437574AbfJPVxo (ORCPT + 99 others); Wed, 16 Oct 2019 17:53:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:42542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437534AbfJPVxe (ORCPT ); Wed, 16 Oct 2019 17:53:34 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7797A20872; Wed, 16 Oct 2019 21:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262813; bh=pOCrst16gNH88uIbZ4MKF+ZZd8DAYqOcxYzBcFMGtB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ydgxTh+ENwvXMdD7TUV885kBDvCzJH4acvl0BB2hL0WviHMnKrsEZPqEYKUJgAQfC 3b4wCmBOyhRANbV3AUOMAd4QAECe9VstelheOXULJNnGvVjDQWLNMF6rAC5Vk98fgS 5g+9DNgDGobpZtWgt/fVswo9Irw0fw6FN3vG1Rc0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jacky Cao , Alan Stern Subject: [PATCH 4.4 56/79] USB: dummy-hcd: fix power budget for SuperSpeed mode Date: Wed, 16 Oct 2019 14:50:31 -0700 Message-Id: <20191016214819.206934415@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jacky.Cao@sony.com commit 2636d49b64671d3d90ecc4daf971b58df3956519 upstream. The power budget for SuperSpeed mode should be 900 mA according to USB specification, so set the power budget to 900mA for dummy_start_ss which is only used for SuperSpeed mode. If the max power consumption of SuperSpeed device is larger than 500 mA, insufficient available bus power error happens in usb_choose_configuration function when the device connects to dummy hcd. Signed-off-by: Jacky Cao Acked-by: Alan Stern Cc: stable Link: https://lore.kernel.org/r/16EA1F625E922C43B00B9D82250220500871CDE5@APYOKXMS108.ap.sony.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/udc/dummy_hcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/usb/gadget/udc/dummy_hcd.c +++ b/drivers/usb/gadget/udc/dummy_hcd.c @@ -50,6 +50,7 @@ #define DRIVER_VERSION "02 May 2005" #define POWER_BUDGET 500 /* in mA; use 8 for low-power port testing */ +#define POWER_BUDGET_3 900 /* in mA */ static const char driver_name[] = "dummy_hcd"; static const char driver_desc[] = "USB Host+Gadget Emulator"; @@ -2435,7 +2436,7 @@ static int dummy_start_ss(struct dummy_h dum_hcd->rh_state = DUMMY_RH_RUNNING; dum_hcd->stream_en_ep = 0; INIT_LIST_HEAD(&dum_hcd->urbp_list); - dummy_hcd_to_hcd(dum_hcd)->power_budget = POWER_BUDGET; + dummy_hcd_to_hcd(dum_hcd)->power_budget = POWER_BUDGET_3; dummy_hcd_to_hcd(dum_hcd)->state = HC_STATE_RUNNING; dummy_hcd_to_hcd(dum_hcd)->uses_new_polling = 1; #ifdef CONFIG_USB_OTG