* [PATCH v4 01/11] firmware: raspberrypi: Keep count of all consumers
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 17:52 ` Andy Shevchenko
2020-11-12 16:36 ` [PATCH v4 02/11] firmware: raspberrypi: Introduce devm_rpi_firmware_get() Nicolas Saenz Julienne
` (9 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel, Florian Fainelli, Ray Jui,
Scott Branden, bcm-kernel-feedback-list, Nicolas Saenz Julienne
Cc: devel, linux-pwm, devicetree, sboyd, gregkh, linus.walleij,
dmitry.torokhov, linux-gpio, andy.shevchenko, wahrenst, p.zabel,
linux-input, bgolaszewski, linux-clk, linux-arm-kernel,
linux-rpi-kernel
When unbinding the firmware device we need to make sure it has no
consumers left. Otherwise we'd leave them with a firmware handle
pointing at freed memory.
Keep a reference count of all consumers and introduce rpi_firmware_put()
which will permit automatically decrease the reference count upon
unbinding consumer drivers.
Suggested-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v3:
- Use kref instead of waiting on refcount
drivers/firmware/raspberrypi.c | 37 +++++++++++++++++++---
include/soc/bcm2835/raspberrypi-firmware.h | 2 ++
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
index 2371d08bdd17..438e17074a97 100644
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
@@ -7,6 +7,7 @@
*/
#include <linux/dma-mapping.h>
+#include <linux/kref.h>
#include <linux/mailbox_client.h>
#include <linux/module.h>
#include <linux/of_platform.h>
@@ -27,6 +28,8 @@ struct rpi_firmware {
struct mbox_chan *chan; /* The property channel. */
struct completion c;
u32 enabled;
+
+ struct kref consumers;
};
static DEFINE_MUTEX(transaction_lock);
@@ -225,12 +228,27 @@ static void rpi_register_clk_driver(struct device *dev)
-1, NULL, 0);
}
+static void rpi_firmware_delete(struct kref *kref)
+{
+ struct rpi_firmware *fw = container_of(kref, struct rpi_firmware,
+ consumers);
+
+ mbox_free_channel(fw->chan);
+ kfree(fw);
+}
+
+void rpi_firmware_put(struct rpi_firmware *fw)
+{
+ kref_put(&fw->consumers, rpi_firmware_delete);
+}
+EXPORT_SYMBOL_GPL(rpi_firmware_put);
+
static int rpi_firmware_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct rpi_firmware *fw;
- fw = devm_kzalloc(dev, sizeof(*fw), GFP_KERNEL);
+ fw = kzalloc(sizeof(*fw), GFP_KERNEL);
if (!fw)
return -ENOMEM;
@@ -247,6 +265,7 @@ static int rpi_firmware_probe(struct platform_device *pdev)
}
init_completion(&fw->c);
+ kref_init(&fw->consumers);
platform_set_drvdata(pdev, fw);
@@ -275,25 +294,35 @@ static int rpi_firmware_remove(struct platform_device *pdev)
rpi_hwmon = NULL;
platform_device_unregister(rpi_clk);
rpi_clk = NULL;
- mbox_free_channel(fw->chan);
+
+ rpi_firmware_put(fw);
return 0;
}
/**
- * rpi_firmware_get - Get pointer to rpi_firmware structure.
* @firmware_node: Pointer to the firmware Device Tree node.
*
+ * The reference to rpi_firmware has to be released with rpi_firmware_put().
+ *
* Returns NULL is the firmware device is not ready.
*/
struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
{
struct platform_device *pdev = of_find_device_by_node(firmware_node);
+ struct rpi_firmware *fw;
if (!pdev)
return NULL;
- return platform_get_drvdata(pdev);
+ fw = platform_get_drvdata(pdev);
+ if (!fw)
+ return NULL;
+
+ if (!kref_get_unless_zero(&fw->consumers))
+ return NULL;
+
+ return fw;
}
EXPORT_SYMBOL_GPL(rpi_firmware_get);
diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
index cc9cdbc66403..fdfef7fe40df 100644
--- a/include/soc/bcm2835/raspberrypi-firmware.h
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
@@ -140,6 +140,7 @@ int rpi_firmware_property(struct rpi_firmware *fw,
u32 tag, void *data, size_t len);
int rpi_firmware_property_list(struct rpi_firmware *fw,
void *data, size_t tag_size);
+void rpi_firmware_put(struct rpi_firmware *fw);
struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
#else
static inline int rpi_firmware_property(struct rpi_firmware *fw, u32 tag,
@@ -154,6 +155,7 @@ static inline int rpi_firmware_property_list(struct rpi_firmware *fw,
return -ENOSYS;
}
+static inline void rpi_firmware_put(struct rpi_firmware *fw) { }
static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
{
return NULL;
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v4 01/11] firmware: raspberrypi: Keep count of all consumers
2020-11-12 16:36 ` [PATCH v4 01/11] firmware: raspberrypi: Keep count of all consumers Nicolas Saenz Julienne
@ 2020-11-12 17:52 ` Andy Shevchenko
2020-11-13 7:26 ` Dmitry Torokhov
0 siblings, 1 reply; 17+ messages in thread
From: Andy Shevchenko @ 2020-11-12 17:52 UTC (permalink / raw)
To: Nicolas Saenz Julienne
Cc: open list:STAGING SUBSYSTEM, linux-pwm, Florian Fainelli,
Scott Branden, devicetree, Stephen Boyd, Ray Jui, Linus Walleij,
linux-input, Linux Kernel Mailing List, open list:GPIO SUBSYSTEM,
Greg Kroah-Hartman, bcm-kernel-feedback-list, Stefan Wahren,
Philipp Zabel, Uwe Kleine-König, Bartosz Golaszewski,
Dmitry Torokhov, linux-clk, linux-arm Mailing List,
linux-rpi-kernel
On Thu, Nov 12, 2020 at 6:40 PM Nicolas Saenz Julienne
<nsaenzjulienne@suse.de> wrote:
>
> When unbinding the firmware device we need to make sure it has no
> consumers left. Otherwise we'd leave them with a firmware handle
> pointing at freed memory.
>
> Keep a reference count of all consumers and introduce rpi_firmware_put()
> which will permit automatically decrease the reference count upon
> unbinding consumer drivers.
...
> /**
> - * rpi_firmware_get - Get pointer to rpi_firmware structure.
> * @firmware_node: Pointer to the firmware Device Tree node.
> *
> + * The reference to rpi_firmware has to be released with rpi_firmware_put().
> + *
> * Returns NULL is the firmware device is not ready.
> */
> struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
> {
> struct platform_device *pdev = of_find_device_by_node(firmware_node);
> + struct rpi_firmware *fw;
>
> if (!pdev)
> return NULL;
>
> - return platform_get_drvdata(pdev);
> + fw = platform_get_drvdata(pdev);
> + if (!fw)
> + return NULL;
> +
> + if (!kref_get_unless_zero(&fw->consumers))
> + return NULL;
Don't we have a more traditional way of doing this, i.e.
try_module_get() coupled with get_device() ?
> + return fw;
> }
--
With Best Regards,
Andy Shevchenko
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v4 01/11] firmware: raspberrypi: Keep count of all consumers
2020-11-12 17:52 ` Andy Shevchenko
@ 2020-11-13 7:26 ` Dmitry Torokhov
2020-11-23 17:19 ` Nicolas Saenz Julienne
0 siblings, 1 reply; 17+ messages in thread
From: Dmitry Torokhov @ 2020-11-13 7:26 UTC (permalink / raw)
To: Andy Shevchenko
Cc: open list:STAGING SUBSYSTEM, linux-pwm, linux-rpi-kernel,
Florian Fainelli, Scott Branden, devicetree, Stephen Boyd,
Ray Jui, Linus Walleij, linux-input, Linux Kernel Mailing List,
open list:GPIO SUBSYSTEM, Greg Kroah-Hartman,
bcm-kernel-feedback-list, linux-arm Mailing List, Philipp Zabel,
Uwe Kleine-König, Bartosz Golaszewski, linux-clk,
Nicolas Saenz Julienne, Stefan Wahren
On Thu, Nov 12, 2020 at 07:52:14PM +0200, Andy Shevchenko wrote:
> On Thu, Nov 12, 2020 at 6:40 PM Nicolas Saenz Julienne
> <nsaenzjulienne@suse.de> wrote:
> >
> > When unbinding the firmware device we need to make sure it has no
> > consumers left. Otherwise we'd leave them with a firmware handle
> > pointing at freed memory.
> >
> > Keep a reference count of all consumers and introduce rpi_firmware_put()
> > which will permit automatically decrease the reference count upon
> > unbinding consumer drivers.
>
> ...
>
> > /**
> > - * rpi_firmware_get - Get pointer to rpi_firmware structure.
> > * @firmware_node: Pointer to the firmware Device Tree node.
> > *
> > + * The reference to rpi_firmware has to be released with rpi_firmware_put().
> > + *
> > * Returns NULL is the firmware device is not ready.
> > */
> > struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
> > {
> > struct platform_device *pdev = of_find_device_by_node(firmware_node);
> > + struct rpi_firmware *fw;
> >
> > if (!pdev)
> > return NULL;
> >
> > - return platform_get_drvdata(pdev);
> > + fw = platform_get_drvdata(pdev);
> > + if (!fw)
> > + return NULL;
> > +
> > + if (!kref_get_unless_zero(&fw->consumers))
> > + return NULL;
>
> Don't we have a more traditional way of doing this, i.e.
> try_module_get() coupled with get_device() ?
get_device() will make sure that device is there, but gives no
assurances that device is bound to a driver, so it will not help with
the racy access to firmware via platform_get_drvdata() call.
Thanks.
--
Dmitry
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v4 01/11] firmware: raspberrypi: Keep count of all consumers
2020-11-13 7:26 ` Dmitry Torokhov
@ 2020-11-23 17:19 ` Nicolas Saenz Julienne
0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-23 17:19 UTC (permalink / raw)
To: Dmitry Torokhov, Andy Shevchenko
Cc: open list:STAGING SUBSYSTEM, linux-pwm, Florian Fainelli,
Scott Branden, devicetree, Stephen Boyd, Ray Jui, Linus Walleij,
linux-input, Linux Kernel Mailing List, open list:GPIO SUBSYSTEM,
Greg Kroah-Hartman, bcm-kernel-feedback-list, Stefan Wahren,
Philipp Zabel, Uwe Kleine-König, Bartosz Golaszewski,
linux-clk, linux-arm Mailing List, linux-rpi-kernel
[-- Attachment #1.1: Type: text/plain, Size: 2548 bytes --]
On Thu, 2020-11-12 at 23:26 -0800, Dmitry Torokhov wrote:
> On Thu, Nov 12, 2020 at 07:52:14PM +0200, Andy Shevchenko wrote:
> > On Thu, Nov 12, 2020 at 6:40 PM Nicolas Saenz Julienne
> > <nsaenzjulienne@suse.de> wrote:
> > >
> > > When unbinding the firmware device we need to make sure it has no
> > > consumers left. Otherwise we'd leave them with a firmware handle
> > > pointing at freed memory.
> > >
> > > Keep a reference count of all consumers and introduce rpi_firmware_put()
> > > which will permit automatically decrease the reference count upon
> > > unbinding consumer drivers.
> >
> > ...
> >
> > > /**
> > > - * rpi_firmware_get - Get pointer to rpi_firmware structure.
> > > * @firmware_node: Pointer to the firmware Device Tree node.
> > > *
> > > + * The reference to rpi_firmware has to be released with rpi_firmware_put().
> > > + *
> > > * Returns NULL is the firmware device is not ready.
> > > */
> > > struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
> > > {
> > > struct platform_device *pdev = of_find_device_by_node(firmware_node);
> > > + struct rpi_firmware *fw;
> > >
> > > if (!pdev)
> > > return NULL;
> > >
> > > - return platform_get_drvdata(pdev);
> > > + fw = platform_get_drvdata(pdev);
> > > + if (!fw)
> > > + return NULL;
> > > +
> > > + if (!kref_get_unless_zero(&fw->consumers))
> > > + return NULL;
> >
Hi Andy, Dimitry,
> > Don't we have a more traditional way of doing this, i.e.
> > try_module_get() coupled with get_device() ?
>
> get_device() will make sure that device is there, but gives no
> assurances that device is bound to a driver, so it will not help with
> the racy access to firmware via platform_get_drvdata() call.
I also looked at using get/put_device() just as a means for refcounting (i.e.
replacing fw->consumers), but I can't make it work either. I'd need a way to
hook up into one of the struct device_ktype release() functions. AFAIK it's not
possible for private uses like this.
IIUC the way to do this would be to bypass platform device and create a special
device class/bus for RPi's firmware dependent devices (I could pretty much copy
SCMI's implementation), but I fear that's overkill.
So, for now I'll stick with the kref based implementation, I'll be happy to
change it if you find a better solution. :)
Regards,
Nicolas
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 169 bytes --]
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 02/11] firmware: raspberrypi: Introduce devm_rpi_firmware_get()
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 01/11] firmware: raspberrypi: Keep count of all consumers Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 17:25 ` Bartosz Golaszewski
2020-11-12 16:36 ` [PATCH v4 03/11] clk: bcm: rpi: Release firmware handle on unbind Nicolas Saenz Julienne
` (8 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel, Nicolas Saenz Julienne,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list
Cc: devel, linux-pwm, devicetree, sboyd, gregkh, linus.walleij,
dmitry.torokhov, linux-gpio, andy.shevchenko, wahrenst, p.zabel,
linux-input, bgolaszewski, linux-clk, linux-arm-kernel,
linux-rpi-kernel
Itroduce devm_rpi_firmware_get(), it'll simplify the firmware handling
for most consumers.
Suggested-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v2:
- Introduce devm_rpi_firmware_get()
drivers/firmware/raspberrypi.c | 31 +++++++++++++++++++++-
include/soc/bcm2835/raspberrypi-firmware.h | 8 ++++++
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
index 438e17074a97..4ab2dfdc82ad 100644
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
@@ -237,10 +237,17 @@ static void rpi_firmware_delete(struct kref *kref)
kfree(fw);
}
-void rpi_firmware_put(struct rpi_firmware *fw)
+static void __rpi_firmware_put(void *data)
{
+ struct rpi_firmware *fw = data;
+
kref_put(&fw->consumers, rpi_firmware_delete);
}
+
+void rpi_firmware_put(struct rpi_firmware *fw)
+{
+ __rpi_firmware_put(fw);
+}
EXPORT_SYMBOL_GPL(rpi_firmware_put);
static int rpi_firmware_probe(struct platform_device *pdev)
@@ -326,6 +333,28 @@ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
}
EXPORT_SYMBOL_GPL(rpi_firmware_get);
+/**
+ * devm_rpi_firmware_get - Get pointer to rpi_firmware structure.
+ * @firmware_node: Pointer to the firmware Device Tree node.
+ *
+ * Returns NULL is the firmware device is not ready.
+ */
+struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
+ struct device_node *firmware_node)
+{
+ struct rpi_firmware *fw;
+
+ fw = rpi_firmware_get(firmware_node);
+ if (!fw)
+ return NULL;
+
+ if (devm_add_action_or_reset(dev, __rpi_firmware_put, fw))
+ return NULL;
+
+ return fw;
+}
+EXPORT_SYMBOL_GPL(devm_rpi_firmware_get);
+
static const struct of_device_id rpi_firmware_of_match[] = {
{ .compatible = "raspberrypi,bcm2835-firmware", },
{},
diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
index fdfef7fe40df..73ad784fca96 100644
--- a/include/soc/bcm2835/raspberrypi-firmware.h
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
@@ -142,6 +142,8 @@ int rpi_firmware_property_list(struct rpi_firmware *fw,
void *data, size_t tag_size);
void rpi_firmware_put(struct rpi_firmware *fw);
struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
+struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
+ struct device_node *firmware_node);
#else
static inline int rpi_firmware_property(struct rpi_firmware *fw, u32 tag,
void *data, size_t len)
@@ -160,6 +162,12 @@ static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware
{
return NULL;
}
+
+static inline struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
+ struct device_node *firmware_node)
+{
+ return NULL;
+}
#endif
#endif /* __SOC_RASPBERRY_FIRMWARE_H__ */
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v4 02/11] firmware: raspberrypi: Introduce devm_rpi_firmware_get()
2020-11-12 16:36 ` [PATCH v4 02/11] firmware: raspberrypi: Introduce devm_rpi_firmware_get() Nicolas Saenz Julienne
@ 2020-11-12 17:25 ` Bartosz Golaszewski
2020-11-13 9:21 ` Nicolas Saenz Julienne
0 siblings, 1 reply; 17+ messages in thread
From: Bartosz Golaszewski @ 2020-11-12 17:25 UTC (permalink / raw)
To: Nicolas Saenz Julienne
Cc: devel, linux-pwm, Andy Shevchenko, Florian Fainelli,
Scott Branden, linux-devicetree, Stephen Boyd, Ray Jui,
Linus Walleij, Linux Input, LKML, linux-gpio, Greg KH,
bcm-kernel-feedback-list, wahrenst, Philipp Zabel,
Uwe Kleine-König, Dmitry Torokhov, linux-clk, arm-soc,
linux-rpi-kernel
On Thu, Nov 12, 2020 at 5:44 PM Nicolas Saenz Julienne
<nsaenzjulienne@suse.de> wrote:
>
> Itroduce devm_rpi_firmware_get(), it'll simplify the firmware handling
> for most consumers.
>
> Suggested-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> ---
>
> Changes since v2:
> - Introduce devm_rpi_firmware_get()
>
> drivers/firmware/raspberrypi.c | 31 +++++++++++++++++++++-
> include/soc/bcm2835/raspberrypi-firmware.h | 8 ++++++
> 2 files changed, 38 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
> index 438e17074a97..4ab2dfdc82ad 100644
> --- a/drivers/firmware/raspberrypi.c
> +++ b/drivers/firmware/raspberrypi.c
> @@ -237,10 +237,17 @@ static void rpi_firmware_delete(struct kref *kref)
> kfree(fw);
> }
>
> -void rpi_firmware_put(struct rpi_firmware *fw)
> +static void __rpi_firmware_put(void *data)
> {
The '__' prefix is very vague and usually used for unlocked variants
of functions. The casting to void * in rpi_firmware_put() is also
unneeded. I would much prefer that the devres release callback be
called devm_rpi_firmware_put() and that it call rpi_firmware_put()
which would then call kref_put().
Bartosz
> + struct rpi_firmware *fw = data;
> +
> kref_put(&fw->consumers, rpi_firmware_delete);
> }
> +
> +void rpi_firmware_put(struct rpi_firmware *fw)
> +{
> + __rpi_firmware_put(fw);
> +}
> EXPORT_SYMBOL_GPL(rpi_firmware_put);
>
> static int rpi_firmware_probe(struct platform_device *pdev)
> @@ -326,6 +333,28 @@ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
> }
> EXPORT_SYMBOL_GPL(rpi_firmware_get);
>
> +/**
> + * devm_rpi_firmware_get - Get pointer to rpi_firmware structure.
> + * @firmware_node: Pointer to the firmware Device Tree node.
> + *
> + * Returns NULL is the firmware device is not ready.
> + */
> +struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
> + struct device_node *firmware_node)
> +{
> + struct rpi_firmware *fw;
> +
> + fw = rpi_firmware_get(firmware_node);
> + if (!fw)
> + return NULL;
> +
> + if (devm_add_action_or_reset(dev, __rpi_firmware_put, fw))
> + return NULL;
> +
> + return fw;
> +}
> +EXPORT_SYMBOL_GPL(devm_rpi_firmware_get);
> +
> static const struct of_device_id rpi_firmware_of_match[] = {
> { .compatible = "raspberrypi,bcm2835-firmware", },
> {},
> diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
> index fdfef7fe40df..73ad784fca96 100644
> --- a/include/soc/bcm2835/raspberrypi-firmware.h
> +++ b/include/soc/bcm2835/raspberrypi-firmware.h
> @@ -142,6 +142,8 @@ int rpi_firmware_property_list(struct rpi_firmware *fw,
> void *data, size_t tag_size);
> void rpi_firmware_put(struct rpi_firmware *fw);
> struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
> +struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
> + struct device_node *firmware_node);
> #else
> static inline int rpi_firmware_property(struct rpi_firmware *fw, u32 tag,
> void *data, size_t len)
> @@ -160,6 +162,12 @@ static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware
> {
> return NULL;
> }
> +
> +static inline struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
> + struct device_node *firmware_node)
> +{
> + return NULL;
> +}
> #endif
>
> #endif /* __SOC_RASPBERRY_FIRMWARE_H__ */
> --
> 2.29.2
>
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v4 02/11] firmware: raspberrypi: Introduce devm_rpi_firmware_get()
2020-11-12 17:25 ` Bartosz Golaszewski
@ 2020-11-13 9:21 ` Nicolas Saenz Julienne
0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-13 9:21 UTC (permalink / raw)
To: Bartosz Golaszewski
Cc: devel, linux-pwm, Andy Shevchenko, Florian Fainelli,
Scott Branden, linux-devicetree, Stephen Boyd, Ray Jui,
Linus Walleij, Linux Input, LKML, linux-gpio, Greg KH,
bcm-kernel-feedback-list, wahrenst, Philipp Zabel,
Uwe Kleine-König, Dmitry Torokhov, linux-clk, arm-soc,
linux-rpi-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1502 bytes --]
On Thu, 2020-11-12 at 18:25 +0100, Bartosz Golaszewski wrote:
> On Thu, Nov 12, 2020 at 5:44 PM Nicolas Saenz Julienne
> <nsaenzjulienne@suse.de> wrote:
> > Itroduce devm_rpi_firmware_get(), it'll simplify the firmware handling
> > for most consumers.
> >
> > Suggested-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> > Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> > ---
> >
> > Changes since v2:
> > - Introduce devm_rpi_firmware_get()
> >
> > drivers/firmware/raspberrypi.c | 31 +++++++++++++++++++++-
> > include/soc/bcm2835/raspberrypi-firmware.h | 8 ++++++
> > 2 files changed, 38 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
> > index 438e17074a97..4ab2dfdc82ad 100644
> > --- a/drivers/firmware/raspberrypi.c
> > +++ b/drivers/firmware/raspberrypi.c
> > @@ -237,10 +237,17 @@ static void rpi_firmware_delete(struct kref *kref)
> > kfree(fw);
> > }
> >
> > -void rpi_firmware_put(struct rpi_firmware *fw)
> > +static void __rpi_firmware_put(void *data)
> > {
>
> The '__' prefix is very vague and usually used for unlocked variants
> of functions. The casting to void * in rpi_firmware_put() is also
> unneeded. I would much prefer that the devres release callback be
> called devm_rpi_firmware_put() and that it call rpi_firmware_put()
> which would then call kref_put().
Yes, that's better. I'll change it.
Regards,
Nicolas
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 169 bytes --]
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 03/11] clk: bcm: rpi: Release firmware handle on unbind
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 01/11] firmware: raspberrypi: Keep count of all consumers Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 02/11] firmware: raspberrypi: Introduce devm_rpi_firmware_get() Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 04/11] gpio: raspberrypi-exp: " Nicolas Saenz Julienne
` (7 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel
Cc: devel, linux-pwm, f.fainelli, devicetree, sboyd, gregkh,
linus.walleij, dmitry.torokhov, linux-gpio, andy.shevchenko,
Michael Turquette, bcm-kernel-feedback-list, wahrenst, p.zabel,
linux-input, Nicolas Saenz Julienne, bgolaszewski, linux-clk,
linux-arm-kernel, linux-rpi-kernel
Use devm_rpi_firmware_get() so as to make sure we release RPi's firmware
interface when unbinding the device.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v2:
- Use devm_rpi_firmware_get(), instead of remove function
drivers/clk/bcm/clk-raspberrypi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
index f89b9cfc4309..dd3b71eafabf 100644
--- a/drivers/clk/bcm/clk-raspberrypi.c
+++ b/drivers/clk/bcm/clk-raspberrypi.c
@@ -314,7 +314,7 @@ static int raspberrypi_clk_probe(struct platform_device *pdev)
return -ENOENT;
}
- firmware = rpi_firmware_get(firmware_node);
+ firmware = devm_rpi_firmware_get(&pdev->dev, firmware_node);
of_node_put(firmware_node);
if (!firmware)
return -EPROBE_DEFER;
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 04/11] gpio: raspberrypi-exp: Release firmware handle on unbind
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
` (2 preceding siblings ...)
2020-11-12 16:36 ` [PATCH v4 03/11] clk: bcm: rpi: Release firmware handle on unbind Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 05/11] reset: raspberrypi: " Nicolas Saenz Julienne
` (6 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel, Linus Walleij, Bartosz Golaszewski
Cc: devel, linux-pwm, f.fainelli, devicetree, sboyd, gregkh,
Nicolas Saenz Julienne, dmitry.torokhov, linux-gpio,
andy.shevchenko, bcm-kernel-feedback-list, wahrenst, p.zabel,
linux-input, linux-clk, linux-arm-kernel, linux-rpi-kernel
Use devm_rpi_firmware_get() so as to make sure we release RPi's firmware
interface when unbinding the device.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
Changes since v2:
- Use devm_rpi_firmware_get(), instead of remove function
drivers/gpio/gpio-raspberrypi-exp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpio/gpio-raspberrypi-exp.c b/drivers/gpio/gpio-raspberrypi-exp.c
index bb100e0124e6..64a552ecc2ad 100644
--- a/drivers/gpio/gpio-raspberrypi-exp.c
+++ b/drivers/gpio/gpio-raspberrypi-exp.c
@@ -208,7 +208,7 @@ static int rpi_exp_gpio_probe(struct platform_device *pdev)
return -ENOENT;
}
- fw = rpi_firmware_get(fw_node);
+ fw = devm_rpi_firmware_get(&pdev->dev, fw_node);
of_node_put(fw_node);
if (!fw)
return -EPROBE_DEFER;
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 05/11] reset: raspberrypi: Release firmware handle on unbind
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
` (3 preceding siblings ...)
2020-11-12 16:36 ` [PATCH v4 04/11] gpio: raspberrypi-exp: " Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 06/11] soc: bcm: raspberrypi-power: " Nicolas Saenz Julienne
` (5 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel, Philipp Zabel
Cc: devel, linux-pwm, f.fainelli, devicetree, sboyd, gregkh,
linus.walleij, dmitry.torokhov, linux-gpio, andy.shevchenko,
bcm-kernel-feedback-list, wahrenst, linux-input,
Nicolas Saenz Julienne, bgolaszewski, linux-clk,
linux-arm-kernel, linux-rpi-kernel
Use devm_rpi_firmware_get() so as to make sure we release RPi's firmware
interface when unbinding the device.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v2:
- Use devm_rpi_firmware_get(), instead of remove function
drivers/reset/reset-raspberrypi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/reset/reset-raspberrypi.c b/drivers/reset/reset-raspberrypi.c
index 02f59c06f69b..fa23db554bcf 100644
--- a/drivers/reset/reset-raspberrypi.c
+++ b/drivers/reset/reset-raspberrypi.c
@@ -82,7 +82,7 @@ static int rpi_reset_probe(struct platform_device *pdev)
return -ENOENT;
}
- fw = rpi_firmware_get(np);
+ fw = devm_rpi_firmware_get(&pdev->dev, np);
of_node_put(np);
if (!fw)
return -EPROBE_DEFER;
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 06/11] soc: bcm: raspberrypi-power: Release firmware handle on unbind
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
` (4 preceding siblings ...)
2020-11-12 16:36 ` [PATCH v4 05/11] reset: raspberrypi: " Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 07/11] staging: vchiq: " Nicolas Saenz Julienne
` (4 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel
Cc: devel, linux-pwm, f.fainelli, devicetree, sboyd, gregkh,
linus.walleij, dmitry.torokhov, linux-gpio, andy.shevchenko,
bcm-kernel-feedback-list, wahrenst, p.zabel, linux-input,
Nicolas Saenz Julienne, bgolaszewski, linux-clk,
linux-arm-kernel, linux-rpi-kernel
Use devm_rpi_firmware_get() so as to make sure we release RPi's firmware
interface when unbinding the device.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v2:
- Use devm_rpi_firmware_get(), instead of remove function
drivers/soc/bcm/raspberrypi-power.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/soc/bcm/raspberrypi-power.c b/drivers/soc/bcm/raspberrypi-power.c
index 5d1aacdd84ef..068715d6e66d 100644
--- a/drivers/soc/bcm/raspberrypi-power.c
+++ b/drivers/soc/bcm/raspberrypi-power.c
@@ -177,7 +177,7 @@ static int rpi_power_probe(struct platform_device *pdev)
return -ENODEV;
}
- rpi_domains->fw = rpi_firmware_get(fw_np);
+ rpi_domains->fw = devm_rpi_firmware_get(&pdev->dev, fw_np);
of_node_put(fw_np);
if (!rpi_domains->fw)
return -EPROBE_DEFER;
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 07/11] staging: vchiq: Release firmware handle on unbind
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
` (5 preceding siblings ...)
2020-11-12 16:36 ` [PATCH v4 06/11] soc: bcm: raspberrypi-power: " Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 08/11] input: raspberrypi-ts: Release firmware handle when not needed Nicolas Saenz Julienne
` (3 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel
Cc: devel, linux-pwm, f.fainelli, devicetree, sboyd, gregkh,
linus.walleij, dmitry.torokhov, linux-gpio, andy.shevchenko,
bcm-kernel-feedback-list, wahrenst, p.zabel, linux-input,
Nicolas Saenz Julienne, bgolaszewski, linux-clk,
linux-arm-kernel, linux-rpi-kernel
Use devm_rpi_firmware_get() so as to make sure we release RPi's firmware
interface when unbinding the device.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v2:
- Use devm_rpi_firmware_get(), instead of remove function
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index f500a7043805..6c196cade4a0 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -2732,7 +2732,7 @@ static int vchiq_probe(struct platform_device *pdev)
return -ENOENT;
}
- drvdata->fw = rpi_firmware_get(fw_node);
+ drvdata->fw = devm_rpi_firmware_get(&pdev->dev, fw_node);
of_node_put(fw_node);
if (!drvdata->fw)
return -EPROBE_DEFER;
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 08/11] input: raspberrypi-ts: Release firmware handle when not needed
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
` (6 preceding siblings ...)
2020-11-12 16:36 ` [PATCH v4 07/11] staging: vchiq: " Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 09/11] dt-bindings: pwm: Add binding for RPi firmware PWM bus Nicolas Saenz Julienne
` (2 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel
Cc: devel, linux-pwm, f.fainelli, devicetree, sboyd, gregkh,
linus.walleij, dmitry.torokhov, linux-gpio, andy.shevchenko,
bcm-kernel-feedback-list, wahrenst, p.zabel, linux-input,
Nicolas Saenz Julienne, bgolaszewski, linux-clk,
linux-arm-kernel, linux-rpi-kernel
Use devm_rpi_firmware_get() so as to make sure we release RPi's firmware
interface when unbinding the device.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v3:
- Release firmware handle in probe function
Changes since v2:
- Use devm_rpi_firmware_get(), instead of remove function
drivers/input/touchscreen/raspberrypi-ts.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/raspberrypi-ts.c b/drivers/input/touchscreen/raspberrypi-ts.c
index ef6aaed217cf..5000f5fd9ec3 100644
--- a/drivers/input/touchscreen/raspberrypi-ts.c
+++ b/drivers/input/touchscreen/raspberrypi-ts.c
@@ -160,7 +160,7 @@ static int rpi_ts_probe(struct platform_device *pdev)
touchbuf = (u32)ts->fw_regs_phys;
error = rpi_firmware_property(fw, RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF,
&touchbuf, sizeof(touchbuf));
-
+ rpi_firmware_put(fw);
if (error || touchbuf != 0) {
dev_warn(dev, "Failed to set touchbuf, %d\n", error);
return error;
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 09/11] dt-bindings: pwm: Add binding for RPi firmware PWM bus
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
` (7 preceding siblings ...)
2020-11-12 16:36 ` [PATCH v4 08/11] input: raspberrypi-ts: Release firmware handle when not needed Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 10/11] DO NOT MERGE: ARM: dts: Add RPi's official PoE hat support Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 11/11] pwm: Add Raspberry Pi Firmware based PWM bus Nicolas Saenz Julienne
10 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel, Nicolas Saenz Julienne,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list, Eric Anholt, Stefan Wahren
Cc: devel, linux-pwm, devicetree, sboyd, gregkh, linus.walleij,
dmitry.torokhov, linux-gpio, andy.shevchenko, Rob Herring,
linux-rpi-kernel, p.zabel, linux-input, bgolaszewski,
Rob Herring, linux-clk, linux-arm-kernel
The PWM bus controlling the fan in RPi's official PoE hat can only be
controlled by the board's co-processor.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: Rob Herring <robh@kernel.org>
---
Changes since v3:
- Fix example
Changes since v1:
- Update bindings to use 2 #pwm-cells
.../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 20 +++++++++++++++++++
.../pwm/raspberrypi,firmware-pwm.h | 13 ++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 include/dt-bindings/pwm/raspberrypi,firmware-pwm.h
diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
index a2c63c8b1d10..38be3ff69609 100644
--- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
+++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
@@ -64,6 +64,21 @@ properties:
- compatible
- "#reset-cells"
+ pwm:
+ type: object
+
+ properties:
+ compatible:
+ const: raspberrypi,firmware-pwm
+
+ "#pwm-cells":
+ # See pwm.yaml in this directory for a description of the cells format.
+ const: 2
+
+ required:
+ - compatible
+ - "#pwm-cells"
+
additionalProperties: false
required:
@@ -87,5 +102,10 @@ examples:
compatible = "raspberrypi,firmware-reset";
#reset-cells = <1>;
};
+
+ pwm: pwm {
+ compatible = "raspberrypi,firmware-pwm";
+ #pwm-cells = <2>;
+ };
};
...
diff --git a/include/dt-bindings/pwm/raspberrypi,firmware-pwm.h b/include/dt-bindings/pwm/raspberrypi,firmware-pwm.h
new file mode 100644
index 000000000000..27c5ce68847b
--- /dev/null
+++ b/include/dt-bindings/pwm/raspberrypi,firmware-pwm.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2020 Nicolas Saenz Julienne
+ * Author: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+ */
+
+#ifndef _DT_BINDINGS_RASPBERRYPI_FIRMWARE_PWM_H
+#define _DT_BINDINGS_RASPBERRYPI_FIRMWARE_PWM_H
+
+#define RASPBERRYPI_FIRMWARE_PWM_POE 0
+#define RASPBERRYPI_FIRMWARE_PWM_NUM 1
+
+#endif
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 10/11] DO NOT MERGE: ARM: dts: Add RPi's official PoE hat support
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
` (8 preceding siblings ...)
2020-11-12 16:36 ` [PATCH v4 09/11] dt-bindings: pwm: Add binding for RPi firmware PWM bus Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
2020-11-12 16:36 ` [PATCH v4 11/11] pwm: Add Raspberry Pi Firmware based PWM bus Nicolas Saenz Julienne
10 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel, Rob Herring, Nicolas Saenz Julienne
Cc: devel, linux-pwm, f.fainelli, devicetree, sboyd, gregkh,
linus.walleij, dmitry.torokhov, linux-gpio, andy.shevchenko,
bcm-kernel-feedback-list, wahrenst, p.zabel, linux-input,
bgolaszewski, linux-clk, linux-arm-kernel, linux-rpi-kernel
This is an example on how to enable the fan on top of RPi's official PoE
hat.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v1:
- Update patch to use 2 pwm cells
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 54 +++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index 09a1182c2936..361db82619a4 100644
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -5,6 +5,7 @@
#include "bcm283x-rpi-usb-peripheral.dtsi"
#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
+#include <dt-bindings/pwm/raspberrypi,firmware-pwm.h>
/ {
compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
@@ -68,6 +69,54 @@ sd_vcc_reg: sd_vcc_reg {
enable-active-high;
gpio = <&expgpio 6 GPIO_ACTIVE_HIGH>;
};
+
+ fan: pwm-fan {
+ compatible = "pwm-fan";
+ cooling-levels = <0 50 150 255>;
+ #cooling-cells = <2>;
+ pwms = <&fwpwm RASPBERRYPI_FIRMWARE_PWM_POE 80000>;
+ };
+
+ thermal-zones {
+ cpu_thermal: cpu-thermal {
+ trips {
+ threshold: trip-point@0 {
+ temperature = <45000>;
+ hysteresis = <5000>;
+ type = "active";
+ };
+
+ target: trip-point@1 {
+ temperature = <50000>;
+ hysteresis = <2000>;
+ type = "active";
+ };
+
+ cpu_hot: cpu_hot@0 {
+ temperature = <55000>;
+ hysteresis = <2000>;
+ type = "active";
+ };
+ };
+
+ cooling-maps {
+ map0 {
+ trip = <&threshold>;
+ cooling-device = <&fan 0 1>;
+ };
+
+ map1 {
+ trip = <&target>;
+ cooling-device = <&fan 1 2>;
+ };
+
+ map2 {
+ trip = <&cpu_hot>;
+ cooling-device = <&fan 2 3>;
+ };
+ };
+ };
+ };
};
&ddc0 {
@@ -103,6 +152,11 @@ reset: reset {
compatible = "raspberrypi,firmware-reset";
#reset-cells = <1>;
};
+
+ fwpwm: pwm {
+ compatible = "raspberrypi,firmware-pwm";
+ #pwm-cells = <2>;
+ };
};
&gpio {
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 11/11] pwm: Add Raspberry Pi Firmware based PWM bus
2020-11-12 16:36 [PATCH v4 00/11] Raspberry Pi PoE HAT fan support Nicolas Saenz Julienne
` (9 preceding siblings ...)
2020-11-12 16:36 ` [PATCH v4 10/11] DO NOT MERGE: ARM: dts: Add RPi's official PoE hat support Nicolas Saenz Julienne
@ 2020-11-12 16:36 ` Nicolas Saenz Julienne
10 siblings, 0 replies; 17+ messages in thread
From: Nicolas Saenz Julienne @ 2020-11-12 16:36 UTC (permalink / raw)
To: u.kleine-koenig, linux-kernel, Thierry Reding, Lee Jones
Cc: devel, linux-pwm, f.fainelli, devicetree, sboyd, gregkh,
linus.walleij, dmitry.torokhov, linux-gpio, andy.shevchenko,
bcm-kernel-feedback-list, wahrenst, p.zabel, linux-input,
Nicolas Saenz Julienne, bgolaszewski, linux-clk,
linux-arm-kernel, linux-rpi-kernel
Adds support to control the PWM bus available in official Raspberry Pi
PoE HAT. Only RPi's co-processor has access to it, so commands have to
be sent through RPi's firmware mailbox interface.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v2:
- Use devm_rpi_firmware_get()
- Rename driver
- Small cleanups
Changes since v1:
- Use default pwm bindings and get rid of xlate() function
- Correct spelling errors
- Correct apply() function
- Round values
- Fix divisions in arm32 mode
- Small cleanups
drivers/pwm/Kconfig | 9 ++
drivers/pwm/Makefile | 1 +
drivers/pwm/pwm-raspberrypi-poe.c | 216 ++++++++++++++++++++++++++++++
3 files changed, 226 insertions(+)
create mode 100644 drivers/pwm/pwm-raspberrypi-poe.c
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index b2a87fd7e8fb..3445984a5a50 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -409,6 +409,15 @@ config PWM_PXA
To compile this driver as a module, choose M here: the module
will be called pwm-pxa.
+config PWM_RASPBERRYPI_POE
+ tristate "Raspberry Pi Firwmware PoE Hat PWM support"
+ # Make sure not 'y' when RASPBERRYPI_FIRMWARE is 'm'. This can only
+ # happen when COMPILE_TEST=y, hence the added !RASPBERRYPI_FIRMWARE.
+ depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
+ help
+ Enable Raspberry Pi firmware controller PWM bus used to control the
+ official RPI PoE hat
+
config PWM_RCAR
tristate "Renesas R-Car PWM support"
depends on ARCH_RENESAS || COMPILE_TEST
diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
index 18b89d7fd092..ed28d7bd4c64 100644
--- a/drivers/pwm/Makefile
+++ b/drivers/pwm/Makefile
@@ -38,6 +38,7 @@ obj-$(CONFIG_PWM_MXS) += pwm-mxs.o
obj-$(CONFIG_PWM_OMAP_DMTIMER) += pwm-omap-dmtimer.o
obj-$(CONFIG_PWM_PCA9685) += pwm-pca9685.o
obj-$(CONFIG_PWM_PXA) += pwm-pxa.o
+obj-$(CONFIG_PWM_RASPBERRYPI_POE) += pwm-raspberrypi-poe.o
obj-$(CONFIG_PWM_RCAR) += pwm-rcar.o
obj-$(CONFIG_PWM_RENESAS_TPU) += pwm-renesas-tpu.o
obj-$(CONFIG_PWM_ROCKCHIP) += pwm-rockchip.o
diff --git a/drivers/pwm/pwm-raspberrypi-poe.c b/drivers/pwm/pwm-raspberrypi-poe.c
new file mode 100644
index 000000000000..91cd826a36f3
--- /dev/null
+++ b/drivers/pwm/pwm-raspberrypi-poe.c
@@ -0,0 +1,216 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+ * For more information on Raspberry Pi's PoE hat see:
+ * https://www.raspberrypi.org/products/poe-hat/
+ *
+ * Limitations:
+ * - No disable bit, so a disabled PWM is simulated by duty_cycle 0
+ * - Only normal polarity
+ * - Fixed 12.5 kHz period
+ *
+ * The current period is completed when HW is reconfigured.
+ */
+
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/pwm.h>
+
+#include <soc/bcm2835/raspberrypi-firmware.h>
+#include <dt-bindings/pwm/raspberrypi,firmware-pwm.h>
+
+#define RPI_PWM_MAX_DUTY 255
+#define RPI_PWM_PERIOD_NS 80000 /* 12.5 kHz */
+
+#define RPI_PWM_CUR_DUTY_REG 0x0
+#define RPI_PWM_DEF_DUTY_REG 0x1
+
+struct raspberrypi_pwm {
+ struct rpi_firmware *firmware;
+ struct pwm_chip chip;
+ unsigned int duty_cycle;
+};
+
+struct raspberrypi_pwm_prop {
+ __le32 reg;
+ __le32 val;
+ __le32 ret;
+} __packed;
+
+static inline struct raspberrypi_pwm *to_raspberrypi_pwm(struct pwm_chip *chip)
+{
+ return container_of(chip, struct raspberrypi_pwm, chip);
+}
+
+static int raspberrypi_pwm_set_property(struct rpi_firmware *firmware,
+ u32 reg, u32 val)
+{
+ struct raspberrypi_pwm_prop msg = {
+ .reg = cpu_to_le32(reg),
+ .val = cpu_to_le32(val),
+ };
+ int ret;
+
+ ret = rpi_firmware_property(firmware, RPI_FIRMWARE_SET_POE_HAT_VAL,
+ &msg, sizeof(msg));
+ if (ret)
+ return ret;
+ if (msg.ret)
+ return -EIO;
+
+ return 0;
+}
+
+static int raspberrypi_pwm_get_property(struct rpi_firmware *firmware,
+ u32 reg, u32 *val)
+{
+ struct raspberrypi_pwm_prop msg = {
+ .reg = reg
+ };
+ int ret;
+
+ ret = rpi_firmware_property(firmware, RPI_FIRMWARE_GET_POE_HAT_VAL,
+ &msg, sizeof(msg));
+ if (ret)
+ return ret;
+ if (msg.ret)
+ return -EIO;
+
+ *val = le32_to_cpu(msg.val);
+
+ return 0;
+}
+
+static void raspberrypi_pwm_get_state(struct pwm_chip *chip,
+ struct pwm_device *pwm,
+ struct pwm_state *state)
+{
+ struct raspberrypi_pwm *rpipwm = to_raspberrypi_pwm(chip);
+
+ state->period = RPI_PWM_PERIOD_NS;
+ state->duty_cycle = DIV_ROUND_CLOSEST(rpipwm->duty_cycle * RPI_PWM_PERIOD_NS,
+ RPI_PWM_MAX_DUTY);
+ state->enabled = !!(rpipwm->duty_cycle);
+ state->polarity = PWM_POLARITY_NORMAL;
+}
+
+static int raspberrypi_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+ const struct pwm_state *state)
+{
+ struct raspberrypi_pwm *rpipwm = to_raspberrypi_pwm(chip);
+ unsigned int duty_cycle;
+ int ret;
+
+ if (state->period < RPI_PWM_PERIOD_NS ||
+ state->polarity != PWM_POLARITY_NORMAL)
+ return -EINVAL;
+
+ if (!state->enabled)
+ duty_cycle = 0;
+ else if (state->duty_cycle < RPI_PWM_PERIOD_NS)
+ duty_cycle = DIV_ROUND_CLOSEST_ULL(state->duty_cycle * RPI_PWM_MAX_DUTY,
+ RPI_PWM_PERIOD_NS);
+ else
+ duty_cycle = RPI_PWM_MAX_DUTY;
+
+ if (duty_cycle == rpipwm->duty_cycle)
+ return 0;
+
+ ret = raspberrypi_pwm_set_property(rpipwm->firmware, RPI_PWM_CUR_DUTY_REG,
+ duty_cycle);
+ if (ret) {
+ dev_err(chip->dev, "Failed to set duty cycle: %d\n", ret);
+ return ret;
+ }
+
+ /*
+ * This sets the default duty cycle after resetting the board, we
+ * updated it every time to mimic Raspberry Pi's downstream's driver
+ * behaviour.
+ */
+ ret = raspberrypi_pwm_set_property(rpipwm->firmware, RPI_PWM_DEF_DUTY_REG,
+ duty_cycle);
+ if (ret) {
+ dev_err(chip->dev, "Failed to set default duty cycle: %d\n", ret);
+ return ret;
+ }
+
+ rpipwm->duty_cycle = duty_cycle;
+
+ return 0;
+}
+
+static const struct pwm_ops raspberrypi_pwm_ops = {
+ .get_state = raspberrypi_pwm_get_state,
+ .apply = raspberrypi_pwm_apply,
+ .owner = THIS_MODULE,
+};
+
+static int raspberrypi_pwm_probe(struct platform_device *pdev)
+{
+ struct device_node *firmware_node;
+ struct device *dev = &pdev->dev;
+ struct rpi_firmware *firmware;
+ struct raspberrypi_pwm *rpipwm;
+ int ret;
+
+ firmware_node = of_get_parent(dev->of_node);
+ if (!firmware_node) {
+ dev_err(dev, "Missing firmware node\n");
+ return -ENOENT;
+ }
+
+ firmware = devm_rpi_firmware_get(&pdev->dev, firmware_node);
+ of_node_put(firmware_node);
+ if (!firmware)
+ return -EPROBE_DEFER;
+
+ rpipwm = devm_kzalloc(&pdev->dev, sizeof(*rpipwm), GFP_KERNEL);
+ if (!rpipwm)
+ return -ENOMEM;
+
+ rpipwm->firmware = firmware;
+ rpipwm->chip.dev = dev;
+ rpipwm->chip.ops = &raspberrypi_pwm_ops;
+ rpipwm->chip.base = -1;
+ rpipwm->chip.npwm = RASPBERRYPI_FIRMWARE_PWM_NUM;
+
+ platform_set_drvdata(pdev, rpipwm);
+
+ ret = raspberrypi_pwm_get_property(rpipwm->firmware, RPI_PWM_CUR_DUTY_REG,
+ &rpipwm->duty_cycle);
+ if (ret) {
+ dev_err(dev, "Failed to get duty cycle: %d\n", ret);
+ return ret;
+ }
+
+ return pwmchip_add(&rpipwm->chip);
+}
+
+static int raspberrypi_pwm_remove(struct platform_device *pdev)
+{
+ struct raspberrypi_pwm *rpipwm = platform_get_drvdata(pdev);
+
+ return pwmchip_remove(&rpipwm->chip);
+}
+
+static const struct of_device_id raspberrypi_pwm_of_match[] = {
+ { .compatible = "raspberrypi,firmware-pwm", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, raspberrypi_pwm_of_match);
+
+static struct platform_driver raspberrypi_pwm_driver = {
+ .driver = {
+ .name = "raspberrypi-pwm",
+ .of_match_table = raspberrypi_pwm_of_match,
+ },
+ .probe = raspberrypi_pwm_probe,
+ .remove = raspberrypi_pwm_remove,
+};
+module_platform_driver(raspberrypi_pwm_driver);
+
+MODULE_AUTHOR("Nicolas Saenz Julienne <nsaenzjulienne@suse.de>");
+MODULE_DESCRIPTION("Raspberry Pi Firwmare Based PWM Bus Driver");
+MODULE_LICENSE("GPL v2");
--
2.29.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread