Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chanh Nguyen <chanh@os.amperecomputing.com>
To:     OpenBMC Maillist <openbmc@lists.ozlabs.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Frank Li <frank.li@nxp.com>,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        Dan Vacura <w36195@motorola.com>,
        Jakob Koschel <jakobkoschel@gmail.com>,
        Alan Stern <stern@rowland.harvard.edu>,
        Vijayavardhan Vennapusa <vvreddy@codeaurora.org>,
        Rondreis <linhaoguo86@gmail.com>,
        Andrzej Pietrasiewicz <andrzej.p@collabora.com>,
        Heikki Krogerus <heikki.krogerus@linux.intel.com>,
        linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
        Open Source Submission <patches@amperecomputing.com>
Cc:     Chanh Nguyen <chanh@os.amperecomputing.com>
Subject: [PATCH v3] USB: gadget: Add ID numbers to configfs-gadget driver names
Date:   Wed, 11 Jan 2023 13:51:05 +0700
Message-Id: <20230111065105.29205-1-chanh@os.amperecomputing.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pn7YFhgmSTnZFTpJKLLQBeDE9kM02qvfb0qvtAMrTac9OD/Ku7ee7hz++MAx?=
 =?us-ascii?Q?PZkMHjDEjVsKGeSRLAhVGg9b1Z54UHfhRJXbsug57e1x6IBs7E2igK+TcNU2?=
 =?us-ascii?Q?V/Ln3wCt13bNQnEAQDMDrrxRmEKiJOqvvblZ06Q3KITcruHr66sYOfIEyDon?=
 =?us-ascii?Q?SUwNGjyRY68LdRB5pKzNprZmLr1ZVBZV4bB4EDJKWndxUeJiXFPHuhZRG14l?=
 =?us-ascii?Q?aDr5aZvI7cqRmho5ib5n/LiHFjVL1X5LcLqu2B1fCbXTwlMwHSLTd9OOBCwU?=
 =?us-ascii?Q?EY/+Pxm4ZdcEWE8bC42Eqv5m7N9Czxh9l16e0xZQu84KoFlt82shV+JRDScT?=
 =?us-ascii?Q?Z237RhtRg9qAMR0597aaD7BNV2sAXA1GWJEctqu6bZzi8sQ9obX0wMliw6sM?=
 =?us-ascii?Q?aiLhp7zmU0lNGnF1g1u4/iCWhYA+kqaH3KjZOj0VsVpdMVkroQh09Nziyr3s?=
 =?us-ascii?Q?xm3Bgs56zUfqyA7pgqu7YxI1fuXJUDc7YkRAgGb9sxpvxcJc8m3mW9OKrHUC?=
 =?us-ascii?Q?b3vPxqfnBNYqD65vgSG5cGAderLd8OU3t35Vtm78A9nqIuR1ZV5VHoG/82VE?=
 =?us-ascii?Q?y1vCjaKfVh65HNJHDJlgSJB7YBZM0COKl/17xl7zlqIff1J+XAKKWiEjLZVt?=
 =?us-ascii?Q?7FPr4SczrsKbJBalUpGl1oin4EriTfqFFAmG0chflOqp+kc3eaALPe3hgM+A?=
 =?us-ascii?Q?RnLu8eVzvGtfWw1mLizSmI1dgcL9KxevupqZbX/zHbvrEIabSlKoH7GYQLeP?=
 =?us-ascii?Q?iuc5EedIpNMClc0Mmci/cy1Vlfu5s01hBvF0wXmasZXzxTjnCw0NFwGPZyUA?=
 =?us-ascii?Q?pMGaXkKXl6vlgFgdjBDBGlV+eQxQyEYNY+1n9w9fZhYSJ8jfiWbIO9dnIa5g?=
 =?us-ascii?Q?LCTPnLw0O6Ku+Avmrc0lHi1yphv+kCXg1PBRhJrcnUrSAA57z1l7NSlirMVN?=
 =?us-ascii?Q?qBJT1hr31/EdGuTmbr/XlWXv2Js9z08jcq2UXQvLJ8javE5NdWGTVZnw64Tz?=
 =?us-ascii?Q?VhP95CMTQj8Lw7a6Q62ew9DI8NmjFC2NcS2xgUW5hhcHFu9zARsV0IYRfxXC?=
 =?us-ascii?Q?SF7jOggWKu+zRehSV6153dPxOQBrB5aXlB9PIp/M1WO3/g1gdWsQt1qv220v?=
 =?us-ascii?Q?eJSNEJViT7q+JqjTqlRlo7ndXPs6VsniWAPheTodGXYYaOrw9+8nZ4mlargr?=
 =?us-ascii?Q?5WLOwsLtjvF7XaI6W1vdstMrzml7a/S4odBoIVSDIZEFPlRzsuNWLwugJCMJ?=
 =?us-ascii?Q?diyRGExz0tLEbgfBfKmcNOC8Twwczekf5cqFxSDLu09Aac2ATJ8efKodVa7d?=
 =?us-ascii?Q?UYXbqqDnWDIPwg8MFtqucIqkUAcdb/Q4dGHn3/iOpdCzf+W418ZARr6Rbkgw?=
 =?us-ascii?Q?J0XKGmIHUCUV+nnev6V0BGynL4O632RptsZwdi2obNobhmAepF78kaYnbp9G?=
 =?us-ascii?Q?Z7CoBGXaphJzL4aaRGGb9z/fKDfc8bA8qQOd2NjSq5RjlYCEENZoP6/RAaze?=
 =?us-ascii?Q?m8iaon3wK4aMJ8DAE8EAlajakQFa0VOW/tzGv4BfrdT+hAEYyXBk+NeDdBF7?=
 =?us-ascii?Q?gn33uG02c/fSfBs3iN3eKJekC7HzK3A06Zghhx3qOwpYB1fMuGr0UfOr+Z/j?=
 =?us-ascii?Q?CCBqIPZorM9bxrOqQZVRzFw=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bc3a3f07-0a24-459a-6e5b-08daf3a049e7
X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4973.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2023 06:51:39.0473
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oNNzUb/fwxluSkgL+Ogz3OoGRunETpJpvMari/gySpwe+bDn1vgPlJB8DeqTN8OrlSalm89yWhc70HMmB0HNf4MLpVq89VXvVmRBGOVmY2BhewYRHvRTXasISA5vfb/h
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR01MB6227
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It is unable to use configfs to attach more than one gadget. When
attaching the second gadget, it always fails and the kernel message
prints out:

Error: Driver 'configfs-gadget' is already registered, aborting...
UDC core: g1: driver registration failed: -16

This commit fixes the problem by using the gadget name as a suffix
to each configfs_gadget's driver name, thus making the names
distinct.

Fixes: fc274c1e9973 ("USB: gadget: Add a new bus for gadgets")
Signed-off-by: Chanh Nguyen <chanh@os.amperecomputing.com>

---
Changes in v3:
  - Use the gadget name as a unique suffix instead     [Andrzej]
  - Remove the driver.name allocation by template        [Chanh]
  - Update commit message                                [Chanh]

Changes in v2:
  - Replace scnprintf() by kasprintf() to simplify the code [CJ]
  - Move the clean up code from gadgets_drop() to
    gadget_info_attr_release()                        [Frank Li]
  - Correct the resource free up in gadges_make()   [Alan Stern]
  - Remove the unnecessary variable in gadgets_make()    [Chanh]
  - Fixes minor grammar issue in commit message          [Chanh]
---
 drivers/usb/gadget/configfs.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 96121d1c8df4..0853536cbf2e 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -393,6 +393,7 @@ static void gadget_info_attr_release(struct config_item *item)
 	WARN_ON(!list_empty(&gi->string_list));
 	WARN_ON(!list_empty(&gi->available_func));
 	kfree(gi->composite.gadget_driver.function);
+	kfree(gi->composite.gadget_driver.driver.name);
 	kfree(gi);
 }
 
@@ -1572,7 +1573,6 @@ static const struct usb_gadget_driver configfs_driver_template = {
 	.max_speed	= USB_SPEED_SUPER_PLUS,
 	.driver = {
 		.owner          = THIS_MODULE,
-		.name		= "configfs-gadget",
 	},
 	.match_existing_only = 1,
 };
@@ -1623,13 +1623,21 @@ static struct config_group *gadgets_make(
 
 	gi->composite.gadget_driver = configfs_driver_template;
 
+	gi->composite.gadget_driver.driver.name = kasprintf(GFP_KERNEL,
+							    "configfs-gadget.%s", name);
+	if (!gi->composite.gadget_driver.driver.name)
+		goto err;
+
 	gi->composite.gadget_driver.function = kstrdup(name, GFP_KERNEL);
 	gi->composite.name = gi->composite.gadget_driver.function;
 
 	if (!gi->composite.gadget_driver.function)
-		goto err;
+		goto out_free_driver_name;
 
 	return &gi->group;
+
+out_free_driver_name:
+	kfree(gi->composite.gadget_driver.driver.name);
 err:
 	kfree(gi);
 	return ERR_PTR(-ENOMEM);
-- 
2.17.1