UPSTREAM: HID: playstation: Add DualSense player LED support
The DualSense features 5 player LEDs below its touchpad, which are meant as player id indications. The LEDs are configured with a player ID determined by an ID allocator, which assign player ids to ps_device instances. This patch is the combination of the following original patches minus use of LED framework APIs: - HID: playstation: add DualSense player LEDs support. - HID: playstation: DualSense set LEDs to default player id. Bug: 167947264 CRs-fixed: 2971837 Change-Id: I2a9ef9949bb82df18247a14e64cb8c54e9b3924c Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com> Reviewed-by: Barnabás Pőcze <pobrn@protonmail.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Farid Chahla <farid.chahla@sony.com> Signed-off-by: Siarhei Vishniakou <svv@google.com> Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Git-commit: 949aaccda019723050a2cd98d7b4492b06423f27 Signed-off-by: Kishor Krishna Bhat <kishkris@codeaurora.org>
This commit is contained in:
committed by
Kishor Krishna Bhat
parent
9882769164
commit
ee2c96702f
@@ -8,6 +8,7 @@
|
|||||||
#include <linux/crc32.h>
|
#include <linux/crc32.h>
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/hid.h>
|
#include <linux/hid.h>
|
||||||
|
#include <linux/idr.h>
|
||||||
#include <linux/input/mt.h>
|
#include <linux/input/mt.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
|
|
||||||
@@ -19,6 +20,8 @@
|
|||||||
static DEFINE_MUTEX(ps_devices_lock);
|
static DEFINE_MUTEX(ps_devices_lock);
|
||||||
static LIST_HEAD(ps_devices_list);
|
static LIST_HEAD(ps_devices_list);
|
||||||
|
|
||||||
|
static DEFINE_IDA(ps_player_id_allocator);
|
||||||
|
|
||||||
#define HID_PLAYSTATION_VERSION_PATCH 0x8000
|
#define HID_PLAYSTATION_VERSION_PATCH 0x8000
|
||||||
|
|
||||||
/* Base class for playstation devices. */
|
/* Base class for playstation devices. */
|
||||||
@@ -27,6 +30,8 @@ struct ps_device {
|
|||||||
struct hid_device *hdev;
|
struct hid_device *hdev;
|
||||||
spinlock_t lock;
|
spinlock_t lock;
|
||||||
|
|
||||||
|
uint32_t player_id;
|
||||||
|
|
||||||
struct power_supply_desc battery_desc;
|
struct power_supply_desc battery_desc;
|
||||||
struct power_supply *battery;
|
struct power_supply *battery;
|
||||||
uint8_t battery_capacity;
|
uint8_t battery_capacity;
|
||||||
@@ -107,6 +112,7 @@ struct ps_calibration_data {
|
|||||||
#define DS_OUTPUT_VALID_FLAG1_POWER_SAVE_CONTROL_ENABLE BIT(1)
|
#define DS_OUTPUT_VALID_FLAG1_POWER_SAVE_CONTROL_ENABLE BIT(1)
|
||||||
#define DS_OUTPUT_VALID_FLAG1_LIGHTBAR_CONTROL_ENABLE BIT(2)
|
#define DS_OUTPUT_VALID_FLAG1_LIGHTBAR_CONTROL_ENABLE BIT(2)
|
||||||
#define DS_OUTPUT_VALID_FLAG1_RELEASE_LEDS BIT(3)
|
#define DS_OUTPUT_VALID_FLAG1_RELEASE_LEDS BIT(3)
|
||||||
|
#define DS_OUTPUT_VALID_FLAG1_PLAYER_INDICATOR_CONTROL_ENABLE BIT(4)
|
||||||
#define DS_OUTPUT_VALID_FLAG2_LIGHTBAR_SETUP_CONTROL_ENABLE BIT(1)
|
#define DS_OUTPUT_VALID_FLAG2_LIGHTBAR_SETUP_CONTROL_ENABLE BIT(1)
|
||||||
#define DS_OUTPUT_POWER_SAVE_CONTROL_MIC_MUTE BIT(4)
|
#define DS_OUTPUT_POWER_SAVE_CONTROL_MIC_MUTE BIT(4)
|
||||||
#define DS_OUTPUT_LIGHTBAR_SETUP_LIGHT_OUT BIT(1)
|
#define DS_OUTPUT_LIGHTBAR_SETUP_LIGHT_OUT BIT(1)
|
||||||
@@ -150,6 +156,11 @@ struct dualsense {
|
|||||||
bool mic_muted;
|
bool mic_muted;
|
||||||
bool last_btn_mic_state;
|
bool last_btn_mic_state;
|
||||||
|
|
||||||
|
/* Player leds */
|
||||||
|
bool update_player_leds;
|
||||||
|
uint8_t player_leds_state;
|
||||||
|
struct led_classdev player_leds[5];
|
||||||
|
|
||||||
struct work_struct output_worker;
|
struct work_struct output_worker;
|
||||||
void *output_report_dmabuf;
|
void *output_report_dmabuf;
|
||||||
uint8_t output_seq; /* Sequence number for output report. */
|
uint8_t output_seq; /* Sequence number for output report. */
|
||||||
@@ -305,6 +316,24 @@ static int ps_devices_list_remove(struct ps_device *dev)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int ps_device_set_player_id(struct ps_device *dev)
|
||||||
|
{
|
||||||
|
int ret = ida_alloc(&ps_player_id_allocator, GFP_KERNEL);
|
||||||
|
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
dev->player_id = ret;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ps_device_release_player_id(struct ps_device *dev)
|
||||||
|
{
|
||||||
|
ida_free(&ps_player_id_allocator, dev->player_id);
|
||||||
|
|
||||||
|
dev->player_id = U32_MAX;
|
||||||
|
}
|
||||||
|
|
||||||
static struct input_dev *ps_allocate_input_dev(struct hid_device *hdev, const char *name_suffix)
|
static struct input_dev *ps_allocate_input_dev(struct hid_device *hdev, const char *name_suffix)
|
||||||
{
|
{
|
||||||
struct input_dev *input_dev;
|
struct input_dev *input_dev;
|
||||||
@@ -826,6 +855,13 @@ static void dualsense_output_worker(struct work_struct *work)
|
|||||||
ds->update_lightbar = false;
|
ds->update_lightbar = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ds->update_player_leds) {
|
||||||
|
common->valid_flag1 |= DS_OUTPUT_VALID_FLAG1_PLAYER_INDICATOR_CONTROL_ENABLE;
|
||||||
|
common->player_leds = ds->player_leds_state;
|
||||||
|
|
||||||
|
ds->update_player_leds = false;
|
||||||
|
}
|
||||||
|
|
||||||
if (ds->update_mic_mute) {
|
if (ds->update_mic_mute) {
|
||||||
common->valid_flag1 |=
|
common->valid_flag1 |=
|
||||||
DS_OUTPUT_VALID_FLAG1_MIC_MUTE_LED_CONTROL_ENABLE;
|
DS_OUTPUT_VALID_FLAG1_MIC_MUTE_LED_CONTROL_ENABLE;
|
||||||
@@ -1095,6 +1131,29 @@ static void dualsense_set_lightbar(struct dualsense *ds, uint8_t red, uint8_t gr
|
|||||||
schedule_work(&ds->output_worker);
|
schedule_work(&ds->output_worker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void dualsense_set_player_leds(struct dualsense *ds)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* The DualSense controller has a row of 5 LEDs used for player ids.
|
||||||
|
* Behavior on the PlayStation 5 console is to center the player id
|
||||||
|
* across the LEDs, so e.g. player 1 would be "--x--" with x being 'on'.
|
||||||
|
* Follow a similar mapping here.
|
||||||
|
*/
|
||||||
|
static const int player_ids[5] = {
|
||||||
|
BIT(2),
|
||||||
|
BIT(3) | BIT(1),
|
||||||
|
BIT(4) | BIT(2) | BIT(0),
|
||||||
|
BIT(4) | BIT(3) | BIT(1) | BIT(0),
|
||||||
|
BIT(4) | BIT(3) | BIT(2) | BIT(1) | BIT(0)
|
||||||
|
};
|
||||||
|
|
||||||
|
uint8_t player_id = ds->base.player_id % ARRAY_SIZE(player_ids);
|
||||||
|
|
||||||
|
ds->update_player_leds = true;
|
||||||
|
ds->player_leds_state = player_ids[player_id];
|
||||||
|
schedule_work(&ds->output_worker);
|
||||||
|
}
|
||||||
|
|
||||||
static struct ps_device *dualsense_create(struct hid_device *hdev)
|
static struct ps_device *dualsense_create(struct hid_device *hdev)
|
||||||
{
|
{
|
||||||
struct dualsense *ds;
|
struct dualsense *ds;
|
||||||
@@ -1185,6 +1244,15 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
|
|||||||
|
|
||||||
dualsense_set_lightbar(ds, 0, 0, 128); /* blue */
|
dualsense_set_lightbar(ds, 0, 0, 128); /* blue */
|
||||||
|
|
||||||
|
ret = ps_device_set_player_id(ps_dev);
|
||||||
|
if (ret) {
|
||||||
|
hid_err(hdev, "Failed to assign player id for DualSense: %d\n", ret);
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Set player LEDs to our player id. */
|
||||||
|
dualsense_set_player_leds(ds);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Reporting hardware and firmware is important as there are frequent updates, which
|
* Reporting hardware and firmware is important as there are frequent updates, which
|
||||||
* can change behavior.
|
* can change behavior.
|
||||||
@@ -1262,6 +1330,7 @@ static void ps_remove(struct hid_device *hdev)
|
|||||||
struct ps_device *dev = hid_get_drvdata(hdev);
|
struct ps_device *dev = hid_get_drvdata(hdev);
|
||||||
|
|
||||||
ps_devices_list_remove(dev);
|
ps_devices_list_remove(dev);
|
||||||
|
ps_device_release_player_id(dev);
|
||||||
|
|
||||||
hid_hw_close(hdev);
|
hid_hw_close(hdev);
|
||||||
hid_hw_stop(hdev);
|
hid_hw_stop(hdev);
|
||||||
@@ -1282,7 +1351,19 @@ static struct hid_driver ps_driver = {
|
|||||||
.raw_event = ps_raw_event,
|
.raw_event = ps_raw_event,
|
||||||
};
|
};
|
||||||
|
|
||||||
module_hid_driver(ps_driver);
|
static int __init ps_init(void)
|
||||||
|
{
|
||||||
|
return hid_register_driver(&ps_driver);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void __exit ps_exit(void)
|
||||||
|
{
|
||||||
|
hid_unregister_driver(&ps_driver);
|
||||||
|
ida_destroy(&ps_player_id_allocator);
|
||||||
|
}
|
||||||
|
|
||||||
|
module_init(ps_init);
|
||||||
|
module_exit(ps_exit);
|
||||||
|
|
||||||
MODULE_AUTHOR("Sony Interactive Entertainment");
|
MODULE_AUTHOR("Sony Interactive Entertainment");
|
||||||
MODULE_DESCRIPTION("HID Driver for PlayStation peripherals.");
|
MODULE_DESCRIPTION("HID Driver for PlayStation peripherals.");
|
||||||
|
|||||||
Reference in New Issue
Block a user