From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D711EB64D7 for ; Tue, 20 Jun 2023 14:26:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232530AbjFTO05 (ORCPT ); Tue, 20 Jun 2023 10:26:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233284AbjFTO0z (ORCPT ); Tue, 20 Jun 2023 10:26:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A390891 for ; Tue, 20 Jun 2023 07:26:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1F10961299 for ; Tue, 20 Jun 2023 14:26:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34312C433C8; Tue, 20 Jun 2023 14:26:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687271212; bh=Naw3ZhXgksc4aF+XWoL5Hrmj3Df8OklGzFlghuXrBwM=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=D1nbJRY9GyxKA/dId7MxNQzGlm3rMgeFHG2r7YH7CWW+Urb+5rzicV+ZaEI8W0oI2 RgUn4TJDsP5Slq5OrN94/mqW2y9y0QlU6ZqFhXPRmlvwA/wGG1K2YLCfao7ua9EUUK Uv+UCH1uzuZ85MnPhZ9DN/C/TUHApWNU9HgXX8Lkb9KLPOsGXm3+tIOnpfXhvgUhxK jyiXZp6yGPfGp+RRbSOumaZyYtDnutK9x2Qer2V2gI/IFHt6BMyYNIkqNu/AdaPsRr JKmb9lfhnBIwc6hApQ0nibljemdy+95mT9ZNhO2oLVjmdcXyvOOqyzpp5p/3PyoefI ni+1MRRK3u0Bg== Message-ID: <0ee36aa1-a50c-fb3d-8b87-5eddf7fe2d3d@kernel.org> Date: Tue, 20 Jun 2023 09:26:50 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH 2/2] firmware: stratix10-svc: fix bug in saving controller data Content-Language: en-US To: tien.sung.ang@intel.com Cc: linux-kernel@vger.kernel.org References: <20230620035234.1158109-1-tien.sung.ang@intel.com> From: Dinh Nguyen In-Reply-To: <20230620035234.1158109-1-tien.sung.ang@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Please add a Fixes tag to this! On 6/19/23 22:52, tien.sung.ang@intel.com wrote: > From: Ang Tien Sung > > 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 > --- > 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);