[PATCH v3 1/1] firmware: stratix10-svc: fix bug in saving controller data

[PATCH v3 1/1] firmware: stratix10-svc: fix bug in saving controller data

[Khairul Anuar Romli]

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: b5dc75c915cda ("firmware: stratix10-svc: extend svc to support new RSU features")
Cc: stable@vger.kernel.org # 6.6+
Signed-off-by: Ang Tien Sung <tiensung.ang@altera.com>
Signed-off-by: Khairul Anuar Romli <khairul.anuar.romli@altera.com>
---
Changes in v3:
	- Rebase on v6.18-rc1
	- correct cc -> Cc
	- Include link to original patch that was not sent in 2023 but was not
	  merged.
Changes in v2:
	- Add CC that was missed in the v1 and original patch from 2023
 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 e3f990d888d7..00f58e27f6de 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -134,6 +134,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.
@@ -150,6 +151,7 @@ struct stratix10_svc_controller {
 	struct completion complete_status;
 	spinlock_t svc_fifo_lock;
 	svc_invoke_fn *invoke_fn;
+	struct stratix10_svc *svc;
 };
 
 /**
@@ -1206,6 +1208,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) {
@@ -1237,8 +1240,6 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_unregister_fcs_dev;
 
-	dev_set_drvdata(dev, svc);
-
 	pr_info("Intel Service Layer Driver Initialized\n");
 
 	return 0;
@@ -1256,8 +1257,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
 
 static void 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;
 
 	of_platform_depopulate(ctrl->dev);
 
-- 
2.43.7

Re: [PATCH v3 1/1] firmware: stratix10-svc: fix bug in saving controller data

[Dinh Nguyen]

On 11/2/25 17:21, Khairul Anuar Romli wrote:
> 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: b5dc75c915cda ("firmware: stratix10-svc: extend svc to support new RSU features")

Trimming this to 12 characters SHA. I know that documentation says at 
least 12, and not exactly 12, but the normal procedure is to use exactly 12.

Applied!

Thanks,
Dinh

Re: [PATCH v3 1/1] firmware: stratix10-svc: fix bug in saving controller data

[Romli, Khairul Anuar]

On 3/11/2025 8:14 pm, Dinh Nguyen wrote:
> 
> 
> On 11/2/25 17:21, Khairul Anuar Romli wrote:
>> 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: b5dc75c915cda ("firmware: stratix10-svc: extend svc to support 
>> new RSU features")
> 
> Trimming this to 12 characters SHA. I know that documentation says at 
> least 12, and not exactly 12, but the normal procedure is to use exactly 
> 12.
> 
> Applied!
> 
> Thanks,
> Dinh

Noted. Thanks for helping out to trim it to 12 chars.

Best Regards,
Khairul