From patchwork Fri Apr 11 07:47:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chance Yang X-Patchwork-Id: 880522 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2135.outbound.protection.outlook.com [40.107.102.135]) (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 8019A202F67; Fri, 11 Apr 2025 07:47:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.135 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357658; cv=fail; b=qMEbTUZEvjSMtEGZ8aWuCmfKWDAOMlP+sdLr5/t198FLg8znaqQVmwd1KqRLktLBovO9pBlbNmGE+oBsj81v6uh9dagnWELRcUg5cckxFIqClGORhtVlvbiPVeezlzIf1TgiBBA62kxj+1YXJs/9Dvot0C3AFq2oUVq7VVGoVZo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357658; c=relaxed/simple; bh=xJ6+9sSrp1P0VAx1EBAVvLDYNJA84UFHeAKcf3fm5FA=; h=From:Date:Subject:Content-Type:Message-Id:To:Cc:MIME-Version; b=DhkYLQVePw4eLsqqPU1Pr/OfTc2N9qSU3a6KSdO974y8bp2Mx0n22bBjATpCi8+0v/KYlmBxwoWqP9+LsP9duKq1qK4X7+w7aLWb2PgW/Qyc3RfyQyaWD7lESqdwsrKo4o210VvQwszhUrbff5oP+Kqqvn3PgOgDXE20WbDJ2Yk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kneron.us; spf=pass smtp.mailfrom=kneron.us; dkim=pass (1024-bit key) header.d=kneron.us header.i=@kneron.us header.b=kRrztl+P; arc=fail smtp.client-ip=40.107.102.135 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kneron.us Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kneron.us Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=kneron.us header.i=@kneron.us header.b="kRrztl+P" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SyicsA/a5YFss3/wROzNd7csipzCB/LARMHacouyKK8eIc2HyqwMB18kov+982PNHzDQ0RvmkgMNtbk2TsYahsx8Wy+FHKkdNUNmZ3bSlnuynn8i0DiK3uS4gIyNgch0SGVdEoLTWnq3TpXChQCHysrkfBk5gT3cykbq45sBdSXtM8C3TCl+WUEeoBAvQAMhkamykUwIuXNKWNNYO4NUWfDZUQHbMLin4pdxIvDHj6rrpq7w790NqUKZlKYQww+1SahcUinzZtkRf/E51afEdK9ioahiuAhP/LFvYQp8nm8T91G6YAzGotKebr95gcP9rhIUhFLAnxLQMi8h8Qpo6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UjD1OO33htcyIy56P1hWEUievqSJG7gvD9llgkhJ/vw=; b=bMZw8BwGSHCPOFUoKU9l1JDrt0HAhmk2D34rptfcPNVKwuUs4n3AZe0TFoJVzn5nSILoKsNJaXifvTpGPfpwaEjSQ3gaTKinI0zNPL0dlBNEqFeo0HUTQgNCQRJLlntIRhwzUJ7M1mdO06YQCwQEnn6U4NmaPAuwsSOFVJAlFbUmSqPj9nT5ztPahz/Cb8gXuER7v/nvgM3FfK+JGmvAS3ek5NSodf1YzbIIlg7EwN8DCpXmHn/pr1fUfZAQsl4GsE8nmuJGP+QR5H/lw211dBjFRvQBrE2Z8lroWI6JLtbrJnJh1YfcTV3ZH8eXmpKPnsOU35L1lrnkMmQqsz0qEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kneron.us; dmarc=pass action=none header.from=kneron.us; dkim=pass header.d=kneron.us; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kneron.us; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UjD1OO33htcyIy56P1hWEUievqSJG7gvD9llgkhJ/vw=; b=kRrztl+PJkWk+LcVvkdBKbx1/OWMLu2NKX17zZTESTsHtnMYGg7ZxtFt0DcRftPC/PSgc9TMhLubZjO9k92y5kZ77hvX0rbCq+8aHGCEfYlg8HDBNgUGsCNLLjhx5vuaBimq0KC55uhmXT1rkUM/zft3GQHa95VBEjE0NZN7LG4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kneron.us; Received: from PH0PR14MB4360.namprd14.prod.outlook.com (2603:10b6:510:26::18) by MN2PR14MB4191.namprd14.prod.outlook.com (2603:10b6:208:19a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.27; Fri, 11 Apr 2025 07:47:32 +0000 Received: from PH0PR14MB4360.namprd14.prod.outlook.com ([fe80::f91d:52ba:8284:3e02]) by PH0PR14MB4360.namprd14.prod.outlook.com ([fe80::f91d:52ba:8284:3e02%6]) with mapi id 15.20.8606.029; Fri, 11 Apr 2025 07:47:32 +0000 From: Chance Yang Date: Fri, 11 Apr 2025 15:47:08 +0800 Subject: [PATCH v2] usb: common: usb-conn-gpio: use a unique name for usb connector device Message-Id: <20250411-work-next-v2-1-40beb82df5a9@kneron.us> X-B4-Tracking: v=1; b=H4sIAPvI+GcC/23Myw6CMBCF4Vchs7aGKZeCK9/DsNB2kIakJVOsG NJ3t7J2+Z+cfDsEYksBLsUOTNEG610OeSpAT3f3JGFNbpClbMoaUbw9z8LRtgrToVKdMm01Ssj /hWm022HdhtyTDavnz0FH/K3/lIgCRV/p+tE3RK3G6+yIvTu/AgwppS8MEK52ogAAAA== X-Change-ID: 20250411-work-next-d817787d63f2 To: Greg Kroah-Hartman , Chunfeng Yun Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, morgan.chang@kneron.us, Chance Yang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3075; i=chance.yang@kneron.us; h=from:subject:message-id; bh=xJ6+9sSrp1P0VAx1EBAVvLDYNJA84UFHeAKcf3fm5FA=; b=owGbwMvMwCVmsuR+7eedxj8YT6slMaT/OCn48JjTtXwLY+sEuTq1N3d1vprZ7+AwC2bkMsy4t upIwe+kjlIWBjEuBlkxRZbP2Ur7vVua59260rMfZg4rE8gQBi5OAZiIeCDD/4LERT3ukTMXbzs/ 902LRMfGSkVJo923Hy0u++lWamDcIsPwV8KllP+M/LSZGTPz94SZHWCJna6xdve8u2oqZ0/bLFu nzgwA X-Developer-Key: i=chance.yang@kneron.us; a=openpgp; fpr=F36B22BF4B84839EDAD48CBF34A4DF7DF3B933F8 X-ClientProxiedBy: TP0P295CA0006.TWNP295.PROD.OUTLOOK.COM (2603:1096:910:2::6) To PH0PR14MB4360.namprd14.prod.outlook.com (2603:10b6:510:26::18) Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR14MB4360:EE_|MN2PR14MB4191:EE_ X-MS-Office365-Filtering-Correlation-Id: d6b031bb-c6de-4992-74e0-08dd78cd1e12 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|376014|366016|1800799024|38350700014|80162021; X-Microsoft-Antispam-Message-Info: =?utf-8?q?NE1rhetPlUpHdlsAn+klhX1F2+IuVoR?= =?utf-8?q?u90jVCrc7rs5Hpnq2OL/sshmftfIjuc9+RFnsresvSfJTNFepSUgb+LTCWZnQj8br?= =?utf-8?q?jQNu5+nSqnVqJejPB0cMsVnruAOLLZD+NPZ4Dt5e2Zi3AtLaDXa/eSXLV5leg8+3A?= =?utf-8?q?z4AKlJv4h8UMFdjTfCHHxJTYO4X6M7oj2hHdmypWZ54sKYToO1pPSBYiGkhrpPD0i?= =?utf-8?q?j0ii7nhd/ruy0IpOW1idRPnn6zw/E/zE9c2pH78I5NAGetYQrYthyKmaLKOx7gZ7S?= =?utf-8?q?1g95UNcetfS9PfeVKtlXfznu3HRMwFmXx1LOfI/qoJl3L+phY93SF0FkOoZSKHXhu?= =?utf-8?q?Mqj4TnLty3Rqd8o8Q5o+qqB/mZ+mkHj5ztmbleLIz7Y+5Eo2LccjUIidlIeSQUFI+?= =?utf-8?q?44emfM0XSC5BklNVzv8cKxHV+Fx2jwsbu6AAH71+Y9gkG1LIA2YZDTaheleRoqfQs?= =?utf-8?q?XJqGWLtuDglZBmvsSznfG/p2d6eNUktiFnT47ij5PgtJ3p+cwPs0JDQaTorWv5BQN?= =?utf-8?q?6mCHXjB3mfQ/e34PGDD1akGsd1jYp+8SqlZ1hxFzzpO9/r6qG4wRu1Wgi37gD5NyU?= =?utf-8?q?l5ebslMs7ZiWGp998xH10pYNq3Yb9nnzyc5NHD0rANosi0p82eXE8kkTk5sqjS521?= =?utf-8?q?FSg6J+z6snfKM7sWSCIMqjCHLGJ1E3KWF1PCYyVBQ0g8LwEhmcaXD8ZPsgxuv21MV?= =?utf-8?q?gaYxBhXCH3AtXpvaOd0eY9Z5MJBn3pMq5aB77kVSz8oP/DmTMhgxngPBNYIWS3XHL?= =?utf-8?q?NTDb65B6CY9hx8CIzW8fRzJ9Ke7vKNWb8rwO6oevhi6tmjLPgtXXiRMgB5H4gD3pT?= =?utf-8?q?I13N1zb004nIHQ+L7G9+bhiOawa+YwoWn23q+YulaTdtmt9onkGSIuCiv6zvfDWYt?= =?utf-8?q?px8nbxZpWXIhC8Jco8X40b78DBSfDJpO27V6Mv3FX2wtKVYzfFz+Jy383wtXrpwpY?= =?utf-8?q?boEGJfYmEG/NEmMvVGsG5jR9A82dyQV+45UlrNFdOKb2gQgpfV/2Lb11+LjnJla+P?= =?utf-8?q?E2P9tdOzImIyk0L+yALXHooqquZjPDM+mpaVY9UL+g4lpOfCRZSjqDeNpOm8V8AVq?= =?utf-8?q?3rnMQdvvHuWxVbt0JOUFG3r1AHmKgj8K21IGF443fPsGR4ZldWU6EHpLgJU2NgCRu?= =?utf-8?q?mLG9v+vz16K4iuAvx6uSgFwbgTY3RkmgR7dRRykl81gJj6J2GnI8bqXApI0hv17Mh?= =?utf-8?q?rG3O9tk4RIJsBRokcNQ3s1WH1DV8hmrDcPPhYhii8sGJNUJVSOF2ZOflZJsP9djnq?= =?utf-8?q?bBy8FhzZO4ei6mSWZpDAhBeYqBXWTw3+o/DCt5cVA2UlJ+0dQedjeMcbU5T6fWtVp?= =?utf-8?q?FEY+CLnge3AdOkuxu90dRzFeCU5DtYyMC5YItnD4rStO5LNQMYw/R/sRmyET/cTox?= =?utf-8?q?EPoM7Yu/LksGrBxroXlo6HsgryxKuLOJkCQOda3MCsOr+h2rgDdACNlO7gqmnxr0j?= =?utf-8?q?4DzwpLQv8X?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR14MB4360.namprd14.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014)(80162021); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?yOwScW6v5vwqSjzf4YIACsGD58Tf?= =?utf-8?q?DalsiBmQUepaUlYtQj8DCZjdxmOTpWK58HDhqgq9keojCAOlyopBoDsG+GN8avYsk?= =?utf-8?q?y77RzWGnpfVv4fIkZUNYauX1s+440e/l8YROmfd03IL/58e8+p1iiBG6OGdRimne0?= =?utf-8?q?enirGs7hLyAUDylIi+MaPSfxSbZhKF0axoIcNU0k+FD/82+pjWgjcT8OvcN49Dymy?= =?utf-8?q?2p7FGYFq3i3leKKg1LIB719C/BoORhPOKpu8tcjF0JM8AIKtlquJnUDfCy4pp/6wW?= =?utf-8?q?HKHUXn8n+XrPEfSm84ZBVpPmX6YpyzPvvKj3aw9J27s0Dw8Y1q/ekWRxhMAR0FK6F?= =?utf-8?q?eQl6NKifyGhdQ6k9465giYk7kAQmIlXjnF4GSPNI0+RiFth2UIG3eGUr+p82ieRh6?= =?utf-8?q?sDkkN/u1CX7pm2KSolFbowBqCt1fY9hOpt3/WYoByTOnmUiJ5avVW5CnNuMhJbNJJ?= =?utf-8?q?8X404lDhPZUpSZYFWtpymx3Ic2g/lvdIuwly9mkCbLEhb2wqyI80FYXgkDRhGyB54?= =?utf-8?q?v26J6K3MKKblSCuOezUtwnerZMwA6Fz9oq/1F0f38Iz2BGkuGeldLzdcIWlARG4c4?= =?utf-8?q?BeKyBemAmggoFZedSeX+bUcHu/LfliWfflHsjqCUnQcEz5uhEycE4Uk1fKUj/AA2i?= =?utf-8?q?Kyp2yqMRK5eYYESXfWDGP58H0nAEkpmSsm9hgcnUHafQBQ35AeDxbPzUkT4HK+B6d?= =?utf-8?q?2Nc39Xj6YkH8gdzkaaFRPIzpqBJJ/gXWxpppF8RmxkPhCEBiHlVJLe1UEA61qWXGi?= =?utf-8?q?4NFeoL4zuudNk9u+C3qvMPUXQRRv0WfA2ndS3M7pnIfU5xllETRzRKQq1iJJZ+Xqe?= =?utf-8?q?GfkhW2GDJoytTZdXk44L9AKkQuf7NfFribeLZu7zVWAjxljpXtZYS6ydJCRIU0dyn?= =?utf-8?q?OMceCAISIwAvVws4t9vZ5+RxGNg0y3Bzpr59SUDezkaHNrbPFtJsfwvdKV3i3sHDF?= =?utf-8?q?hFNCRju2q9AAga6v53ftOub6vXjAR2JXE9RwGqDTb7gqYEbbh39y10yAJJuWynl/X?= =?utf-8?q?oXC5vMvBIgYVB6y6uswdLftE3d93xa8Cs45fpsdIPMClIaSHucYE8b8PeP71YocBI?= =?utf-8?q?NgZico1dMFRUvarTDkgottrwGgWJcz4nM80OL9j9Sy1ckeeQZnhtDDhQziAQHLqVv?= =?utf-8?q?giDS5aRmjCTN85HgKGNnE7iDkOdsucVXZKI7IqhwWjUkk9uI0FxIBO6Zc77wsWm56?= =?utf-8?q?sjt855OG9xgSOGGVCAySLQ7fOGbDPL8kKH866mzu3GroWsSWt+8SwTEtpJQygisrU?= =?utf-8?q?3aWHagCJyMWk5z+tWlMqecTVzLJY3Stao96c+a+Knb31Ij8c0O/q4eYA3JK3niCla?= =?utf-8?q?COMSKUWeIG7C5Pwbt//U452rXKUBUYq6eCdNkWjLDCiGa3h5EV8xlvPnbbDjLrRKp?= =?utf-8?q?0CjZHKSTX6KYFLGCfZOMjFUm+u8gd+APKc+vfgtc2fZ9uXww6vAVmv+dbnYh7+SE+?= =?utf-8?q?G8XbnqHDlETjKYr5IFJ93Cx31ScR20GBJ3nrhBgi528jYq8FDV3WUbZW5HCZ4w7MQ?= =?utf-8?q?Xbf6m8fi0vk6?= X-OriginatorOrg: kneron.us X-MS-Exchange-CrossTenant-Network-Message-Id: d6b031bb-c6de-4992-74e0-08dd78cd1e12 X-MS-Exchange-CrossTenant-AuthSource: PH0PR14MB4360.namprd14.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2025 07:47:32.6053 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f92b0f4b-650a-4d8a-bae3-0e64697d65f2 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fQXBBrx/jgrKtvF2F8Um0ywnEof21YmB7zUEH0Qe4HN+JyIQz9TpOypqQaJHLfR5fDU3TK9ifM8eLs/hVfoS7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR14MB4191 The current implementation of the usb-conn-gpio driver uses a fixed "usb-charger" name for all USB connector devices. This causes conflicts in the power supply subsystem when multiple USB connectors are present, as duplicate names are not allowed. Use IDA to manage unique IDs for naming usb connectors (e.g., usb-charger-0, usb-charger-1). Fixes: 880287910b189 ("usb: common: usb-conn-gpio: fix NULL pointer dereference of charger") Signed-off-by: Chance Yang --- Changes in v2: - Replaced atomic_t with IDA for unique ID management - Link to v1: https://lore.kernel.org/r/20250411-work-next-v1-1-93c4b95ee6c1@kneron.us --- drivers/usb/common/usb-conn-gpio.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) --- base-commit: 0af2f6be1b4281385b618cb86ad946eded089ac8 change-id: 20250411-work-next-d817787d63f2 Best regards, diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c index 1e36be2a28fd5ca5e1495b7923e4d3e25d7cedef..421c3af38e06975259f4a1792aa3b3708a192d59 100644 --- a/drivers/usb/common/usb-conn-gpio.c +++ b/drivers/usb/common/usb-conn-gpio.c @@ -21,6 +21,9 @@ #include #include #include +#include + +static DEFINE_IDA(usb_conn_ida); #define USB_GPIO_DEB_MS 20 /* ms */ #define USB_GPIO_DEB_US ((USB_GPIO_DEB_MS) * 1000) /* us */ @@ -30,6 +33,7 @@ struct usb_conn_info { struct device *dev; + int conn_id; /* store the IDA-allocated ID */ struct usb_role_switch *role_sw; enum usb_role last_role; struct regulator *vbus; @@ -161,7 +165,17 @@ static int usb_conn_psy_register(struct usb_conn_info *info) .fwnode = dev_fwnode(dev), }; - desc->name = "usb-charger"; + info->conn_id = ida_alloc(&usb_conn_ida, GFP_KERNEL); + if (info->conn_id < 0) + return info->conn_id; + + desc->name = devm_kasprintf(dev, GFP_KERNEL, "usb-charger-%d", + info->conn_id); + if (!desc->name) { + ida_free(&usb_conn_ida, info->conn_id); + return -ENOMEM; + } + desc->properties = usb_charger_properties; desc->num_properties = ARRAY_SIZE(usb_charger_properties); desc->get_property = usb_charger_get_property; @@ -169,8 +183,10 @@ static int usb_conn_psy_register(struct usb_conn_info *info) cfg.drv_data = info; info->charger = devm_power_supply_register(dev, desc, &cfg); - if (IS_ERR(info->charger)) - dev_err(dev, "Unable to register charger\n"); + if (IS_ERR(info->charger)) { + dev_err(dev, "Unable to register charger %d\n", info->conn_id); + ida_free(&usb_conn_ida, info->conn_id); + } return PTR_ERR_OR_ZERO(info->charger); } @@ -278,6 +294,9 @@ static void usb_conn_remove(struct platform_device *pdev) cancel_delayed_work_sync(&info->dw_det); + if (info->charger) + ida_free(&usb_conn_ida, info->conn_id); + if (info->last_role == USB_ROLE_HOST && info->vbus) regulator_disable(info->vbus);