summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBjorn Andersson <andersson@kernel.org>2024-05-29 22:54:29 +0300
committerBjorn Andersson <andersson@kernel.org>2024-05-29 22:54:29 +0300
commit855cf5651790807c01f2ae35ee11b04c20b6ced4 (patch)
treec17b237b2044109aaa97f60c12710602e2441f36 /include
parent9dbd9962cfe56d210be5232349851420b5f9c8f6 (diff)
parent73100deb59c3892e280234fcc0171a5376c71788 (diff)
downloadlinux-855cf5651790807c01f2ae35ee11b04c20b6ced4.tar.xz
Merge branch '20240529-hwspinlock-bust-v3-2-c8b924ffa5a2@quicinc.com' into rproc-next
Merge the topic branch introducing hwspin_lock_bust(), to allow invoking this from the Qualcomm remoteproc drivers.
Diffstat (limited to 'include')
-rw-r--r--include/linux/hwspinlock.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/hwspinlock.h b/include/linux/hwspinlock.h
index bfe7c1f1ac6d..f0231dbc4777 100644
--- a/include/linux/hwspinlock.h
+++ b/include/linux/hwspinlock.h
@@ -68,6 +68,7 @@ int __hwspin_lock_timeout(struct hwspinlock *, unsigned int, int,
int __hwspin_trylock(struct hwspinlock *, int, unsigned long *);
void __hwspin_unlock(struct hwspinlock *, int, unsigned long *);
int of_hwspin_lock_get_id_byname(struct device_node *np, const char *name);
+int hwspin_lock_bust(struct hwspinlock *hwlock, unsigned int id);
int devm_hwspin_lock_free(struct device *dev, struct hwspinlock *hwlock);
struct hwspinlock *devm_hwspin_lock_request(struct device *dev);
struct hwspinlock *devm_hwspin_lock_request_specific(struct device *dev,
@@ -127,6 +128,11 @@ void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags)
{
}
+static inline int hwspin_lock_bust(struct hwspinlock *hwlock, unsigned int id)
+{
+ return 0;
+}
+
static inline int of_hwspin_lock_get_id(struct device_node *np, int index)
{
return 0;