From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f73.google.com (mail-io1-f73.google.com [209.85.166.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFD6B27F732 for ; Mon, 18 Aug 2025 23:10:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755558646; cv=none; b=cb0IjjFyO2ldO/SBlOak0BE10laRWzh2QBOqQHqx2VNAzBZ9vlwHutTtvv/3GSVlNjrQRwUxHOCV5zxTjO2Mrpx++qvj26uNOX7DCHTW+AWxI93aZQ1S9h/Z088uc7jrQzMByG82++K+lBgNDsIcspLdSDJlC7C5bepWnRZZx4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755558646; c=relaxed/simple; bh=QzCEIxx18I6Dj0G3rDwWXnTsi3l8IYWfitCaWWFrWcM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rEe9OrM3ZgV0vMRCWBHLk+nBrwyNZF8oFR8nGYsaFS1ERxqoVoT+wgcayy7itigXkBiSoVRTcz8lH8k/gMEs6fqtxzCFmUEkev8C/Y/Sd6y+ttP7ZpKr7z2/iICYSX29ksH8RV74DBLo+9vwXAyocjZOaq4+YfHS2LYAzujt9Ts= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jdenose.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=2KuOCjSD; arc=none smtp.client-ip=209.85.166.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jdenose.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="2KuOCjSD" Received: by mail-io1-f73.google.com with SMTP id ca18e2360f4ac-88432da0cfdso1302517439f.1 for ; Mon, 18 Aug 2025 16:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755558644; x=1756163444; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ITZzkiLaqD060Ratl1OWwnlE4RAvXOmdgj6yIgMWt2w=; b=2KuOCjSDquAmEWfnHLRwwqnydeQ54PAgJIdzXWJHI1hbjUFLqa9gDkBlC+bUeE+Fvv +7jdHhOmz14ANN/j1NnrvgpZKeRzfBsVyUTiphDPSOJyH+hjJyInIMQ5uutxprG8PvCI eq1KYz8S6O+tMxaqMTOhZZCfDOPXnSoShcZ5hjM6lYPwU0qwOHdiV60h1aswYPfR/FVw yzhwXKW9K01Cq9uucaWOZ5uuU0XdeE86bPkV08OaBrj0xPBFBn3FwWJ+HrmhaFyUI116 pLE1XaX+r49ROifsy3GVMEM4sLbCVfCr11ZRyh+hyXjkPWcDgjdwokBB1Gwm1hbqMjXx V5mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755558644; x=1756163444; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ITZzkiLaqD060Ratl1OWwnlE4RAvXOmdgj6yIgMWt2w=; b=OhvsNiDjlfHpkZUpvbc1bJ3bWvjFtvHF7n4LXvbGhGfj+ZGyQQ2gc9Qt+2YN3FLSd/ f1taSD6fo5nM8Vww3NPNPHlhQhvdFv896fK2sFs0pAI1bXGztUdhvb2XHVuK/ceLYoXr xWSN4JUucxaqyok38E+l+/RBhahAYQ3ylrZH+ZznZfOpwDQLP2yGVhymNwM6NWSpAbd2 W/klLzHNWTULwUVHDdyztAmB5veK5HtfLo1jSSaE4r8Syhqe8mN13IzOZKioUkmjHAM1 4E3wRYum3QrLqIpWVLd2ghLUbDoTU6mHzR40XzqYjbaf2KPJ5xkXwVexG1Uh3AzredIm PHVQ== X-Gm-Message-State: AOJu0YwZZDaZAfvMW/aLBWkvGkU8jLlhL2J3/+pZoXIeXjdoBcrOB0fX /2zH3nWInPzj0S5Hga6R8kdE/z8m2Htmk/ryHba9HjDwv1/Q65BRtfeNBYiEvYb39vsWY+jfUKT jquXX8+ADBA== X-Google-Smtp-Source: AGHT+IHIXN747lwgxpSgQ+h7oFBZFXW1MQGKxYRpOFDSVedpgyT/xvpq+lb9cz7ebi+XMoNgB+oEOljtC5hb X-Received: from iotq15.prod.google.com ([2002:a5d:9f0f:0:b0:881:a131:25d7]) (user=jdenose job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6602:1683:b0:880:f288:e8e5 with SMTP id ca18e2360f4ac-88467ebfc66mr85554639f.5.1755558644101; Mon, 18 Aug 2025 16:10:44 -0700 (PDT) Date: Mon, 18 Aug 2025 23:08:51 +0000 In-Reply-To: <20250818-support-forcepads-v3-0-e4f9ab0add84@google.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250818-support-forcepads-v3-0-e4f9ab0add84@google.com> X-Mailer: b4 0.14.2 Message-ID: <20250818-support-forcepads-v3-10-e4f9ab0add84@google.com> Subject: [PATCH v3 10/11] HID: haptic: add hid_haptic_switch_mode From: Jonathan Denose To: Jiri Kosina , Benjamin Tissoires , Dmitry Torokhov , Jonathan Corbet , Henrik Rydberg Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Angela Czubak , "Sean O'Brien" , Jonathan Denose Content-Type: text/plain; charset="utf-8" From: Angela Czubak Function hid_haptic_switch_mode() can be used to switch between device-controlled mode and host-controlled mode. Uploading a WAVEFORMPRESS or WAVEFORMRELEASE effect triggers host-controlled mode if the device is in device-controlled mode. Signed-off-by: Angela Czubak Co-developed-by: Jonathan Denose Signed-off-by: Jonathan Denose --- drivers/hid/hid-haptic.c | 66 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 7 deletions(-) diff --git a/drivers/hid/hid-haptic.c b/drivers/hid/hid-haptic.c index c02af820051c22d1c899db84496c5a44b868fe49..aa090684c1f23b61a1ac4e9e7e523b31a8166a21 100644 --- a/drivers/hid/hid-haptic.c +++ b/drivers/hid/hid-haptic.c @@ -5,6 +5,7 @@ * Copyright (c) 2021 Angela Czubak */ +#include #include #include "hid-haptic.h" @@ -197,12 +198,46 @@ static void fill_effect_buf(struct hid_haptic_device *haptic, mutex_unlock(&haptic->manual_trigger_mutex); } +static void switch_mode(struct hid_device *hdev, struct hid_haptic_device *haptic, + int mode) +{ + struct hid_report *rep = haptic->auto_trigger_report; + struct hid_field *field; + s32 value; + int i, j; + + if (mode == HID_HAPTIC_MODE_HOST) + value = HID_HAPTIC_ORDINAL_WAVEFORMSTOP; + else + value = haptic->default_auto_trigger; + + mutex_lock(&haptic->auto_trigger_mutex); + for (i = 0; i < rep->maxfield; i++) { + field = rep->field[i]; + /* Ignore if report count is out of bounds. */ + if (field->report_count < 1) + continue; + + for (j = 0; j < field->maxusage; j++) { + if (field->usage[j].hid == HID_HP_AUTOTRIGGER) + field->value[j] = value; + } + } + + /* send the report */ + hid_hw_request(hdev, rep, HID_REQ_SET_REPORT); + mutex_unlock(&haptic->auto_trigger_mutex); + haptic->mode = mode; +} + static int hid_haptic_upload_effect(struct input_dev *dev, struct ff_effect *effect, struct ff_effect *old) { + struct hid_device *hdev = input_get_drvdata(dev); struct ff_device *ff = dev->ff; struct hid_haptic_device *haptic = ff->private; int i, ordinal = 0; + bool switch_modes = false; /* If vendor range, check vendor id and page */ if (effect->u.haptic.hid_usage >= (HID_HP_VENDORWAVEFORMMIN & HID_USAGE) && @@ -225,6 +260,16 @@ static int hid_haptic_upload_effect(struct input_dev *dev, struct ff_effect *eff fill_effect_buf(haptic, &effect->u.haptic, &haptic->effect[effect->id], ordinal); + if (effect->u.haptic.hid_usage == (HID_HP_WAVEFORMPRESS & HID_USAGE) || + effect->u.haptic.hid_usage == (HID_HP_WAVEFORMRELEASE & HID_USAGE)) + switch_modes = true; + + /* If device is in autonomous mode, and the uploaded effect signals userspace + * wants control of the device, change modes + */ + if (switch_modes && haptic->mode == HID_HAPTIC_MODE_DEVICE) + switch_mode(hdev, haptic, HID_HAPTIC_MODE_HOST); + return 0; } @@ -290,6 +335,7 @@ static void effect_set_default(struct ff_effect *effect) static int hid_haptic_erase(struct input_dev *dev, int effect_id) { struct hid_haptic_device *haptic = dev->ff->private; + struct hid_device *hdev = input_get_drvdata(dev); struct ff_effect effect; int ordinal; @@ -297,20 +343,25 @@ static int hid_haptic_erase(struct input_dev *dev, int effect_id) if (effect.u.haptic.hid_usage == (HID_HP_WAVEFORMRELEASE & HID_USAGE)) { ordinal = haptic->release_ordinal; - if (!ordinal) + if (!ordinal) { ordinal = HID_HAPTIC_ORDINAL_WAVEFORMNONE; - else - effect.u.haptic.hid_usage = HID_HP_WAVEFORMRELEASE & - HID_USAGE; + if (haptic->mode == HID_HAPTIC_MODE_HOST) + switch_mode(hdev, haptic, HID_HAPTIC_MODE_DEVICE); + } else + effect.u.haptic.hid_usage = HID_HP_WAVEFORMRELEASE & HID_USAGE; + fill_effect_buf(haptic, &effect.u.haptic, &haptic->effect[effect_id], ordinal); } else if (effect.u.haptic.hid_usage == (HID_HP_WAVEFORMPRESS & HID_USAGE)) { ordinal = haptic->press_ordinal; - if (!ordinal) + if (!ordinal) { ordinal = HID_HAPTIC_ORDINAL_WAVEFORMNONE; + if (haptic->mode == HID_HAPTIC_MODE_HOST) + switch_mode(hdev, haptic, HID_HAPTIC_MODE_DEVICE); + } else - effect.u.haptic.hid_usage = HID_HP_WAVEFORMPRESS & - HID_USAGE; + effect.u.haptic.hid_usage = HID_HP_WAVEFORMPRESS & HID_USAGE; + fill_effect_buf(haptic, &effect.u.haptic, &haptic->effect[effect_id], ordinal); } @@ -392,6 +443,7 @@ int hid_haptic_init(struct hid_device *hdev, haptic->hid_usage_map[HID_HAPTIC_ORDINAL_WAVEFORMSTOP] = HID_HP_WAVEFORMSTOP & HID_USAGE; + mutex_init(&haptic->auto_trigger_mutex); for (r = 0; r < haptic->auto_trigger_report->maxfield; r++) parse_auto_trigger_field(haptic, haptic->auto_trigger_report->field[r]); -- 2.51.0.rc1.193.gad69d77794-goog