Messages in this thread | | | Date | Tue, 20 Jun 2023 09:26:50 -0500 | Subject | Re: [PATCH 2/2] firmware: stratix10-svc: fix bug in saving controller data | From | Dinh Nguyen <> |
| |
Please add a Fixes tag to this!
On 6/19/23 22:52, tien.sung.ang@intel.com wrote: > 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 ca713f39107e..60e08987c402 100644 > --- a/drivers/firmware/stratix10-svc.c > +++ b/drivers/firmware/stratix10-svc.c > @@ -130,6 +130,7 @@ struct stratix10_svc_data { > * @complete_status: state for completion > * @invoke_fn: function to issue secure monitor call or hypervisor call > * @sdm_lock: a mutex lock to allow only one pending sdm message per client > + * @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. > @@ -144,6 +145,7 @@ struct stratix10_svc_controller { > svc_invoke_fn *invoke_fn; > /* Enforces atomic command sending to SDM */ > struct mutex *sdm_lock; > + struct stratix10_svc *svc; > }; > > /** > @@ -1252,6 +1254,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) { > @@ -1279,8 +1282,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; > @@ -1296,8 +1297,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);
| |