Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 949695e

Browse files
gregkhTreehugger Robot
gregkh
authored and
Treehugger Robot
committed
Merge 7994a48 ("scsi: ufs: Use pre-calculated offsets in ufshcd_init_lrb()") into android15-6.6-lts
Steps on the way to 6.6.57 Resolves merge conflicts in: net/mac80211/scan.c Change-Id: Ibe1f3ca919fbc85e6999256fa483e1e0141d675f Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents b131b8a + 7994a48 commit 949695e

File tree

26 files changed

+554
-73
lines changed

26 files changed

+554
-73
lines changed

‎drivers/gpu/drm/i915/display/intel_hdcp.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,8 @@ static void intel_hdcp_update_value(struct intel_connector *connector,
10051005
hdcp->value = value;
10061006
if (update_property) {
10071007
drm_connector_get(&connector->base);
1008-
queue_work(i915->unordered_wq, &hdcp->prop_work);
1008+
if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
1009+
drm_connector_put(&connector->base);
10091010
}
10101011
}
10111012

@@ -2480,7 +2481,8 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
24802481
mutex_lock(&hdcp->mutex);
24812482
hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
24822483
drm_connector_get(&connector->base);
2483-
queue_work(i915->unordered_wq, &hdcp->prop_work);
2484+
if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
2485+
drm_connector_put(&connector->base);
24842486
mutex_unlock(&hdcp->mutex);
24852487
}
24862488

@@ -2497,7 +2499,9 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
24972499
*/
24982500
if (!desired_and_not_enabled && !content_protection_type_changed) {
24992501
drm_connector_get(&connector->base);
2500-
queue_work(i915->unordered_wq, &hdcp->prop_work);
2502+
if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
2503+
drm_connector_put(&connector->base);
2504+
25012505
}
25022506
}
25032507

‎drivers/gpu/drm/v3d/v3d_perfmon.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ void v3d_perfmon_open_file(struct v3d_file_priv *v3d_priv)
103103
static int v3d_perfmon_idr_del(int id, void *elem, void *data)
104104
{
105105
struct v3d_perfmon *perfmon = elem;
106+
struct v3d_dev *v3d = (struct v3d_dev *)data;
107+
108+
/* If the active perfmon is being destroyed, stop it first */
109+
if (perfmon == v3d->active_perfmon)
110+
v3d_perfmon_stop(v3d, perfmon, false);
106111

107112
v3d_perfmon_put(perfmon);
108113

@@ -111,8 +116,10 @@ static int v3d_perfmon_idr_del(int id, void *elem, void *data)
111116

112117
void v3d_perfmon_close_file(struct v3d_file_priv *v3d_priv)
113118
{
119+
struct v3d_dev *v3d = v3d_priv->v3d;
120+
114121
mutex_lock(&v3d_priv->perfmon.lock);
115-
idr_for_each(&v3d_priv->perfmon.idr, v3d_perfmon_idr_del, NULL);
122+
idr_for_each(&v3d_priv->perfmon.idr, v3d_perfmon_idr_del, v3d);
116123
idr_destroy(&v3d_priv->perfmon.idr);
117124
mutex_unlock(&v3d_priv->perfmon.lock);
118125
mutex_destroy(&v3d_priv->perfmon.lock);

‎drivers/gpu/drm/vc4/vc4_perfmon.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ void vc4_perfmon_open_file(struct vc4_file *vc4file)
116116
static int vc4_perfmon_idr_del(int id, void *elem, void *data)
117117
{
118118
struct vc4_perfmon *perfmon = elem;
119+
struct vc4_dev *vc4 = (struct vc4_dev *)data;
120+
121+
/* If the active perfmon is being destroyed, stop it first */
122+
if (perfmon == vc4->active_perfmon)
123+
vc4_perfmon_stop(vc4, perfmon, false);
119124

120125
vc4_perfmon_put(perfmon);
121126

@@ -130,7 +135,7 @@ void vc4_perfmon_close_file(struct vc4_file *vc4file)
130135
return;
131136

132137
mutex_lock(&vc4file->perfmon.lock);
133-
idr_for_each(&vc4file->perfmon.idr, vc4_perfmon_idr_del, NULL);
138+
idr_for_each(&vc4file->perfmon.idr, vc4_perfmon_idr_del, vc4);
134139
idr_destroy(&vc4file->perfmon.idr);
135140
mutex_unlock(&vc4file->perfmon.lock);
136141
mutex_destroy(&vc4file->perfmon.lock);

‎drivers/hid/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,6 +1300,15 @@ config HID_ALPS
13001300
Say Y here if you have a Alps touchpads over i2c-hid or usbhid
13011301
and want support for its special functionalities.
13021302

1303+
config HID_MCP2200
1304+
tristate "Microchip MCP2200 HID USB-to-GPIO bridge"
1305+
depends on USB_HID && GPIOLIB
1306+
help
1307+
Provides GPIO functionality over USB-HID through MCP2200 device.
1308+
1309+
To compile this driver as a module, choose M here: the module
1310+
will be called hid-mcp2200.ko.
1311+
13031312
config HID_MCP2221
13041313
tristate "Microchip MCP2221 HID USB-to-I2C/SMbus host support"
13051314
depends on USB_HID && I2C

‎drivers/hid/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ obj-$(CONFIG_HID_LOGITECH_HIDPP) += hid-logitech-hidpp.o
7979
obj-$(CONFIG_HID_MACALLY) += hid-macally.o
8080
obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o
8181
obj-$(CONFIG_HID_MALTRON) += hid-maltron.o
82+
obj-$(CONFIG_HID_MCP2200) += hid-mcp2200.o
8283
obj-$(CONFIG_HID_MCP2221) += hid-mcp2221.o
8384
obj-$(CONFIG_HID_MAYFLASH) += hid-mf.o
8485
obj-$(CONFIG_HID_MEGAWORLD_FF) += hid-megaworld.o

‎drivers/hid/amd-sfh-hid/amd_sfh_client.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,9 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
236236
cl_data->in_data = in_data;
237237

238238
for (i = 0; i < cl_data->num_hid_devices; i++) {
239-
in_data->sensor_virt_addr[i] = dma_alloc_coherent(dev, sizeof(int) * 8,
240-
&cl_data->sensor_dma_addr[i],
241-
GFP_KERNEL);
239+
in_data->sensor_virt_addr[i] = dmam_alloc_coherent(dev, sizeof(int) * 8,
240+
&cl_data->sensor_dma_addr[i],
241+
GFP_KERNEL);
242242
if (!in_data->sensor_virt_addr[i]) {
243243
rc = -ENOMEM;
244244
goto cleanup;
@@ -331,7 +331,6 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
331331
int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata)
332332
{
333333
struct amdtp_cl_data *cl_data = privdata->cl_data;
334-
struct amd_input_data *in_data = cl_data->in_data;
335334
int i, status;
336335

337336
for (i = 0; i < cl_data->num_hid_devices; i++) {
@@ -351,12 +350,5 @@ int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata)
351350
cancel_delayed_work_sync(&cl_data->work_buffer);
352351
amdtp_hid_remove(cl_data);
353352

354-
for (i = 0; i < cl_data->num_hid_devices; i++) {
355-
if (in_data->sensor_virt_addr[i]) {
356-
dma_free_coherent(&privdata->pdev->dev, 8 * sizeof(int),
357-
in_data->sensor_virt_addr[i],
358-
cl_data->sensor_dma_addr[i]);
359-
}
360-
}
361353
return 0;
362354
}

‎drivers/hid/hid-asus.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,10 @@ static int asus_input_mapping(struct hid_device *hdev,
881881
case 0xb3: asus_map_key_clear(KEY_PROG3); break; /* Fn+Left next aura */
882882
case 0x6a: asus_map_key_clear(KEY_F13); break; /* Screenpad toggle */
883883
case 0x4b: asus_map_key_clear(KEY_F14); break; /* Arrows/Pg-Up/Dn toggle */
884-
884+
case 0xa5: asus_map_key_clear(KEY_F15); break; /* ROG Ally left back */
885+
case 0xa6: asus_map_key_clear(KEY_F16); break; /* ROG Ally QAM button */
886+
case 0xa7: asus_map_key_clear(KEY_F17); break; /* ROG Ally ROG long-press */
887+
case 0xa8: asus_map_key_clear(KEY_F18); break; /* ROG Ally ROG long-press-release */
885888

886889
default:
887890
/* ASUS lazily declares 256 usages, ignore the rest,
@@ -1273,6 +1276,15 @@ static const struct hid_device_id asus_devices[] = {
12731276
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
12741277
USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3),
12751278
QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
1279+
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
1280+
USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR),
1281+
QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
1282+
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
1283+
USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY),
1284+
QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
1285+
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
1286+
USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X),
1287+
QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
12761288
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
12771289
USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),
12781290
QUIRK_ROG_CLAYMORE_II_KEYBOARD },

‎drivers/hid/hid-ids.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,9 @@
208208
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD 0x1866
209209
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2 0x19b6
210210
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3 0x1a30
211+
#define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR 0x18c6
212+
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY 0x1abe
213+
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X 0x1b4c
211214
#define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD 0x196b
212215
#define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD 0x1869
213216

@@ -298,6 +301,9 @@
298301

299302
#define USB_VENDOR_ID_CIDC 0x1677
300303

304+
#define I2C_VENDOR_ID_CIRQUE 0x0488
305+
#define I2C_PRODUCT_ID_CIRQUE_1063 0x1063
306+
301307
#define USB_VENDOR_ID_CJTOUCH 0x24b8
302308
#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020 0x0020
303309
#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040 0x0040
@@ -499,6 +505,7 @@
499505
#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100
500506

501507
#define I2C_VENDOR_ID_GOODIX 0x27c6
508+
#define I2C_DEVICE_ID_GOODIX_01E0 0x01e0
502509
#define I2C_DEVICE_ID_GOODIX_01E8 0x01e8
503510
#define I2C_DEVICE_ID_GOODIX_01E9 0x01e9
504511
#define I2C_DEVICE_ID_GOODIX_01F0 0x01f0
@@ -907,6 +914,7 @@
907914
#define USB_DEVICE_ID_PICK16F1454 0x0042
908915
#define USB_DEVICE_ID_PICK16F1454_V2 0xf2f7
909916
#define USB_DEVICE_ID_LUXAFOR 0xf372
917+
#define USB_DEVICE_ID_MCP2200 0x00df
910918
#define USB_DEVICE_ID_MCP2221 0x00dd
911919

912920
#define USB_VENDOR_ID_MICROSOFT 0x045e
@@ -1025,6 +1033,8 @@
10251033
#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3220_SERIES 0xc056
10261034
#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3215_SERIES 0xc057
10271035
#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3225_SERIES 0xc058
1036+
#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3325_SERIES 0x430c
1037+
#define USB_DEVICE_ID_PLANTRONICS_ENCOREPRO_500_SERIES 0x431e
10281038

10291039
#define USB_VENDOR_ID_PANASONIC 0x04da
10301040
#define USB_DEVICE_ID_PANABOARD_UBT780 0x1044

0 commit comments

Comments
 (0)