Commit 59b40fb0 authored by Basavaraj Natikar's avatar Basavaraj Natikar Committed by Wen Zhiwei
Browse files

HID: amd_sfh: Switch to device-managed dmam_alloc_coherent() 

stable inclusion
from stable-v6.6.57
commit 1c3b4c90479aa0375ec98fe1a802993ff96a5f47
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB2M97

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1c3b4c90479aa0375ec98fe1a802993ff96a5f47



--------------------------------

commit c56f9ecb7fb6a3a90079c19eb4c8daf3bbf514b3 upstream.

Using the device-managed version allows to simplify clean-up in probe()
error path.

Additionally, this device-managed ensures proper cleanup, which helps to
resolve memory errors, page faults, btrfs going read-only, and btrfs
disk corruption.

Fixes: 4b2c53d9 ("SFH:Transport Driver to add support of AMD Sensor Fusion Hub (SFH)")
Tested-by: default avatarChris Hixon <linux-kernel-bugs@hixontech.com>
Tested-by: default avatarRichard <hobbes1069@gmail.com>
Tested-by: default avatarSkyler <skpu@pm.me>
Reported-by: default avatarChris Hixon <linux-kernel-bugs@hixontech.com>
Closes: https://lore.kernel.org/all/3b129b1f-8636-456a-80b4-0f6cce0eef63@hixontech.com/
Link: https://bugzilla.kernel.org/show_bug.cgi?id=219331


Signed-off-by: default avatarBasavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 109f8a3d

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

+3 −11
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) 
	cl_data->in_data = in_data;



	for (i = 0; i < cl_data->num_hid_devices; i++) {

		in_data->sensor_virt_addr[i] = dma_alloc_coherent(dev, sizeof(int) * 8,

		in_data->sensor_virt_addr[i] = dmam_alloc_coherent(dev, sizeof(int) * 8,

								   &cl_data->sensor_dma_addr[i],

								   GFP_KERNEL);

		if (!in_data->sensor_virt_addr[i]) {
@@ -331,7 +331,6 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) 
int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata)

{

	struct amdtp_cl_data *cl_data = privdata->cl_data;

	struct amd_input_data *in_data = cl_data->in_data;

	int i, status;



	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) 
	cancel_delayed_work_sync(&cl_data->work_buffer);

	amdtp_hid_remove(cl_data);



	for (i = 0; i < cl_data->num_hid_devices; i++) {

		if (in_data->sensor_virt_addr[i]) {

			dma_free_coherent(&privdata->pdev->dev, 8 * sizeof(int),

					  in_data->sensor_virt_addr[i],

					  cl_data->sensor_dma_addr[i]);

		}

	}

	return 0;

}