* [PATCH 0/1] fix bug in saving controller data
@ 2023-06-23 4:16 tien.sung.ang
2023-06-23 4:16 ` [PATCH 1/1] firmware: stratix10-svc: " tien.sung.ang
0 siblings, 1 reply; 3+ messages in thread
From: tien.sung.ang @ 2023-06-23 4:16 UTC (permalink / raw)
To: Dinh Nguyen; +Cc: linux-kernel, Ang Tien Sung
From: Ang Tien Sung <tien.sung.ang@intel.com>
hi Dinh,
Re-sending this as i did a mistake to ommit the "Fixes" tag.
As requested by you, i have created this patch first to be upstream.
This patch fixes the incorrect usage of the drvdata storage in the driver.
Ang Tien Sung (1):
firmware: stratix10-svc: fix bug in saving controller data
drivers/firmware/stratix10-svc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] firmware: stratix10-svc: fix bug in saving controller data
2023-06-23 4:16 [PATCH 0/1] fix bug in saving controller data tien.sung.ang
@ 2023-06-23 4:16 ` tien.sung.ang
0 siblings, 0 replies; 3+ messages in thread
From: tien.sung.ang @ 2023-06-23 4:16 UTC (permalink / raw)
To: Dinh Nguyen; +Cc: linux-kernel, Ang Tien Sung
From: Ang Tien Sung <tien.sung.ang@intel.com>
Fix the incorrect usage of platform_set_drvdata and dev_set_drvdata.
They both are of the same data and overrides each other. This resulted
in the rmmod of the svc driver to fail and throw a kernel panic for
kthread_stop and fifo free.
Fixes: b5dc75c915cd ("firmware: stratix10-svc: extend svc to support new RSU features")
Signed-off-by: Ang Tien Sung <tien.sung.ang@intel.com>
---
drivers/firmware/stratix10-svc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 80f4e2d14e04..cb72e52bd681 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -133,6 +133,7 @@ struct stratix10_svc_data {
* @complete_status: state for completion
* @svc_fifo_lock: protect access to service message data queue
* @invoke_fn: function to issue secure monitor call or hypervisor call
+ * @svc: manages the list of client svc drivers
*
* This struct is used to create communication channels for service clients, to
* handle secure monitor or hypervisor call.
@@ -149,6 +150,7 @@ struct stratix10_svc_controller {
struct completion complete_status;
spinlock_t svc_fifo_lock;
svc_invoke_fn *invoke_fn;
+ struct stratix10_svc *svc;
};
/**
@@ -1191,6 +1193,7 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
ret = -ENOMEM;
goto err_free_kfifo;
}
+ controller->svc = svc;
svc->stratix10_svc_rsu = platform_device_alloc(STRATIX10_RSU, 0);
if (!svc->stratix10_svc_rsu) {
@@ -1218,8 +1221,6 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
goto err_unregister_dev;
}
- dev_set_drvdata(dev, svc);
-
pr_info("Intel Service Layer Driver Initialized\n");
return 0;
@@ -1235,8 +1236,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
static int stratix10_svc_drv_remove(struct platform_device *pdev)
{
- struct stratix10_svc *svc = dev_get_drvdata(&pdev->dev);
struct stratix10_svc_controller *ctrl = platform_get_drvdata(pdev);
+ struct stratix10_svc *svc = ctrl->svc;
platform_device_unregister(svc->intel_svc_fcs);
platform_device_unregister(svc->stratix10_svc_rsu);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/1] firmware: stratix10-svc: fix bug in saving controller data
2023-06-23 4:12 [PATCH 0/1] " tien.sung.ang
@ 2023-06-23 4:12 ` tien.sung.ang
0 siblings, 0 replies; 3+ messages in thread
From: tien.sung.ang @ 2023-06-23 4:12 UTC (permalink / raw)
To: Dinh Nguyen; +Cc: linux-kernel, Ang Tien Sung
From: Ang Tien Sung <tien.sung.ang@intel.com>
Fix the incorrect usage of platform_set_drvdata and dev_set_drvdata.
They both are of the same data and overrides each other. This resulted
in the rmmod of the svc driver to fail and throw a kernel panic for
kthread_stop and fifo free.
Signed-off-by: Ang Tien Sung <tien.sung.ang@intel.com>
---
drivers/firmware/stratix10-svc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 80f4e2d14e04..cb72e52bd681 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -133,6 +133,7 @@ struct stratix10_svc_data {
* @complete_status: state for completion
* @svc_fifo_lock: protect access to service message data queue
* @invoke_fn: function to issue secure monitor call or hypervisor call
+ * @svc: manages the list of client svc drivers
*
* This struct is used to create communication channels for service clients, to
* handle secure monitor or hypervisor call.
@@ -149,6 +150,7 @@ struct stratix10_svc_controller {
struct completion complete_status;
spinlock_t svc_fifo_lock;
svc_invoke_fn *invoke_fn;
+ struct stratix10_svc *svc;
};
/**
@@ -1191,6 +1193,7 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
ret = -ENOMEM;
goto err_free_kfifo;
}
+ controller->svc = svc;
svc->stratix10_svc_rsu = platform_device_alloc(STRATIX10_RSU, 0);
if (!svc->stratix10_svc_rsu) {
@@ -1218,8 +1221,6 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
goto err_unregister_dev;
}
- dev_set_drvdata(dev, svc);
-
pr_info("Intel Service Layer Driver Initialized\n");
return 0;
@@ -1235,8 +1236,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
static int stratix10_svc_drv_remove(struct platform_device *pdev)
{
- struct stratix10_svc *svc = dev_get_drvdata(&pdev->dev);
struct stratix10_svc_controller *ctrl = platform_get_drvdata(pdev);
+ struct stratix10_svc *svc = ctrl->svc;
platform_device_unregister(svc->intel_svc_fcs);
platform_device_unregister(svc->stratix10_svc_rsu);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-23 4:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-23 4:16 [PATCH 0/1] fix bug in saving controller data tien.sung.ang
2023-06-23 4:16 ` [PATCH 1/1] firmware: stratix10-svc: " tien.sung.ang
-- strict thread matches above, loose matches on Subject: below --
2023-06-23 4:12 [PATCH 0/1] " tien.sung.ang
2023-06-23 4:12 ` [PATCH 1/1] firmware: stratix10-svc: " tien.sung.ang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).