From: Chance Yang chance.yang@kneron.us
[ Upstream commit d4e5b10c55627e2f3fc9e5b337a28b4e2f02a55e ]
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).
Signed-off-by: Chance Yang chance.yang@kneron.us Link: https://lore.kernel.org/r/20250411-work-next-v3-1-7cd9aa80190c@kneron.us Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Sasha Levin sashal@kernel.org ---
**YES**
This commit should be backported to stable kernel trees. Here's my extensive analysis:
## Bug Analysis
**Critical User-Affecting Issue**: The commit fixes a real bug where multiple USB connectors cannot coexist on the same system. Without this fix, when multiple `usb-conn-gpio` devices are present, all would attempt to register with the same "usb-charger" name in the power supply subsystem, causing registration failures and rendering additional USB connectors non-functional.
## Code Changes Analysis
**Minimal and Well-Contained**: The changes are small and focused:
1. **Addition of IDA infrastructure** (lines +21-22): ```c #include <linux/idr.h> static DEFINE_IDA(usb_conn_ida); ```
2. **Unique ID allocation** (lines +168-177): ```c info->conn_id = ida_alloc(&usb_conn_ida, GFP_KERNEL); desc->name = devm_kasprintf(dev, GFP_KERNEL, "usb-charger-%d", info->conn_id); ```
3. **Proper cleanup** (lines +297-299): ```c if (info->charger) ida_free(&usb_conn_ida, info->conn_id); ```
## Risk Assessment
**Very Low Risk**: - Uses well-established IDA pattern found throughout the kernel (similar to the USB gadget example in the historical commits) - No architectural changes - No new dependencies beyond existing IDA infrastructure - Proper error handling with cleanup on all failure paths - Changes only affect internal naming, no API breakage
## Stable Tree Criteria Compliance
**Meets All Stable Criteria**:
1. **Important bugfix**: ✅ Prevents system malfunction with multiple USB connectors 2. **Affects real users**: ✅ Common on embedded systems, development boards, tablets 3. **Small and contained**: ✅ Only 25 lines of changes in single driver 4. **No major architectural changes**: ✅ Simple naming fix using established patterns 5. **Minimal regression risk**: ✅ Well-tested IDA pattern used across kernel
## Comparison with Historical Commits
This commit is very similar to historical commit #3 ("USB: gadget: Add ID numbers to gadget names"), which was marked as **NO** for backporting. However, there are key differences:
**Why this USB connector commit SHOULD be backported (unlike the gadget commit)**:
1. **Functional vs. Cosmetic**: The USB connector naming conflict causes **actual device failure** and power management issues, whereas the gadget naming was more about sysfs organization 2. **Critical subsystem**: Power supply registration failure can affect system power management and charging detection 3. **Error severity**: Power supply naming conflicts typically cause probe failures, while sysfs naming conflicts may not prevent basic functionality 4. **User impact**: USB connector detection is critical for proper power management on mobile/embedded devices
## Conclusion
This is an excellent stable tree candidate that fixes a real functional bug with minimal risk. The change enables proper operation of multi- connector systems using established kernel patterns, making it both safe and beneficial for stable tree inclusion.
drivers/usb/common/usb-conn-gpio.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c index 02446092520c8..f5a1981c9eb40 100644 --- a/drivers/usb/common/usb-conn-gpio.c +++ b/drivers/usb/common/usb-conn-gpio.c @@ -20,6 +20,9 @@ #include <linux/power_supply.h> #include <linux/regulator/consumer.h> #include <linux/usb/role.h> +#include <linux/idr.h> + +static DEFINE_IDA(usb_conn_ida);
#define USB_GPIO_DEB_MS 20 /* ms */ #define USB_GPIO_DEB_US ((USB_GPIO_DEB_MS) * 1000) /* us */ @@ -29,6 +32,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; @@ -160,7 +164,17 @@ static int usb_conn_psy_register(struct usb_conn_info *info) .of_node = dev->of_node, };
- 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; @@ -168,8 +182,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); } @@ -296,6 +312,9 @@ static int 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);