From: Max Staudt <max@enpas.org>
To: Roderick Colenbrander <roderick.colenbrander@sony.com>,
Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, max@enpas.org
Subject: [PATCH v4] hid-playstation: DS4: Update rumble and lightbar together
Date: Tue, 20 Aug 2024 16:25:29 +0200 [thread overview]
Message-ID: <20240820142529.9380-1-max@enpas.org> (raw)
Some 3rd party gamepads expect updates to rumble and lightbar together,
and setting one may cancel the other.
Let's maximise compatibility for these controllers by sending rumble
and lightbar updates together, even when only one has been scheduled.
The quirky controllers are matched by a known CRC32 over their HID
report descriptor (hdev->rdesc), since they seem to share the same
descriptor, while pretending to be a Sony DS4 v2.0.
Signed-off-by: Max Staudt <max@enpas.org>
---
Changes in v3 -> v4:
- Reduced quirk matching to exact values of hdev->rsize.
- Adjusted comments to describe quirk detection.
The patch no longer applies to all controllers.
Changes in v2 -> v3:
- Introduced a quirk bit, so this hack only applies to controllers
known to be quirky.
Changes in v1 -> v2:
- Simplified the code, comment, and commit message.
---
drivers/hid/hid-playstation.c | 43 +++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
index e7c309cfe3a0..0b48ca7bfe22 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -356,6 +356,9 @@ struct dualsense_output_report {
#define DS4_TOUCHPAD_WIDTH 1920
#define DS4_TOUCHPAD_HEIGHT 942
+/* Quirks for third-party controllers */
+#define DS4_QUIRK_OUTPUT_LIGHTBAR_RUMBLE_TOGETHER BIT(0)
+
enum dualshock4_dongle_state {
DONGLE_DISCONNECTED,
DONGLE_CALIBRATING,
@@ -405,6 +408,8 @@ struct dualshock4 {
struct work_struct output_worker;
bool output_worker_initialized;
void *output_report_dmabuf;
+
+ unsigned long quirks;
};
struct dualshock4_touch_point {
@@ -2143,6 +2148,20 @@ static void dualshock4_output_worker(struct work_struct *work)
spin_lock_irqsave(&ds4->base.lock, flags);
+ /*
+ * Some 3rd party gamepads expect updates to rumble and lightbar
+ * together, and sending only one at a time may cancel the other.
+ *
+ * If this is such a quirky controller, force sending both
+ * updates, even if only one has been scheduled.
+ */
+ if (DS4_QUIRK_OUTPUT_LIGHTBAR_RUMBLE_TOGETHER) {
+ if (ds4->update_rumble || ds4->update_lightbar) {
+ ds4->update_rumble = true; /* 0x01 */
+ ds4->update_lightbar = true; /* 0x02 */
+ }
+ }
+
if (ds4->update_rumble) {
/* Select classic rumble style haptics and enable it. */
common->valid_flag0 |= DS4_OUTPUT_VALID_FLAG0_MOTOR;
@@ -2558,6 +2577,30 @@ static struct ps_device *dualshock4_create(struct hid_device *hdev)
*/
hdev->version |= HID_PLAYSTATION_VERSION_PATCH;
+ /*
+ * Some 3rd party gamepads expect updates to rumble and lightbar
+ * together, and sending only one at a time may cancel the other.
+ *
+ * Set a quirk bit if this is a controller known to behave this way.
+ */
+ if (hdev->vendor == USB_VENDOR_ID_SONY &&
+ hdev->product == USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) {
+ /* Match quirky controllers by their HID report descriptor. */
+ if (hdev->bus == BUS_USB && hdev->rsize >= 507 &&
+ crc32_le(0xffffffff, hdev->rdesc, 507) == 0xabc63a20)
+ ds4->quirks |= DS4_QUIRK_OUTPUT_LIGHTBAR_RUMBLE_TOGETHER;
+
+ /*
+ * The descriptor via Bluetooth differs from the USB one.
+ * Allow for 1 byte extra, because there may be a trailing
+ * 0x00 byte.
+ */
+ if (hdev->bus == BUS_BLUETOOTH &&
+ (hdev->rsize == 430 || hdev->rsize == 431) &&
+ crc32_le(0xffffffff, hdev->rdesc, 430) == 0x4194b762)
+ ds4->quirks |= DS4_QUIRK_OUTPUT_LIGHTBAR_RUMBLE_TOGETHER;
+ }
+
ps_dev = &ds4->base;
ps_dev->hdev = hdev;
spin_lock_init(&ps_dev->lock);
--
2.39.2
next reply other threads:[~2024-08-20 14:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-20 14:25 Max Staudt [this message]
2024-08-21 14:33 ` [PATCH v4] hid-playstation: DS4: Update rumble and lightbar together Jiri Kosina
2024-08-21 15:03 ` Roderick Colenbrander
2024-08-21 15:22 ` Max Staudt
2024-08-21 22:25 ` Jiri Kosina
2024-08-22 11:38 ` Max Staudt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240820142529.9380-1-max@enpas.org \
--to=max@enpas.org \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=roderick.colenbrander@sony.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).