From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793211691; b=2dOn/MWo5y3fDCXtxCXB6sfIn434zib5Q5f4JClLs1PABkFYn8ZFTJI81DStb4uqMXio fzf63pbMAt8MtGemcEwU7k+pd3g274prmG//F4Jg8yp/pTbgOGWqHcROTjquzfC+iA0Ap S5rnlWPB/Mozg54WmJ4GLsBaQrp1Q7f0Mxt5RRuotRzYc7EGIa+9DvJJuaexdTtb+rpie 5zXURurD+86Y0bp6BuZlru4T3MJ0H3BYhrKkoxC/MsIBqhFGB4gT2aFmgzamSI9jy8hjD 0lJY60aDe/CTutzYz2bImVG8qPwgABfy6Swk7avkFx63t5JHyu1a+OhvJeM/Wgqx1Dw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793211691; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=dPmScQ8vHnlYDusAGNFik1nv8KnpqGRiMRijbnOqnog=; b=PnzvVp9IQKqnsqNzcSKcc0RUx1Skp2crTJeq/2NFwbHskouOkyXKN0duTXXxtSExBvHE T0EBJMn4hZYqcVxUiTBjQQvVsfM1ppQmWMkf+iR05syrQYKnDC10RarwPmFcMwly6NoyY +ody44F/aSzo2avWBCGx1Fvw7CFuiaKdWp83wBfnVdL4Jgz5qRulWhnDSKhz8z8+Osb0q 2ZedMe3eawNS7Kd848TfYthk2m6/9oCHjiofnk9o+k+7JIx0pIfmC4miyXb7ahZ0HzrHQ mmUE9nq9wKYGMkwJ33u3pajHrFqOJEOsdUXyRzR/bVQmtSV4k1YaIm8NvyP5vsNt+XA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=xo5S4X2H; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5892F606A31A; Wed, 28 Oct 2026 18:21:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=xo5S4X2H Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8EC21F01825; Wed, 28 Oct 2026 18:21:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793211689; bh=dPmScQ8vHnlYDusAGNFik1nv8KnpqGRiMRijbnOqnog=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xo5S4X2H07IEliJwdbjuUq0kuElnvnOoK2tr3ENBo+fjhhvH0fl4qpQEGdo2/JwHo Wbmp8QXL9dYkCQ/dL1IABowCuXvRLrbvIPKhBIX8/cz3KmzDzZhwiG1cbv7ncEC2NZ 8mdcnuw9yx44jqRIc/VhRLtnBuqYA9UkFjRntyDE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vicki Pfau , Jiri Kosina , Lee Jones , Sasha Levin Subject: [PATCH 5.15 420/571] HID: steam: Fully unregister controller when hidraw is opened Date: Wed, 28 Oct 2026 17:59:27 +0100 Message-ID: <20261028170017.979587151@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170008.009143722@linuxfoundation.org> References: <20261028170008.009143722@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vicki Pfau [ Upstream commit cd33a91d37eb4d7c6ce56aa7f4688066309808eb ] To avoid conflicts between anything touching the hidraw and the driver we had previously detached the evdev nodes when the hidraw is opened. However, this isn't sufficient to avoid FEATURE reports from conflicting, so we change to fully unregistering the controller internally, leaving only the hidraw active until it's closed. This also unifies the unregister and connect callbacks, as now the logic between these two callbacks is identical. Signed-off-by: Vicki Pfau Signed-off-by: Jiri Kosina [Lee: Convert steam_client_ll_open() and steam_client_ll_close() to schedule work_connect directly and omit sensors, rumble_work, mode_switch and unregister_work changes as e133dc99fc07, e1147961b214 and 1d4549fd1115 are not present] Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/hid/hid-steam.c | 78 ++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c index 159b55dff799f..a856276b6c2cf 100644 --- a/drivers/hid/hid-steam.c +++ b/drivers/hid/hid-steam.c @@ -380,6 +380,7 @@ static int steam_battery_register(struct steam_device *steam) &steam->battery_desc, &battery_cfg); if (IS_ERR(battery)) { ret = PTR_ERR(battery); + devm_kfree(&steam->hdev->dev, steam->battery_desc.name); hid_err(steam->hdev, "%s:power_supply_register failed with error %d\n", __func__, ret); @@ -504,12 +505,15 @@ static void steam_battery_unregister(struct steam_device *steam) RCU_INIT_POINTER(steam->battery, NULL); synchronize_rcu(); power_supply_unregister(battery); + devm_kfree(&steam->hdev->dev, steam->battery_desc.name); } static int steam_register(struct steam_device *steam) { int ret; unsigned long client_opened; + unsigned long flags; + bool do_add; /* * This function can be called several times in a row with the @@ -535,38 +539,47 @@ static int steam_register(struct steam_device *steam) if (steam->quirks & STEAM_QUIRK_WIRELESS) steam_battery_register(steam); - mutex_lock(&steam_devices_lock); - if (list_empty(&steam->list)) - list_add(&steam->list, &steam_devices); - mutex_unlock(&steam_devices_lock); + do_add = true; } - mutex_lock(&steam->mutex); + spin_lock_irqsave(&steam->lock, flags); client_opened = steam->client_opened; - if (!client_opened) - steam_set_lizard_mode(steam, lizard_mode); - mutex_unlock(&steam->mutex); + spin_unlock_irqrestore(&steam->lock, flags); - if (!client_opened) + if (!client_opened) { + mutex_lock(&steam->mutex); + steam_set_lizard_mode(steam, lizard_mode); + mutex_unlock(&steam->mutex); ret = steam_input_register(steam); - else - ret = 0; + if (ret != 0) + goto steam_register_input_fail; + } + + if (do_add) { + mutex_lock(&steam_devices_lock); + if (list_empty(&steam->list)) + list_add(&steam->list, &steam_devices); + mutex_unlock(&steam_devices_lock); + } + return 0; +steam_register_input_fail: return ret; } static void steam_unregister(struct steam_device *steam) { + if (!steam->serial_no[0]) + return; + + hid_info(steam->hdev, "Steam Controller '%s' disconnected", + steam->serial_no); steam_battery_unregister(steam); steam_input_unregister(steam); - if (steam->serial_no[0]) { - hid_info(steam->hdev, "Steam Controller '%s' disconnected", - steam->serial_no); - mutex_lock(&steam_devices_lock); - list_del_init(&steam->list); - mutex_unlock(&steam_devices_lock); - steam->serial_no[0] = 0; - } + mutex_lock(&steam_devices_lock); + list_del_init(&steam->list); + mutex_unlock(&steam_devices_lock); + steam->serial_no[0] = 0; } static void steam_work_connect_cb(struct work_struct *work) @@ -575,19 +588,20 @@ static void steam_work_connect_cb(struct work_struct *work) work_connect); unsigned long flags; bool connected; + bool opened; int ret; spin_lock_irqsave(&steam->lock, flags); + opened = steam->client_opened; connected = steam->connected; spin_unlock_irqrestore(&steam->lock, flags); - if (connected) { + if (connected && !opened) { ret = steam_register(steam); - if (ret) { + if (ret) hid_err(steam->hdev, "%s:steam_register failed with error %d\n", __func__, ret); - } } else { steam_unregister(steam); } @@ -632,12 +646,13 @@ static void steam_client_ll_stop(struct hid_device *hdev) static int steam_client_ll_open(struct hid_device *hdev) { struct steam_device *steam = hdev->driver_data; + unsigned long flags; - mutex_lock(&steam->mutex); + spin_lock_irqsave(&steam->lock, flags); steam->client_opened++; - mutex_unlock(&steam->mutex); + spin_unlock_irqrestore(&steam->lock, flags); - steam_input_unregister(steam); + schedule_work(&steam->work_connect); return 0; } @@ -645,22 +660,13 @@ static int steam_client_ll_open(struct hid_device *hdev) static void steam_client_ll_close(struct hid_device *hdev) { struct steam_device *steam = hdev->driver_data; - unsigned long flags; - bool connected; spin_lock_irqsave(&steam->lock, flags); - connected = steam->connected; - spin_unlock_irqrestore(&steam->lock, flags); - - mutex_lock(&steam->mutex); steam->client_opened--; - if (connected && !steam->client_opened) - steam_set_lizard_mode(steam, lizard_mode); - mutex_unlock(&steam->mutex); + spin_unlock_irqrestore(&steam->lock, flags); - if (connected && !steam->client_opened) - steam_input_register(steam); + schedule_work(&steam->work_connect); } static int steam_client_ll_raw_request(struct hid_device *hdev, -- 2.53.0