From nobody Sun Feb 8 04:07:29 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C21211A5B91 for ; Mon, 17 Feb 2025 12:03:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739793820; cv=none; b=FOSKhrxJyOrTVZG6VkcaMlWQUBNr2Fkq9B4j4We1kVgcu9Fkil3lrZSM7tGDDyraw91spwzdN0Gy05poh/ysfvTAHsqiIJEP+R/N4Rsm6uz3EaOamSTEAJ49FRnSGIFrwTaCaKR4EX2j01r7pASheEnZDaLTk9StGoxDS46z+o8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739793820; c=relaxed/simple; bh=6K1s7WtvEcHra4PUkbNmsvAn+WXVWxS0gjiaUNd/DaA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=GHV7AfM1VEcWCST/tDrxozEVBJfZMK2Al8LfXMiRtLxmt7Nmk4yamll7EXwEK2wLJ/j0Mim40kFLdVUQORGzut/k899fpW4yokqvJkzJ35GH+gMZ0KZ26aNowbWZ4VrxWE3RaV/v11AMkV/jpg5z+4vtP2HO5/TzprSdbseh7HA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Iyatpmj6; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Iyatpmj6" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51HAsi3Q026666 for ; Mon, 17 Feb 2025 12:03:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=aSw/G6T2sY+Uwj1Mjfh8/x3LyRxDhXoGM64 LGGBqwdk=; b=Iyatpmj6Qzd5lrwLSDcnbKhY1PEhWovR98kJt+HTgzONzVpjnxd qvwigJNGNbGBdudzSRNEebmi4C8k8cS9noiRfFc9tDaZlu5zhk6cwsnCIHqNnRig iV0IbXFg7aN8vP/hKz3UlTG4toOC/BkQxVT+mU/qTJSXpo54344ctAWsRc4IwpC6 sYvfDENc6v6Er1/ibdl+0daKOzMks6dsNlZKiaWJ+u+qDGfu5g+ehant1MF40igV g29opPcICn/NJuQ6vd8aZmhKFSKig18p9bO3FbC5kJzEoYY4sQCzEVrdr1lczSqH a6jPjKVyC0QmnFQbe0jtDX3VfpTeAjnwqgA== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44ut7shpa0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 17 Feb 2025 12:03:37 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-220cd43c75aso149570685ad.3 for ; Mon, 17 Feb 2025 04:03:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739793817; x=1740398617; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aSw/G6T2sY+Uwj1Mjfh8/x3LyRxDhXoGM64LGGBqwdk=; b=vHaJtBCAgISb11Ee9Pu8nh3syz0avPwCLctaiD4u5BDkmADU96hJiFDjp4AvZVshL5 oDyA5VUrUq5lZIBQnSOftWbPl/8zi6BuHSY3QAzdHRmrQ9YX5xZom2gKkuocTjRG3NwB Q2wtyp+s9e5l26g7kKsv9HuNHfVfUvmRv+eIQkRNv3rJhQjniGgTcc8pRet+Q5k8/qZT oGtktxwwk+zzUb/bPyrdUj9ei+66EAaz+qszcOarFKJDEBiRNfjYTc7NEsKG3v4w3fcJ xfzSvygSWWE91T/bW3uBsH5rTQGOd0eoMWj7t9Q7erLcUxqm35X52soEN9OvlgD3RzPl JFkw== X-Forwarded-Encrypted: i=1; AJvYcCWUUNn33QqvgJJi+kUcCnlib6TkHemarLHH5rr082ovY2oFSx1QodXyv+26QRQBVSfSB9P4z4Yv6gTettQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxqUoASymSAOaARJ3tv+0eetAykgIjs1bnbovDRkvu7LfwniTtT iD/o4ozGQo/5jOUZVeXWYniOx88C2kNKlimQAEzHbJXfmhg1JIrMvWpzi32FAlaVnlfwBkmeaVQ znCeQOVvbiWdCJlESNNyAcACYHtqbCk9a2WSW19NLpuxVs+MP8J8R9gNRrNzedv4= X-Gm-Gg: ASbGncupiFPXhPcb05cJKAimG4M6g7qoPNEMYAfugguPGAsvzc7XRZaJHB2K+OvG0wX 0/XYFaL3HoAiOlDwQxGQdAvwK7b6c6tWl2ltxh8UjLFgxG6fSu2MmjAFEK61JGB2uKSSIbIoddX fgXCoTi49/m5MpVegqzKg3zfmYExdxWoipbQhJoZfZFNG/yjICw56RdYGjPi3/kPdelO5Urb/uk bPQMRc4ARx2y4c8rh0cgqr5HIae8EoaUl1n/SynYDMlttta+lm+uMyX8v6oGMu1kITeawMX9t1F F8uZJtVDK9KQXuy+n7mnomJ13cwrhPJdRg== X-Received: by 2002:a17:902:d50d:b0:216:3633:36e7 with SMTP id d9443c01a7336-22104062006mr155026855ad.26.1739793816581; Mon, 17 Feb 2025 04:03:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGCA6q1jXs0gOYPnNc5rfyp37vbwb5yTD5SJhEK5QU1yvw7CTG3Llt6jrhbbwMiFjX0ult0Sw== X-Received: by 2002:a17:902:d50d:b0:216:3633:36e7 with SMTP id d9443c01a7336-22104062006mr155026335ad.26.1739793816079; Mon, 17 Feb 2025 04:03:36 -0800 (PST) Received: from hu-prashk-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d5348f34sm70632925ad.10.2025.02.17.04.03.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 04:03:35 -0800 (PST) From: Prashanth K To: Greg Kroah-Hartman , Thinh Nguyen , Peter Korsgaard , Sabyrzhan Tasbolatov Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Prashanth K , stable@vger.kernel.org Subject: [PATCH v2] usb: gadget: Set self-powered based on MaxPower and bmAttributes Date: Mon, 17 Feb 2025 17:33:28 +0530 Message-Id: <20250217120328.2446639-1-prashanth.k@oss.qualcomm.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: lcO3hG8YpbDoR9JENyz5GtK6T5Dotncq X-Proofpoint-ORIG-GUID: lcO3hG8YpbDoR9JENyz5GtK6T5Dotncq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-17_05,2025-02-13_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 impostorscore=0 bulkscore=0 spamscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 mlxscore=0 mlxlogscore=524 adultscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502170106 Content-Type: text/plain; charset="utf-8" Currently the USB gadget will be set as bus-powered based solely on whether its bMaxPower is greater than 100mA, but this may miss devices that may legitimately draw less than 100mA but still want to report as bus-powered. Similarly during suspend & resume, USB gadget is incorrectly marked as bus/self powered without checking the bmAttributes field. Fix these by configuring the USB gadget as self or bus powered based on bmAttributes, and explicitly set it as bus-powered if it draws more than 100mA. Cc: stable@vger.kernel.org Fixes: 5e5caf4fa8d3 ("usb: gadget: composite: Inform controller driver of s= elf-powered") Signed-off-by: Prashanth K --- Changes in v2: - Didn't change anything from RFC. - Link to RFC: https://lore.kernel.org/all/20250204105908.2255686-1-prashan= th.k@oss.qualcomm.com/ drivers/usb/gadget/composite.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index bdda8c74602d..1fb28bbf6c45 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1050,10 +1050,11 @@ static int set_config(struct usb_composite_dev *cde= v, else usb_gadget_set_remote_wakeup(gadget, 0); done: - if (power <=3D USB_SELF_POWER_VBUS_MAX_DRAW) - usb_gadget_set_selfpowered(gadget); - else + if (power > USB_SELF_POWER_VBUS_MAX_DRAW || + !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER)) usb_gadget_clear_selfpowered(gadget); + else + usb_gadget_set_selfpowered(gadget); =20 usb_gadget_vbus_draw(gadget, power); if (result >=3D 0 && cdev->delayed_status) @@ -2615,7 +2616,9 @@ void composite_suspend(struct usb_gadget *gadget) =20 cdev->suspended =3D 1; =20 - usb_gadget_set_selfpowered(gadget); + if (cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER) + usb_gadget_set_selfpowered(gadget); + usb_gadget_vbus_draw(gadget, 2); } =20 @@ -2649,8 +2652,11 @@ void composite_resume(struct usb_gadget *gadget) else maxpower =3D min(maxpower, 900U); =20 - if (maxpower > USB_SELF_POWER_VBUS_MAX_DRAW) + if (maxpower > USB_SELF_POWER_VBUS_MAX_DRAW || + !(cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER)) usb_gadget_clear_selfpowered(gadget); + else + usb_gadget_set_selfpowered(gadget); =20 usb_gadget_vbus_draw(gadget, maxpower); } else { --=20 2.25.1