UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwspinlock updates for v5.17 

This contains a change to the stm32 hwspinlock driver to ensure that
 the hardware is operational even without CONFIG_PM.
 -----BEGIN PGP SIGNATURE-----
 
 iQJPBAABCAA5FiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmHmzhMbHGJqb3JuLmFu
 ZGVyc3NvbkBsaW5hcm8ub3JnAAoJEAsfOT8Nma3FyOQQALWRYrTt3B7+35UM7neI
 DvI09TX7++ERmxHpI3cnp3lnG3/rtDbqvxaYQNlUljtZQAw/pZFWoehWdbEHMSDQ
 LQxqqASZjxjxkAkbQHTBQbXPS9b3VyWaYAatpOrt2ppGyROv/ddLEKE7vVWzHI4V
 XhqXaw90jhUXu1hzEULC2nfGSaCycJbhCD4EYv/WjesHlgUigbSQJUmbpXy8tob6
 2PzCw0APwRxyPKowkaYV+D/lneJAFgfM85IjLuShGL66gx1+Pf+nVMxDqLLsSt81
 R8cCyRhlqgapglG8kfk9UFMlhNSgBrzvCupAezCTFlF7O6Yf9vZ5Oj9HHJc8Y+NO
 d6GeA1uLCTIG0F/nN9z6NyaAUEuarSCcYP/EDr29aABpsKIiYkME9jgJBLYLYvEU
 Vm2t4UT5w2mpMfZPXcGSqB6n54xFsHxmB0P0kLob7H1JIGQ5bJPRB9nIgxm+6WB2
 pN+ZKwhjy0WYX20lUqIB/3gzBvu/4e9Q9waMdLaImg7rEkwzg7yemvU0dHo1v8bz
 fXL2ZxIU6jKvfAdMYrdB4H35Ha+UJP0EQ8qbhplL699svYjD7cOPIeSFwXJBtMbe
 qQ1tZSjTwdteyrPgE0CBXJ8En1k19rQEpS7vemz2EwVsfDt8UkgffFcHECLzShJj
 bbtor1ZzhwEghNj5yuUVpqjZ
 =6Exq
 -----END PGP SIGNATURE-----

Merge tag 'hwlock-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux

Pull hwspinlock updates from Bjorn Andersson:
 "This contains a change to the stm32 hwspinlock driver to ensure that
  the hardware is operational even without CONFIG_PM"

* tag 'hwlock-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  hwspinlock: stm32: enable clock at probe
This commit is contained in:
Linus Torvalds 2022-01-19 10:29:20 +02:00
parent 99613159ad 60630924bb
commit 39b419eaf0
1 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/hwspinlock/stm32_hwspinlock.c
View File

@ -54,8 +54,23 @@ static const struct hwspinlock_ops stm32_hwspinlock_ops = {
.relax = stm32_hwspinlock_relax,
};
static void stm32_hwspinlock_disable_clk(void *data)
{
struct platform_device *pdev = data;
struct stm32_hwspinlock *hw = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev;
pm_runtime_get_sync(dev);
pm_runtime_disable(dev);
pm_runtime_set_suspended(dev);
pm_runtime_put_noidle(dev);
clk_disable_unprepare(hw->clk);
}
static int stm32_hwspinlock_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct stm32_hwspinlock *hw;
void __iomem *io_base;
size_t array_size;
@ -66,43 +81,45 @@ static int stm32_hwspinlock_probe(struct platform_device *pdev)
return PTR_ERR(io_base);
array_size = STM32_MUTEX_NUM_LOCKS * sizeof(struct hwspinlock);
hw = devm_kzalloc(&pdev->dev, sizeof(*hw) + array_size, GFP_KERNEL);
hw = devm_kzalloc(dev, sizeof(*hw) + array_size, GFP_KERNEL);
if (!hw)
return -ENOMEM;
hw->clk = devm_clk_get(&pdev->dev, "hsem");
hw->clk = devm_clk_get(dev, "hsem");
if (IS_ERR(hw->clk))
return PTR_ERR(hw->clk);
ret = clk_prepare_enable(hw->clk);
if (ret) {
dev_err(dev, "Failed to prepare_enable clock\n");
return ret;
}
platform_set_drvdata(pdev, hw);
pm_runtime_get_noresume(dev);
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
pm_runtime_put(dev);
ret = devm_add_action_or_reset(dev, stm32_hwspinlock_disable_clk, pdev);
if (ret) {
dev_err(dev, "Failed to register action\n");
return ret;
}
for (i = 0; i < STM32_MUTEX_NUM_LOCKS; i++)
hw->bank.lock[i].priv = io_base + i * sizeof(u32);
platform_set_drvdata(pdev, hw);
pm_runtime_enable(&pdev->dev);
ret = hwspin_lock_register(&hw->bank, &pdev->dev, &stm32_hwspinlock_ops,
0, STM32_MUTEX_NUM_LOCKS);
ret = devm_hwspin_lock_register(dev, &hw->bank, &stm32_hwspinlock_ops,
0, STM32_MUTEX_NUM_LOCKS);
if (ret)
pm_runtime_disable(&pdev->dev);
dev_err(dev, "Failed to register hwspinlock\n");
return ret;
}
static int stm32_hwspinlock_remove(struct platform_device *pdev)
{
struct stm32_hwspinlock *hw = platform_get_drvdata(pdev);
int ret;
ret = hwspin_lock_unregister(&hw->bank);
if (ret)
dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
pm_runtime_disable(&pdev->dev);
return 0;
}
static int __maybe_unused stm32_hwspinlock_runtime_suspend(struct device *dev)
{
struct stm32_hwspinlock *hw = dev_get_drvdata(dev);
@ -135,7 +152,6 @@ MODULE_DEVICE_TABLE(of, stm32_hwpinlock_ids);
static struct platform_driver stm32_hwspinlock_driver = {
.probe = stm32_hwspinlock_probe,
.remove = stm32_hwspinlock_remove,
.driver = {
.name = "stm32_hwspinlock",
.of_match_table = stm32_hwpinlock_ids,