From patchwork Mon Feb 17 12:03:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prashanth K X-Patchwork-Id: 866061 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 D0B702185AB for ; Mon, 17 Feb 2025 12:03:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739793822; cv=none; b=MqSrHhUW7N//bEbUgKadaOy7Sfa3rhYzwXSj9UcfajCJI0iEhHV7przw/Q+Lejrhr5m6jBYS6TnNhAMPHq+VS+rIkbdPVGUM6Yu3tQjQ+RMV2mBXiWsdNaYqyhAQQkfeWeXz4Aa0ncGr/4xJ9aP1m5XoTkQPNNIRKddruiLQ6mA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739793822; c=relaxed/simple; bh=6K1s7WtvEcHra4PUkbNmsvAn+WXVWxS0gjiaUNd/DaA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=MObG471gDhMx5CCSuZgHHp3mHMvwlzZ8Q8tulM2nYJxZGCc+eYfTFNK14NrivuMn4vuZhVgjuBxCZjWVqGHUTC5zj3Y9z1Y1mniDOWURfzOZY2bmdbUobJq8aD47nKKT+fYfcmg4r81pZ9bkblu2/cbd2XUBJk7XFnSN4/B9Tks= 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.180.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 (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51HAh3l4032065 for ; Mon, 17 Feb 2025 12:03:39 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-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44ut7wsqa8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 17 Feb 2025 12:03:38 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-22104619939so63821625ad.1 for ; Mon, 17 Feb 2025 04:03:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739793816; x=1740398616; 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=lI4697OJ2KQ8wsOiyf/AiNOO8h8JPyqn9rV1R/v7NxHyt1ps5W9mjxQ8EXfrGDVb8L DIb8BCRgQpiQo/V0QhbCBZQfsc2Zs8DegxOinw8KwtjbGSdrXygGK33uIaWQIT//752s vqGBfQ6gfU5gniPnAx1FsQMuKnkk+52rd+4EHud4IAra5D1LW07V9DMQnjPBeCmUHrJD Gt8nvndhr1WhjTPx05CIh0+Ks5dQTf8pMlGlH7ZFbpFbkdCrwmG7MtG83iGcqRMpitKp 8PbUbOixQmAK/pNc9uL0fUb9fzKq9moVkEzwndYFUl1WNN9L+RTm1RM4QEYsaRMRkdGi tUjw== X-Gm-Message-State: AOJu0Yy08AED9SpdsYa0o9scRYFipH5bQIbkGZNaQ94oI6nqcE1kO4qQ 5T7HNxCd1b5CjRWVfWgb8rGJ1rShhThzg2oSlfoJ8NiRrLjzqs3fakNdbsQjeIhgLS/gpzbdAPP Lt0iI2IssS1FcHtgN2qpvU2m2Jg8mnd2QKgea9s358Is+XH7MYAuxTbb3Umw= X-Gm-Gg: ASbGncv36pc9QGAi2IjLk8u5D1UPTyDtw5SxHqQJD2fG8XSfAUflR7xnhkbS2NYH1JK Rnrs6azVak8Jfi9+WWjiWefa6gPOO0FaOF2+Rb59U5Vde8HYZNostJwINtIF7CaXZHjI4DN3LQR DN1STi1p59P/ZLBluCIPqHxAdqHPFfQ+WmX5OKCNrcKasNSkTIQELOUHWjI0IrXEJGi7o8ofUSZ uwBWwkqFdCEGRjWbnIX6IBfckBIDFgPrQLUsTT/BA8X8BbHDkhLVVpaN2kxLi0kSbQ1Q8PXYgv6 FBuiymdWWwr/hq6GAA/zfJpUS+ssc01Pvg== X-Received: by 2002:a17:902:d50d:b0:216:3633:36e7 with SMTP id d9443c01a7336-22104062006mr155026835ad.26.1739793816579; 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-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: aLOgrJwBDtKkCfFWBCmCGr_A891R9V8C X-Proofpoint-ORIG-GUID: aLOgrJwBDtKkCfFWBCmCGr_A891R9V8C 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 impostorscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 bulkscore=0 mlxlogscore=462 spamscore=0 adultscore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502170106 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 self-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-prashanth.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 *cdev, else usb_gadget_set_remote_wakeup(gadget, 0); done: - if (power <= 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); usb_gadget_vbus_draw(gadget, power); if (result >= 0 && cdev->delayed_status) @@ -2615,7 +2616,9 @@ void composite_suspend(struct usb_gadget *gadget) cdev->suspended = 1; - usb_gadget_set_selfpowered(gadget); + if (cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER) + usb_gadget_set_selfpowered(gadget); + usb_gadget_vbus_draw(gadget, 2); } @@ -2649,8 +2652,11 @@ void composite_resume(struct usb_gadget *gadget) else maxpower = min(maxpower, 900U); - 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); usb_gadget_vbus_draw(gadget, maxpower); } else {