Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1812605pxb; Thu, 16 Sep 2021 16:38:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIxdTtt6t/rw9PBjJYvi5zX7H97lpb6o5ywHShui+sJYoM36DeaEk7M5Bw5TIwhZ+RMJH3 X-Received: by 2002:a05:6e02:168f:: with SMTP id f15mr3494716ila.283.1631835524620; Thu, 16 Sep 2021 16:38:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631835524; cv=none; d=google.com; s=arc-20160816; b=F+yejBfnzI7HNLk48rI6NDG9SHzCkipMv1dqYbkAWPvUZKP8V1UGyJzZhNV/stkt+Z l+F1MN2ZTLc0JcxM4jnM6tuKo+7Fz/RmjeDyBDpXHAvbYwuzAuSu1bR7eWrEKtK8VAed 8burfuomzk8QHBgcDzOvfngdK5FYsfuE9R026Qgc/3rfsdKD8KFCfxA+VnuDhtnk8xCT DUOpIacREnRubRYdMYuQnnM/Oqz3Jx1fHR04nvqTG4Y04wdr5A7okeeknXLF3ocGU6pl BfFIyngY6CpXWMo5FZJWWL8l/zfTAGa38ZGciZ/Zo00E0rtVrA1YVz1Z422mv3swBOO5 DC0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=soh4CCm8BI6OMpP9aKr3fJXk3sq6ahKhxK7a2BgwIMk=; b=IlFpNZucvhxGcdgKP/4HecuXoBjEbSXD+U0pk1dMlmIbU9SULePsQAuy8Fm/KyHa0L 4Sw4lSj8VjBmzzemGoVHSItg2jZoGnr46ruh2LszaF7OfzkM0Kh0dKnausy2jFJL0Rb2 zHTeqLMP8UTza9YPWTl9OJN7b62HePhzzzzCTiJz1UhKeFEcryH0EQQKMEumt0s6bZSX XNe986VBkoYYXXelr/rJ2X4drHhjMs6XYjgNJGB5xc2XiTOk+R5kLOJZfIwqMVJhVw57 YSIlW80b17mF812UECD6/aZ/7wLwZa+R9zvxPZ3phm1atuygjqkvb9T3vSZQpRHQ5/UK oW0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eeL0mS9G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 65si1900522jaf.38.2021.09.16.16.38.31; Thu, 16 Sep 2021 16:38:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eeL0mS9G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239284AbhIPQv2 (ORCPT + 99 others); Thu, 16 Sep 2021 12:51:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:57770 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243006AbhIPQqv (ORCPT ); Thu, 16 Sep 2021 12:46:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 149F061250; Thu, 16 Sep 2021 16:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809607; bh=9dp2HsjXh0v3QGCZzbXCEO3dbuO7d+bUPgzfJXClYpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eeL0mS9Gt7FRhfUyhr2aRlg3NlMoWwkm46BDalaqib1h73vw7T8EFox8iRwswcA8j l96dK4jR59Cdjflk7vpMyM7fZDLJSnjFk01KdBVGVVACRnlv4wrhLNWKe/utO+6ymI FlSMgLOn4Qpsgkv9OyX/QeAZuKYBDmuhZx+fLlXI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felipe Balbi , Ronak Vijay Raheja , Jack Pham , Sasha Levin Subject: [PATCH 5.13 174/380] usb: gadget: composite: Allow bMaxPower=0 if self-powered Date: Thu, 16 Sep 2021 17:58:51 +0200 Message-Id: <20210916155809.996418044@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jack Pham [ Upstream commit bcacbf06c891374e7fdd7b72d11cda03b0269b43 ] Currently the composite driver encodes the MaxPower field of the configuration descriptor by reading the c->MaxPower of the usb_configuration only if it is non-zero, otherwise it falls back to using the value hard-coded in CONFIG_USB_GADGET_VBUS_DRAW. However, there are cases when a configuration must explicitly set bMaxPower to 0, particularly if its bmAttributes also has the Self-Powered bit set, which is a valid combination. This is specifically called out in the USB PD specification section 9.1, in which a PDUSB device "shall report zero in the bMaxPower field after negotiating a mutually agreeable Contract", and also verified by the USB Type-C Functional Test TD.4.10.2 Sink Power Precedence Test. The fix allows the c->MaxPower to be used for encoding the bMaxPower even if it is 0, if the self-powered bit is also set. An example usage of this would be for a ConfigFS gadget to be dynamically updated by userspace when the Type-C connection is determined to be operating in Power Delivery mode. Co-developed-by: Ronak Vijay Raheja Acked-by: Felipe Balbi Signed-off-by: Ronak Vijay Raheja Signed-off-by: Jack Pham Link: https://lore.kernel.org/r/20210720080907.30292-1-jackp@codeaurora.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/gadget/composite.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 72a9797dbbae..504c1cbc255d 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -482,7 +482,7 @@ static u8 encode_bMaxPower(enum usb_device_speed speed, { unsigned val; - if (c->MaxPower) + if (c->MaxPower || (c->bmAttributes & USB_CONFIG_ATT_SELFPOWER)) val = c->MaxPower; else val = CONFIG_USB_GADGET_VBUS_DRAW; @@ -936,7 +936,11 @@ static int set_config(struct usb_composite_dev *cdev, } /* when we return, be sure our power usage is valid */ - power = c->MaxPower ? c->MaxPower : CONFIG_USB_GADGET_VBUS_DRAW; + if (c->MaxPower || (c->bmAttributes & USB_CONFIG_ATT_SELFPOWER)) + power = c->MaxPower; + else + power = CONFIG_USB_GADGET_VBUS_DRAW; + if (gadget->speed < USB_SPEED_SUPER) power = min(power, 500U); else -- 2.30.2