* [PATCH 1/4] amd_sfh: Fix potential NULL pointer dereference
2021-09-23 12:29 [PATCH 0/4] Fixes and updates to amd-sfh driver Basavaraj Natikar
@ 2021-09-23 12:29 ` Basavaraj Natikar
2021-09-23 12:29 ` [PATCH 2/4] amd_sfh: Use dma_set_mask_and_coherent() Basavaraj Natikar
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Basavaraj Natikar @ 2021-09-23 12:29 UTC (permalink / raw)
To: Nehal Shah, Jiri Kosina, Benjamin Tissoires,
open list:AMD SENSOR FUSION HUB DRIVER
Cc: Basavaraj Natikar
The cl_data field of a privdata must be allocated and updated before
using in amd_sfh_hid_client_init() function.
Hence handling NULL pointer cl_data accordingly.
Fixes: d46ef750ed58 ("HID: amd_sfh: Fix potential NULL pointer dereference")
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
---
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
index 076b46251c91..f5e580f598cd 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -251,21 +251,17 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
return rc;
}
- rc = amd_sfh_hid_client_init(privdata);
- if (rc)
- return rc;
-
privdata->cl_data = devm_kzalloc(&pdev->dev, sizeof(struct amdtp_cl_data), GFP_KERNEL);
if (!privdata->cl_data)
return -ENOMEM;
- rc = devm_add_action_or_reset(&pdev->dev, amd_mp2_pci_remove, privdata);
+ mp2_select_ops(privdata);
+
+ rc = amd_sfh_hid_client_init(privdata);
if (rc)
return rc;
- mp2_select_ops(privdata);
-
- return 0;
+ return devm_add_action_or_reset(&pdev->dev, amd_mp2_pci_remove, privdata);
}
static int __maybe_unused amd_mp2_pci_resume(struct device *dev)
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/4] amd_sfh: Use dma_set_mask_and_coherent()
2021-09-23 12:29 [PATCH 0/4] Fixes and updates to amd-sfh driver Basavaraj Natikar
2021-09-23 12:29 ` [PATCH 1/4] amd_sfh: Fix potential NULL pointer dereference Basavaraj Natikar
@ 2021-09-23 12:29 ` Basavaraj Natikar
2021-09-23 12:29 ` [PATCH 3/4] amd_sfh: switch from 'pci_' to 'dev_' API Basavaraj Natikar
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Basavaraj Natikar @ 2021-09-23 12:29 UTC (permalink / raw)
To: Nehal Shah, Jiri Kosina, Benjamin Tissoires,
open list:AMD SENSOR FUSION HUB DRIVER
Cc: Basavaraj Natikar
Use dma_set_mask_and_coherent() to set both the streaming and
coherent masks.
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
---
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
index f5e580f598cd..ebe396a4570d 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -245,10 +245,13 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
privdata->mmio = pcim_iomap_table(pdev)[2];
pci_set_master(pdev);
- rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
if (rc) {
- rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
- return rc;
+ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (rc) {
+ dev_err(&pdev->dev, "failed to set DMA mask\n");
+ return rc;
+ }
}
privdata->cl_data = devm_kzalloc(&pdev->dev, sizeof(struct amdtp_cl_data), GFP_KERNEL);
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/4] amd_sfh: switch from 'pci_' to 'dev_' API
2021-09-23 12:29 [PATCH 0/4] Fixes and updates to amd-sfh driver Basavaraj Natikar
2021-09-23 12:29 ` [PATCH 1/4] amd_sfh: Fix potential NULL pointer dereference Basavaraj Natikar
2021-09-23 12:29 ` [PATCH 2/4] amd_sfh: Use dma_set_mask_and_coherent() Basavaraj Natikar
@ 2021-09-23 12:29 ` Basavaraj Natikar
2021-09-23 12:29 ` [PATCH 4/4] amd_sfh: Update Copyright details Basavaraj Natikar
2021-09-27 7:46 ` [PATCH 0/4] Fixes and updates to amd-sfh driver Jiri Kosina
4 siblings, 0 replies; 7+ messages in thread
From: Basavaraj Natikar @ 2021-09-23 12:29 UTC (permalink / raw)
To: Nehal Shah, Jiri Kosina, Benjamin Tissoires,
open list:AMD SENSOR FUSION HUB DRIVER
Cc: Basavaraj Natikar
The wrappers pci_set_drvdata or pci_get_drvdata changed to
dev_set_drvdata or dev_get_drvdata.
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
---
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
index ebe396a4570d..b5c5ec52a3af 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -234,7 +234,7 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
return -ENOMEM;
privdata->pdev = pdev;
- pci_set_drvdata(pdev, privdata);
+ dev_set_drvdata(&pdev->dev, privdata);
rc = pcim_enable_device(pdev);
if (rc)
return rc;
@@ -269,8 +269,7 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
static int __maybe_unused amd_mp2_pci_resume(struct device *dev)
{
- struct pci_dev *pdev = to_pci_dev(dev);
- struct amd_mp2_dev *mp2 = pci_get_drvdata(pdev);
+ struct amd_mp2_dev *mp2 = dev_get_drvdata(dev);
struct amdtp_cl_data *cl_data = mp2->cl_data;
struct amd_mp2_sensor_info info;
int i, status;
@@ -295,8 +294,7 @@ static int __maybe_unused amd_mp2_pci_resume(struct device *dev)
static int __maybe_unused amd_mp2_pci_suspend(struct device *dev)
{
- struct pci_dev *pdev = to_pci_dev(dev);
- struct amd_mp2_dev *mp2 = pci_get_drvdata(pdev);
+ struct amd_mp2_dev *mp2 = dev_get_drvdata(dev);
struct amdtp_cl_data *cl_data = mp2->cl_data;
int i, status;
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/4] amd_sfh: Update Copyright details
2021-09-23 12:29 [PATCH 0/4] Fixes and updates to amd-sfh driver Basavaraj Natikar
` (2 preceding siblings ...)
2021-09-23 12:29 ` [PATCH 3/4] amd_sfh: switch from 'pci_' to 'dev_' API Basavaraj Natikar
@ 2021-09-23 12:29 ` Basavaraj Natikar
2021-09-27 7:46 ` [PATCH 0/4] Fixes and updates to amd-sfh driver Jiri Kosina
4 siblings, 0 replies; 7+ messages in thread
From: Basavaraj Natikar @ 2021-09-23 12:29 UTC (permalink / raw)
To: Nehal Shah, Jiri Kosina, Benjamin Tissoires,
open list:AMD SENSOR FUSION HUB DRIVER
Cc: Basavaraj Natikar
Update the Copyright header and Author
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
---
drivers/hid/amd-sfh-hid/amd_sfh_client.c | 3 ++-
drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 2 ++
drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 2 ++
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 4 +++-
drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 3 ++-
drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 3 ++-
drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h | 3 ++-
.../hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h | 3 ++-
8 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
index 840fd075c56f..c5de0ec4f9d0 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
@@ -1,9 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* AMD SFH Client Layer
- * Copyright 2020 Advanced Micro Devices, Inc.
+ * Copyright 2020-2021 Advanced Micro Devices, Inc.
* Authors: Nehal Bakulchandra Shah <Nehal-Bakulchandra.Shah@amd.com>
* Sandeep Singh <Sandeep.singh@amd.com>
+ * Basavaraj Natikar <Basavaraj.Natikar@amd.com>
*/
#include <linux/dma-mapping.h>
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_hid.c b/drivers/hid/amd-sfh-hid/amd_sfh_hid.c
index 5ad1e7acd294..2bf97b6ac973 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_hid.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_hid.c
@@ -2,8 +2,10 @@
/*
* AMD MP2 Sensors transport driver
*
+ * Copyright 2020-2021 Advanced Micro Devices, Inc.
* Authors: Nehal Bakulchandra Shah <Nehal-bakulchandra.shah@amd.com>
* Sandeep Singh <sandeep.singh@amd.com>
+ * Basavaraj Natikar <Basavaraj.Natikar@amd.com>
*/
#include <linux/hid.h>
#include <linux/wait.h>
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_hid.h b/drivers/hid/amd-sfh-hid/amd_sfh_hid.h
index ae2ac9191ba7..c60abd38054c 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_hid.h
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_hid.h
@@ -2,8 +2,10 @@
/*
* AMD MP2 Sensors transport driver
*
+ * Copyright 2020-2021 Advanced Micro Devices, Inc.
* Authors: Nehal Bakulchandra Shah <Nehal-bakulchandra.shah@amd.com>
* Sandeep Singh <sandeep.singh@amd.com>
+ * Basavaraj Natikar <Basavaraj.Natikar@amd.com>
*/
#ifndef AMDSFH_HID_H
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
index b5c5ec52a3af..2503be0253d3 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -1,10 +1,11 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* AMD MP2 PCIe communication driver
- * Copyright 2020 Advanced Micro Devices, Inc.
+ * Copyright 2020-2021 Advanced Micro Devices, Inc.
*
* Authors: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
* Sandeep Singh <Sandeep.singh@amd.com>
+ * Basavaraj Natikar <Basavaraj.Natikar@amd.com>
*/
#include <linux/bitops.h>
@@ -335,3 +336,4 @@ MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Shyam Sundar S K <Shyam-sundar.S-k@amd.com>");
MODULE_AUTHOR("Sandeep Singh <Sandeep.singh@amd.com>");
+MODULE_AUTHOR("Basavaraj Natikar <Basavaraj.Natikar@amd.com>");
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
index 1ff6f83cb6fd..ae30e059f847 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
@@ -1,9 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* AMD MP2 PCIe communication driver
- * Copyright 2020 Advanced Micro Devices, Inc.
+ * Copyright 2020-2021 Advanced Micro Devices, Inc.
* Authors: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
* Sandeep Singh <Sandeep.singh@amd.com>
+ * Basavaraj Natikar <Basavaraj.Natikar@amd.com>
*/
#ifndef PCIE_MP2_AMD_H
diff --git a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c
index 0c3697219382..be41f83b0289 100644
--- a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c
+++ b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c
@@ -1,9 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* AMD SFH Report Descriptor generator
- * Copyright 2020 Advanced Micro Devices, Inc.
+ * Copyright 2020-2021 Advanced Micro Devices, Inc.
* Authors: Nehal Bakulchandra Shah <Nehal-Bakulchandra.Shah@amd.com>
* Sandeep Singh <sandeep.singh@amd.com>
+ * Basavaraj Natikar <Basavaraj.Natikar@amd.com>
*/
#include <linux/kernel.h>
diff --git a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h
index 16f563d1823b..70b1b7abe2c6 100644
--- a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h
+++ b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h
@@ -1,9 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* HID report descriptors, structures and routines
- * Copyright 2020 Advanced Micro Devices, Inc.
+ * Copyright 2020-2021 Advanced Micro Devices, Inc.
* Authors: Nehal Bakulchandra Shah <Nehal-bakulchandra.shah@amd.com>
* Sandeep Singh <Sandeep.singh@amd.com>
+ * Basavaraj Natikar <Basavaraj.Natikar@amd.com>
*/
#ifndef AMD_SFH_HID_DESCRIPTOR_H
diff --git a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h
index 66d6b26e4708..8d97ca0f9b52 100644
--- a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h
+++ b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h
@@ -1,9 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* HID descriptor stuructures
- * Copyright 2020 Advanced Micro Devices, Inc.
+ * Copyright 2020-2021 Advanced Micro Devices, Inc.
* Authors: Nehal Bakulchandra Shah <Nehal-bakulchandra.shah@amd.com>
* Sandeep Singh <Sandeep.singh@amd.com>
+ * Basavaraj Natikar <Basavaraj.Natikar@amd.com>
*/
#ifndef AMD_SFH_HID_REPORT_DESCRIPTOR_H
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/4] Fixes and updates to amd-sfh driver
2021-09-23 12:29 [PATCH 0/4] Fixes and updates to amd-sfh driver Basavaraj Natikar
` (3 preceding siblings ...)
2021-09-23 12:29 ` [PATCH 4/4] amd_sfh: Update Copyright details Basavaraj Natikar
@ 2021-09-27 7:46 ` Jiri Kosina
2021-09-27 7:56 ` Basavaraj Natikar
4 siblings, 1 reply; 7+ messages in thread
From: Jiri Kosina @ 2021-09-27 7:46 UTC (permalink / raw)
To: Basavaraj Natikar
Cc: Nehal Shah, Benjamin Tissoires, open list:AMD SENSOR FUSION HUB DRIVER
On Thu, 23 Sep 2021, Basavaraj Natikar wrote:
> Changes include fix to NULL pointer dereference, remove pci_ wrappers,
> use dma_set_mask_and_coherent and copyright updates.
>
> Basavaraj Natikar (4):
> amd_sfh: Fix potential NULL pointer dereference
> amd_sfh: Use dma_set_mask_and_coherent()
Thanks for the patches. My plan is to push the two above as 5.15 material
(fixes), and queue the 2 below as 5.16 merge window material. Please
holler if you disagree.
> amd_sfh: switch from 'pci_' to 'dev_' API
> amd_sfh: Update Copyright details
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 0/4] Fixes and updates to amd-sfh driver
2021-09-27 7:46 ` [PATCH 0/4] Fixes and updates to amd-sfh driver Jiri Kosina
@ 2021-09-27 7:56 ` Basavaraj Natikar
0 siblings, 0 replies; 7+ messages in thread
From: Basavaraj Natikar @ 2021-09-27 7:56 UTC (permalink / raw)
To: Jiri Kosina, Basavaraj Natikar
Cc: Nehal Shah, Benjamin Tissoires, open list:AMD SENSOR FUSION HUB DRIVER
On 9/27/2021 1:16 PM, Jiri Kosina wrote:
> [CAUTION: External Email]
>
> On Thu, 23 Sep 2021, Basavaraj Natikar wrote:
>
>> Changes include fix to NULL pointer dereference, remove pci_ wrappers,
>> use dma_set_mask_and_coherent and copyright updates.
>>
>> Basavaraj Natikar (4):
>> amd_sfh: Fix potential NULL pointer dereference
>> amd_sfh: Use dma_set_mask_and_coherent()
> Thanks for the patches. My plan is to push the two above as 5.15 material
> (fixes), and queue the 2 below as 5.16 merge window material. Please
> holler if you disagree.
>
>> amd_sfh: switch from 'pci_' to 'dev_' API
>> amd_sfh: Update Copyright details
Makes sense. Appreciate your help.
Thanks,
Basavaraj
^ permalink raw reply [flat|nested] 7+ messages in thread