[PATCH 1/1] cdx: register shutdown callback for cdx controller

[PATCH 1/1] cdx: register shutdown callback for cdx controller

[Abhijit Gangurde]

register shutdown callback for cdx controller platform device
to handle graceful connection closure of rpmsg transport.
Also, handle shutdown of cdx bus device by disabling the bus.

Signed-off-by: Abhijit Gangurde <abhijit.gangurde@amd.com>
---
 drivers/cdx/cdx.c                       | 5 ++++-
 drivers/cdx/controller/cdx_controller.c | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c
index 07371cb653d3..655a056bca4e 100644
--- a/drivers/cdx/cdx.c
+++ b/drivers/cdx/cdx.c
@@ -338,8 +338,11 @@ static void cdx_shutdown(struct device *dev)
 {
 	struct cdx_driver *cdx_drv = to_cdx_driver(dev->driver);
 	struct cdx_device *cdx_dev = to_cdx_device(dev);
+	struct cdx_controller *cdx = cdx_dev->cdx;
 
-	if (cdx_drv && cdx_drv->shutdown)
+	if (cdx_dev->is_bus && cdx_dev->enabled && cdx->ops->bus_disable)
+		cdx->ops->bus_disable(cdx, cdx_dev->bus_num);
+	else if (cdx_drv && cdx_drv->shutdown)
 		cdx_drv->shutdown(cdx_dev);
 }
 
diff --git a/drivers/cdx/controller/cdx_controller.c b/drivers/cdx/controller/cdx_controller.c
index 7c1ea5373b12..9aad5a9b328c 100644
--- a/drivers/cdx/controller/cdx_controller.c
+++ b/drivers/cdx/controller/cdx_controller.c
@@ -261,6 +261,11 @@ static void xlnx_cdx_remove(struct platform_device *pdev)
 	kfree(cdx_mcdi);
 }
 
+static void xlnx_cdx_shutdown(struct platform_device *pdev)
+{
+	cdx_destroy_rpmsg(pdev);
+}
+
 static const struct of_device_id cdx_match_table[] = {
 	{.compatible = "xlnx,versal-net-cdx",},
 	{ },
@@ -276,6 +281,7 @@ static struct platform_driver cdx_pdriver = {
 		   },
 	.probe = xlnx_cdx_probe,
 	.remove_new = xlnx_cdx_remove,
+	.shutdown = xlnx_cdx_shutdown,
 };
 
 static int __init cdx_controller_init(void)
-- 
2.25.1

Re: [PATCH 1/1] cdx: register shutdown callback for cdx controller

[Greg KH]

On Thu, Oct 17, 2024 at 04:02:16PM +0530, Abhijit Gangurde wrote:
> register shutdown callback for cdx controller platform device
> to handle graceful connection closure of rpmsg transport.
> Also, handle shutdown of cdx bus device by disabling the bus.

When you say "also" that implies it should be a separate patch, right?

And why send this to me and not to the cdx maintainers?

thanks,

greg k-h

RE: [PATCH 1/1] cdx: register shutdown callback for cdx controller

[Agarwal, Nikhil]

> -----Original Message-----
> From: Abhijit Gangurde <abhijit.gangurde@amd.com>
> 
> register shutdown callback for cdx controller platform device to handle graceful
> connection closure of rpmsg transport.
> Also, handle shutdown of cdx bus device by disabling the bus.
> 
> Signed-off-by: Abhijit Gangurde <abhijit.gangurde@amd.com>
> ---
>  drivers/cdx/cdx.c                       | 5 ++++-
>  drivers/cdx/controller/cdx_controller.c | 6 ++++++
>  2 files changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index 07371cb653d3..655a056bca4e
> 100644
> --- a/drivers/cdx/cdx.c
> +++ b/drivers/cdx/cdx.c
> @@ -338,8 +338,11 @@ static void cdx_shutdown(struct device *dev)  {
>  	struct cdx_driver *cdx_drv = to_cdx_driver(dev->driver);
>  	struct cdx_device *cdx_dev = to_cdx_device(dev);
> +	struct cdx_controller *cdx = cdx_dev->cdx;
> 
> -	if (cdx_drv && cdx_drv->shutdown)
> +	if (cdx_dev->is_bus && cdx_dev->enabled && cdx->ops->bus_disable)
> +		cdx->ops->bus_disable(cdx, cdx_dev->bus_num);
> +	else if (cdx_drv && cdx_drv->shutdown)
>  		cdx_drv->shutdown(cdx_dev);
Please drop else from here.

Also, as suggested by Greg, please split this patch into 2 separate patches 
for device shutdown and controller shutdown.