linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel J. Ogorchock" <djogorchock@gmail.com>
To: linux-input@vger.kernel.org
Cc: thunderbird2k@gmail.com, blaws05@gmail.com,
	benjamin.tissoires@redhat.com, jikos@kernel.org,
	Roderick.Colenbrander@sony.com, svv@google.com,
	s.jegen@gmail.com, carmueller@gmail.com,
	pgriffais@valvesoftware.com, hadess@hadess.net,
	"Daniel J. Ogorchock" <djogorchock@gmail.com>
Subject: [PATCH v14 15/17] HID: nintendo: ratelimit subcommands and rumble
Date: Sat, 24 Jul 2021 23:27:06 -0400	[thread overview]
Message-ID: <20210725032707.440071-16-djogorchock@gmail.com> (raw)
In-Reply-To: <20210725032707.440071-1-djogorchock@gmail.com>

It has been found that sending subcommands and rumble data packets at
too great a rate can result in controller disconnects. This patch limits
the rate of subcommands/rumble to once every 25 milliseconds.

Signed-off-by: Daniel J. Ogorchock <djogorchock@gmail.com>
---
 drivers/hid/hid-nintendo.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index 9376f20baab00..71aa676ba3907 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -431,6 +431,7 @@ struct joycon_ctlr {
 	u8 usb_ack_match;
 	u8 subcmd_ack_match;
 	bool received_input_report;
+	unsigned int last_subcmd_sent_msecs;
 
 	/* factory calibration data */
 	struct joycon_stick_cal left_stick_cal_x;
@@ -582,6 +583,21 @@ static int joycon_send_usb(struct joycon_ctlr *ctlr, u8 cmd, u32 timeout)
 	return ret;
 }
 
+/*
+ * Sending subcommands and/or rumble data at too high a rate can cause bluetooth
+ * controller disconnections.
+ */
+static void joycon_enforce_subcmd_rate(struct joycon_ctlr *ctlr)
+{
+	static const unsigned int max_subcmd_rate_ms = 25;
+	unsigned int current_ms = jiffies_to_msecs(jiffies);
+	unsigned int delta_ms = current_ms - ctlr->last_subcmd_sent_msecs;
+
+	if (delta_ms < max_subcmd_rate_ms)
+		msleep(max_subcmd_rate_ms - delta_ms);
+	ctlr->last_subcmd_sent_msecs = current_ms;
+}
+
 static int joycon_send_subcmd(struct joycon_ctlr *ctlr,
 			      struct joycon_subcmd_request *subcmd,
 			      size_t data_len, u32 timeout)
@@ -589,6 +605,8 @@ static int joycon_send_subcmd(struct joycon_ctlr *ctlr,
 	int ret;
 	unsigned long flags;
 
+	joycon_enforce_subcmd_rate(ctlr);
+
 	spin_lock_irqsave(&ctlr->lock, flags);
 	/*
 	 * If the controller has been removed, just return ENODEV so the LED
@@ -1340,6 +1358,8 @@ static int joycon_send_rumble_data(struct joycon_ctlr *ctlr)
 	unsigned long flags;
 	struct joycon_rumble_output rumble_output = { 0 };
 
+	joycon_enforce_subcmd_rate(ctlr);
+
 	spin_lock_irqsave(&ctlr->lock, flags);
 	/*
 	 * If the controller has been removed, just return ENODEV so the LED
-- 
2.32.0


  parent reply	other threads:[~2021-07-25  3:28 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-25  3:26 [PATCH v14 00/17] HID: nintendo Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 01/17] HID: nintendo: add nintendo switch controller driver Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 02/17] HID: nintendo: add player led support Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 03/17] HID: nintendo: add power supply support Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 04/17] HID: nintendo: add home led support Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 05/17] HID: nintendo: add rumble support Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 06/17] HID: nintendo: improve subcommand reliability Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 07/17] HID: nintendo: send subcommands after receiving input report Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 08/17] HID: nintendo: reduce device removal subcommand errors Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 09/17] HID: nintendo: patch hw version for userspace HID mappings Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 10/17] HID: nintendo: set controller uniq to MAC Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 11/17] HID: nintendo: add support for charging grip Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 12/17] HID: nintendo: add support for reading user calibration Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 13/17] HID: nintendo: add IMU support Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 14/17] HID: nintendo: improve rumble performance and stability Daniel J. Ogorchock
2021-07-25  3:27 ` Daniel J. Ogorchock [this message]
2021-07-25  3:27 ` [PATCH v14 16/17] HID: nintendo: send rumble cmds post input reports Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 17/17] HID: nintendo: prevent needless queueing of the rumble worker Daniel J. Ogorchock
2021-09-09 12:53 ` [PATCH v14 00/17] HID: nintendo Lee Jones
2021-09-09 22:50   ` Siarhei Vishniakou
2021-09-11 17:43   ` Daniel Ogorchock

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=20210725032707.440071-16-djogorchock@gmail.com \
    --to=djogorchock@gmail.com \
    --cc=Roderick.Colenbrander@sony.com \
    --cc=benjamin.tissoires@redhat.com \
    --cc=blaws05@gmail.com \
    --cc=carmueller@gmail.com \
    --cc=hadess@hadess.net \
    --cc=jikos@kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=pgriffais@valvesoftware.com \
    --cc=s.jegen@gmail.com \
    --cc=svv@google.com \
    --cc=thunderbird2k@gmail.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).