clock, reset: microchip: move all mpfs reset code to the reset subsystem
Subsystems (4)
PATCH v2 1/1 clock, reset: microchip: move all mpfs reset code to the reset subsystem
From: Conor Dooley <[email protected]>
Stephen and Philipp, while reviewing patches, said that all of the aux device creation and the register read/write code could be moved to the reset subsystem, leaving the clock driver with no implementations of reset_* functions at all. Move them.
---
v2: fixup a build warning and some minor checkpatch complaints
--- drivers/clk/microchip/clk-mpfs.c | 92 +------------------------------ drivers/reset/reset-mpfs.c | 95 +++++++++++++++++++++++++++++--- include/soc/microchip/mpfs.h | 10 ++-- 3 files changed, 93 insertions(+), 104 deletions(-)
drivers/clk/microchip/clk-mpfs.c +2 -90
@@ -4,12 +4,10 @@* * Copyright (C) 2020-2022 Microchip Technology Inc. All rights reserved. */ -#include <linux/auxiliary_bus.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/module.h> #include <linux/platform_device.h> -#include <linux/slab.h> #include <dt-bindings/clock/microchip,mpfs-clock.h> #include <soc/microchip/mpfs.h>
@@ -361,93 +359,6 @@ static int mpfs_clk_register_periphs(struct device *dev, struct mpfs_periph_hw_creturn 0 ; } -/* -* Peripheral clock resets -*/ - -#if IS_ENABLED (CONFIG_RESET_CONTROLLER ) - -u32 mpfs_reset_read (struct device *dev) -{ -struct mpfs_clock_data *clock_data =dev_get_drvdata (dev->parent); - -return readl_relaxed (clock_data->base +REG_SUBBLK_RESET_CR ); -} -EXPORT_SYMBOL_NS_GPL (mpfs_reset_read,MCHP_CLK_MPFS ); - -void mpfs_reset_write (struct device *dev,u32 val) -{ -struct mpfs_clock_data *clock_data =dev_get_drvdata (dev->parent); - -writel_relaxed (val, clock_data->base +REG_SUBBLK_RESET_CR ); -} -EXPORT_SYMBOL_NS_GPL (mpfs_reset_write,MCHP_CLK_MPFS ); - -static void mpfs_reset_unregister_adev (void *_adev) -{ -struct auxiliary_device *adev = _adev; - -auxiliary_device_delete (adev); -auxiliary_device_uninit (adev); -} - -static void mpfs_reset_adev_release (struct device *dev) -{ -struct auxiliary_device *adev =to_auxiliary_dev (dev); - -kfree (adev); -} - -static struct auxiliary_device *mpfs_reset_adev_alloc (struct mpfs_clock_data *clk_data) -{ -struct auxiliary_device *adev; -int ret; - - adev =kzalloc (sizeof (*adev),GFP_KERNEL ); -if (!adev) -return ERR_PTR (-ENOMEM ); - - adev->name ="reset-mpfs" ; - adev->dev.parent = clk_data->dev; - adev->dev.release = mpfs_reset_adev_release; - adev->id =666u ; - - ret =auxiliary_device_init (adev); -if (ret) { -kfree (adev); -return ERR_PTR (ret); - } - -return adev; -} - -static int mpfs_reset_controller_register (struct mpfs_clock_data *clk_data) -{ -struct auxiliary_device *adev; -int ret; - - adev =mpfs_reset_adev_alloc (clk_data); -if (IS_ERR (adev)) -return PTR_ERR (adev); - - ret =auxiliary_device_add (adev); -if (ret) { -auxiliary_device_uninit (adev); -return ret; - } - -return devm_add_action_or_reset (clk_data->dev, mpfs_reset_unregister_adev, adev); -} - -#else /* !CONFIG_RESET_CONTROLLER */ - -static int mpfs_reset_controller_register (struct mpfs_clock_data *clk_data) -{ -return 0 ; -} - -#endif /* !CONFIG_RESET_CONTROLLER */ -static int mpfs_clk_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -499,7 +410,7 @@ static int mpfs_clk_probe(struct platform_device *pdev)if (ret)return ret; -return mpfs_reset_controller_register (clk_data); +return mpfs_reset_controller_register (dev, clk_data->base +REG_SUBBLK_RESET_CR ); }static const struct of_device_id mpfs_clk_of_match_table[] = {
@@ -532,3 +443,4 @@ MODULE_DESCRIPTION("Microchip PolarFire SoC Clock Driver");MODULE_AUTHOR ("Padmarao Begari <[email protected]>" );MODULE_AUTHOR ("Daire McNamara <[email protected]>" );MODULE_AUTHOR ("Conor Dooley <[email protected]>" ); +MODULE_IMPORT_NS (MCHP_CLK_MPFS );
drivers/reset/reset-mpfs.c +86 -9
156 lines not on this page · raw message
include/soc/microchip/mpfs.h +5 -5
@@ -43,11 +43,11 @@ struct mtd_info *mpfs_sys_controller_get_flash(struct mpfs_sys_controller *mpfs_#endif /* if IS_ENABLED(CONFIG_POLARFIRE_SOC_SYS_CTRL) */ #if IS_ENABLED (CONFIG_MCHP_CLK_MPFS ) - -u32 mpfs_reset_read (struct device *dev); - -void mpfs_reset_write (struct device *dev,u32 val); - +#if IS_ENABLED (CONFIG_RESET_CONTROLLER ) +int mpfs_reset_controller_register (struct device *clk_dev,void __iomem *base); +#else +static inline int mpfs_reset_controller_register (struct device *clk_dev,void __iomem *base) {return 0 ; } +#endif /* if IS_ENABLED(CONFIG_RESET_CONTROLLER) */ #endif /* if IS_ENABLED(CONFIG_MCHP_CLK_MPFS) */ #endif /* __SOC_MPFS_H__ */
Signature · 1 line
2.43.0
Stephen Boyd
maintainerQuoting Conor Dooley (2024-04-24 01:42:08)
Quoted 7 lines
drivers/reset/reset-mpfs.c +0
-0@@ -121,11 +135,15 @@ static int mpfs_reset_probe(struct auxiliary_device *adev, {struct device *dev = &adev->dev;
drivers/reset/reset-mpfs.c static int mpfs_reset_probe(struct auxiliary_device *adev, · line 144
Quoted 10 lines
drivers/reset/reset-mpfs.c +4
-2struct reset_controller_dev *rcdev; +struct mpfs_reset *rst; - rcdev =devm_kzalloc (dev,sizeof (*rcdev),GFP_KERNEL ); -if (!rcdev) + rst =devm_kzalloc (dev,sizeof (*rst),GFP_KERNEL ); +if (!rst)return -ENOMEM ; + rst->base = (void __iomem *)adev->dev.platform_data;
Can use dev_get_platdata() here?
rst->base = (void __iomem *)dev_get_platdata(dev);
That's sad that a cast is necessary. Does it need __force as well? An alternative would be to make a container struct for auxiliary_device and put the pointer there.
Quoted 21 lines · Stephen Boyd
Quoting Conor Dooley (2024-04-24 01:42:08)
Quoted 7 lines
drivers/reset/reset-mpfs.c +0
-0@@ -121,11 +135,15 @@ static int mpfs_reset_probe(struct auxiliary_device *adev, {struct device *dev = &adev->dev;drivers/reset/reset-mpfs.c static int mpfs_reset_probe(struct auxiliary_device *adev, · line 144
Quoted 10 lines
drivers/reset/reset-mpfs.c +4
-2struct reset_controller_dev *rcdev; +struct mpfs_reset *rst; - rcdev =devm_kzalloc (dev,sizeof (*rcdev),GFP_KERNEL ); -if (!rcdev) + rst =devm_kzalloc (dev,sizeof (*rst),GFP_KERNEL ); +if (!rst)return -ENOMEM ; + rst->base = (void __iomem *)adev->dev.platform_data;Can use
dev_get_platdata()here?
Quoted 5 lines
rst->base = (void __iomem *)dev_get_platdata(dev);That's sad that a cast is necessary. Does it need
__forceas well? An alternative would be to make a container struct forauxiliary_deviceand put the pointer there.
Ye, I dunno if it was sparse that yelled at me, but either it or the compiler didn't approve. I don't really like the casting in and out, but the alternative I don't find elegant either, so I picked the one I deemed simpler. I'm happy to go with whichever you prefer.
And re: __force, AFAIU that's only required while discarding the __iomem, so the cast into the platform_data has one:
adev->dev.platform_data = (__force void *)base;
Stephen Boyd
maintainerQuoting Conor Dooley (2024-04-24 13:19:04)
Quoted 29 lines · Stephen Boyd
Quoted 21 lines
Quoting Conor Dooley (2024-04-24 01:42:08)
Quoted 7 lines
drivers/reset/reset-mpfs.c +0
-0@@ -121,11 +135,15 @@ static int mpfs_reset_probe(struct auxiliary_device *adev, {struct device *dev = &adev->dev;drivers/reset/reset-mpfs.c static int mpfs_reset_probe(struct auxiliary_device *adev, · line 144
Quoted 10 lines
drivers/reset/reset-mpfs.c +4
-2struct reset_controller_dev *rcdev; +struct mpfs_reset *rst; - rcdev =devm_kzalloc (dev,sizeof (*rcdev),GFP_KERNEL ); -if (!rcdev) + rst =devm_kzalloc (dev,sizeof (*rst),GFP_KERNEL ); +if (!rst)return -ENOMEM ; + rst->base = (void __iomem *)adev->dev.platform_data;Can use
dev_get_platdata()here?Quoted 5 lines
rst->base = (void __iomem *)dev_get_platdata(dev);That's sad that a cast is necessary. Does it need
__forceas well? An alternative would be to make a container struct forauxiliary_deviceand put the pointer there.
Quoted 4 lines
Ye, I dunno if it was sparse that yelled at me, but either it or the compiler didn't approve. I don't really like the casting in and out, but the alternative I don't find elegant either, so I picked the one I deemed simpler. I'm happy to go with whichever you prefer.
I don't really care. Am I supposed to pick this patch up?
Quoted 5 lines
And re:
__force, AFAIU that's only required while discarding the__iomem, so the cast into theplatform_datahas one:adev->dev.platform_data = (__force void *)base;
Ah, ok. Thanks for the remind.
Quoted 1 line · Stephen Boyd
Am I supposed to pick this patch up?
Eh, you'll probably save Claudiu a single patch PR if you do, there's nothing in the clk-microchip queue at the moment & I wasn't going to ask him to pick it up until you or Philipp were happy with it, given you two were the ones that suggested the change.
I say go for it, unless you want me to respin for dev_get_platdata().
Thanks,
Conor.
Quoted 9 lines · Conor Dooley
Quoted 1 line · Stephen Boyd
Am I supposed to pick this patch up?
Eh, you'll probably save Claudiu a single patch PR if you do, there's nothing in the clk-microchip queue at the moment & I wasn't going to ask him to pick it up until you or Philipp were happy with it, given you two were the ones that suggested the change.
I say go for it,
Sounds good for me.
Thank you,
Claudiu Beznea
Quoted 4 lines
unless you want me to respin for
dev_get_platdata().Thanks,
Conor.
Quoting Conor Dooley (2024-04-24 01:42:08)
Quoted 11 lines
From: Conor Dooley <[email protected]>
Stephen and Philipp, while reviewing patches, said that all of the aux device creation and the register read/write code could be moved to the reset subsystem, leaving the clock driver with no implementations of reset_* functions at all. Move them.
Suggested-by Philipp Zabel <[email protected]>Suggested-by Stephen Boyd <[email protected]>Signed-off-by Conor Dooley <[email protected]>---
Applied to clk-next