Re: [PATCH] net: rfkill: gpio: fix memory leak in probe error path
On Thu, Apr 26, 2018 at 09:31:52AM +0200, Johan Hovold wrote:
> Make sure to free the rfkill device in case registration fails during
> probe.
>
> Fixes: 5e7ca3937fbe ("net: rfkill: gpio: convert to resource managed
> allocation")
> Cc: stable <sta...@vger.kernel.org> # 3.13
> Cc: Heikki Krogerus <heikki.kroge...@linux.intel.com>
Good catch. FWIW:
Reviewed-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
> Signed-off-by: Johan Hovold <jo...@kernel.org>
> ---
> net/rfkill/rfkill-gpio.c | 7 ++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
> index 41bd496531d4..00192a996be0 100644
> --- a/net/rfkill/rfkill-gpio.c
> +++ b/net/rfkill/rfkill-gpio.c
> @@ -137,13 +137,18 @@ static int rfkill_gpio_probe(struct platform_device
> *pdev)
>
> ret = rfkill_register(rfkill->rfkill_dev);
> if (ret < 0)
> - return ret;
> + goto err_destroy;
>
> platform_set_drvdata(pdev, rfkill);
>
> dev_info(>dev, "%s device registered.\n", rfkill->name);
>
> return 0;
> +
> +err_destroy:
> + rfkill_destroy(rfkill->rfkill_dev);
> +
> + return ret;
> }
>
> static int rfkill_gpio_remove(struct platform_device *pdev)
> --
> 2.17.0
--
heikki
[PATCHv2 3/4] ARM: tegra: use build-in device properties with rfkill_gpio
Pass the rfkill name and type to the device with properties
instead of driver specific platform data.
Signed-off-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
CC: Alexandre Courbot <gnu...@gmail.com>
CC: Thierry Reding <thierry.red...@gmail.com>
CC: Stephen Warren <swar...@wwwdotorg.org>
---
arch/arm/mach-tegra/board-paz00.c | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-tegra/board-paz00.c
b/arch/arm/mach-tegra/board-paz00.c
index 49d1110..52db8bf 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -17,23 +17,25 @@
*
*/
+#include
#include
#include
-#include
#include "board.h"
-static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
- .name = "wifi_rfkill",
- .type = RFKILL_TYPE_WLAN,
+static struct property_entry __initdata wifi_rfkill_prop[] = {
+ PROPERTY_ENTRY_STRING("name", "wifi_rfkill"),
+ PROPERTY_ENTRY_STRING("type", "wlan"),
+ { },
+};
+
+static struct property_set __initdata wifi_rfkill_pset = {
+ .properties = wifi_rfkill_prop,
};
static struct platform_device wifi_rfkill_device = {
.name = "rfkill_gpio",
.id = -1,
- .dev= {
- .platform_data = _rfkill_platform_data,
- },
};
static struct gpiod_lookup_table wifi_gpio_lookup = {
@@ -47,6 +49,7 @@ static struct gpiod_lookup_table wifi_gpio_lookup = {
void __init tegra_paz00_wifikill_init(void)
{
+ platform_device_add_properties(_rfkill_device, _rfkill_pset);
gpiod_add_lookup_table(_gpio_lookup);
platform_device_register(_rfkill_device);
}
--
2.7.0.rc3
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCHv2 2/4] net: rfkill: gpio: get the name and type from device property
This prepares the driver for removal of platform data.
Signed-off-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
---
net/rfkill/rfkill-gpio.c | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 4b1e3f3..1a9c031 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -81,7 +81,6 @@ static int rfkill_gpio_acpi_probe(struct device *dev,
if (!id)
return -ENODEV;
- rfkill->name = dev_name(dev);
rfkill->type = (unsigned)id->driver_data;
return acpi_dev_add_driver_gpios(ACPI_COMPANION(dev),
@@ -93,12 +92,21 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
struct rfkill_gpio_data *rfkill;
struct gpio_desc *gpio;
+ const char *type_name;
int ret;
rfkill = devm_kzalloc(>dev, sizeof(*rfkill), GFP_KERNEL);
if (!rfkill)
return -ENOMEM;
+ device_property_read_string(>dev, "name", >name);
+ device_property_read_string(>dev, "type", _name);
+
+ if (!rfkill->name)
+ rfkill->name = dev_name(>dev);
+
+ rfkill->type = rfkill_find_type(type_name);
+
if (ACPI_HANDLE(>dev)) {
ret = rfkill_gpio_acpi_probe(>dev, rfkill);
if (ret)
@@ -124,10 +132,8 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
rfkill->shutdown_gpio = gpio;
- /* Make sure at-least one of the GPIO is defined and that
-* a name is specified for this instance
-*/
- if ((!rfkill->reset_gpio && !rfkill->shutdown_gpio) || !rfkill->name) {
+ /* Make sure at-least one GPIO is defined for this instance */
+ if (!rfkill->reset_gpio && !rfkill->shutdown_gpio) {
dev_err(>dev, "invalid platform data\n");
return -EINVAL;
}
--
2.7.0.rc3
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCHv2 4/4] net: rfkill: gpio: remove rfkill_gpio_platform_data
No more users for it.
Signed-off-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
---
include/linux/rfkill-gpio.h | 37 -
net/rfkill/Kconfig | 3 +--
net/rfkill/rfkill-gpio.c| 8
3 files changed, 1 insertion(+), 47 deletions(-)
delete mode 100644 include/linux/rfkill-gpio.h
diff --git a/include/linux/rfkill-gpio.h b/include/linux/rfkill-gpio.h
deleted file mode 100644
index 20bcb55..000
--- a/include/linux/rfkill-gpio.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2011, NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __RFKILL_GPIO_H
-#define __RFKILL_GPIO_H
-
-#include
-#include
-
-/**
- * struct rfkill_gpio_platform_data - platform data for rfkill gpio device.
- * for unused gpio's, the expected value is -1.
- * @name: name for the gpio rf kill instance
- */
-
-struct rfkill_gpio_platform_data {
- char*name;
- enum rfkill_typetype;
-};
-
-#endif /* __RFKILL_GPIO_H */
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
index 598d374..868f1ad 100644
--- a/net/rfkill/Kconfig
+++ b/net/rfkill/Kconfig
@@ -41,5 +41,4 @@ config RFKILL_GPIO
default n
help
If you say yes here you get support of a generic gpio RFKILL
- driver. The platform should fill in the appropriate fields in the
- rfkill_gpio_platform_data structure and pass that to the driver.
+ driver.
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 1a9c031..76c01cb 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -27,8 +27,6 @@
#include
#include
-#include
-
struct rfkill_gpio_data {
const char *name;
enum rfkill_typetype;
@@ -89,7 +87,6 @@ static int rfkill_gpio_acpi_probe(struct device *dev,
static int rfkill_gpio_probe(struct platform_device *pdev)
{
- struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
struct rfkill_gpio_data *rfkill;
struct gpio_desc *gpio;
const char *type_name;
@@ -111,11 +108,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
ret = rfkill_gpio_acpi_probe(>dev, rfkill);
if (ret)
return ret;
- } else if (pdata) {
- rfkill->name = pdata->name;
- rfkill->type = pdata->type;
- } else {
- return -ENODEV;
}
rfkill->clk = devm_clk_get(>dev, NULL);
--
2.7.0.rc3
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCHv2 1/4] net: rfkill: add rfkill_find_type function
Helper for finding the type based on name. Useful if the
type needs to be determined based on device property.
Signed-off-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
---
include/linux/rfkill.h | 15 +
net/rfkill/core.c | 57 +-
2 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index d901078..522ccbc 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -212,6 +212,15 @@ void rfkill_set_states(struct rfkill *rfkill, bool sw,
bool hw);
* @rfkill: rfkill struct to query
*/
bool rfkill_blocked(struct rfkill *rfkill);
+
+/**
+ * rfkill_find_type - Helpper for finding rfkill type by name
+ * @name: the name of the type
+ *
+ * Returns enum rfkill_type that conrresponds the name.
+ */
+enum rfkill_type rfkill_find_type(const char *name);
+
#else /* !RFKILL */
static inline struct rfkill * __must_check
rfkill_alloc(const char *name,
@@ -268,6 +277,12 @@ static inline bool rfkill_blocked(struct rfkill *rfkill)
{
return false;
}
+
+static inline enum rfkill_type rfkill_find_type(const char *name)
+{
+ return RFKILL_TYPE_ALL;
+}
+
#endif /* RFKILL || RFKILL_MODULE */
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index f53bf3b6..e9a5cdf 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -582,6 +582,33 @@ void rfkill_set_states(struct rfkill *rfkill, bool sw,
bool hw)
}
EXPORT_SYMBOL(rfkill_set_states);
+static const char *rfkill_types[NUM_RFKILL_TYPES] = {
+ [RFKILL_TYPE_WLAN] = "wlan",
+ [RFKILL_TYPE_BLUETOOTH] = "bluetooth",
+ [RFKILL_TYPE_UWB] = "ultrawideband",
+ [RFKILL_TYPE_WIMAX] = "wimax",
+ [RFKILL_TYPE_WWAN] = "wwan",
+ [RFKILL_TYPE_GPS] = "gps",
+ [RFKILL_TYPE_FM]= "fm",
+ [RFKILL_TYPE_NFC] = "nfc",
+};
+
+enum rfkill_type rfkill_find_type(const char *name)
+{
+ int i;
+
+ BUILD_BUG_ON(!rfkill_types[NUM_RFKILL_TYPES - 1]);
+
+ if (!name)
+ return RFKILL_TYPE_ALL;
+
+ for (i = 1; i < NUM_RFKILL_TYPES; i++)
+ if (!strcmp(name, rfkill_types[i]))
+ return i;
+ return RFKILL_TYPE_ALL;
+}
+EXPORT_SYMBOL(rfkill_find_type);
+
static ssize_t name_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
@@ -591,38 +618,12 @@ static ssize_t name_show(struct device *dev, struct
device_attribute *attr,
}
static DEVICE_ATTR_RO(name);
-static const char *rfkill_get_type_str(enum rfkill_type type)
-{
- BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_NFC + 1);
-
- switch (type) {
- case RFKILL_TYPE_WLAN:
- return "wlan";
- case RFKILL_TYPE_BLUETOOTH:
- return "bluetooth";
- case RFKILL_TYPE_UWB:
- return "ultrawideband";
- case RFKILL_TYPE_WIMAX:
- return "wimax";
- case RFKILL_TYPE_WWAN:
- return "wwan";
- case RFKILL_TYPE_GPS:
- return "gps";
- case RFKILL_TYPE_FM:
- return "fm";
- case RFKILL_TYPE_NFC:
- return "nfc";
- default:
- BUG();
- }
-}
-
static ssize_t type_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct rfkill *rfkill = to_rfkill(dev);
- return sprintf(buf, "%s\n", rfkill_get_type_str(rfkill->type));
+ return sprintf(buf, "%s\n", rfkill_types[rfkill->type]);
}
static DEVICE_ATTR_RO(type);
@@ -768,7 +769,7 @@ static int rfkill_dev_uevent(struct device *dev, struct
kobj_uevent_env *env)
if (error)
return error;
error = add_uevent_var(env, "RFKILL_TYPE=%s",
- rfkill_get_type_str(rfkill->type));
+ rfkill_types[rfkill->type]);
if (error)
return error;
spin_lock_irqsave(>lock, flags);
--
2.7.0.rc3
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] net: rfkill-gpio: more ACPI IDs for BCM Blutooth modules
These are used with BCM43241 Wi-Fi/Bluetooth Combo Device.
Signed-off-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
---
net/rfkill/rfkill-gpio.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 9312722..ba6d61d 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -164,9 +164,12 @@ static int rfkill_gpio_remove(struct platform_device *pdev)
#ifdef CONFIG_ACPI
static const struct acpi_device_id rfkill_acpi_match[] = {
{ "BCM2E1A", RFKILL_TYPE_BLUETOOTH },
+ { "BCM2E3A", RFKILL_TYPE_BLUETOOTH },
{ "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
+ { "BCM2E3F", RFKILL_TYPE_BLUETOOTH },
{ "BCM2E40", RFKILL_TYPE_BLUETOOTH },
{ "BCM2E64", RFKILL_TYPE_BLUETOOTH },
+ { "BCM2E7B", RFKILL_TYPE_BLUETOOTH },
{ "BCM4752", RFKILL_TYPE_GPS },
{ "LNV4752", RFKILL_TYPE_GPS },
{ },
--
2.6.4
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/5] net: rfkill: add rfkill_find_type function
Hi,
On Thu, Aug 13, 2015 at 11:27:46AM +0200, Johannes Berg wrote:
On Wed, 2015-08-05 at 16:39 +0300, Heikki Krogerus wrote:
+static const char *rfkill_types[NUM_RFKILL_TYPES] = {
+ [RFKILL_TYPE_WLAN] = wlan,
+ [RFKILL_TYPE_BLUETOOTH] = bluetooth,
+ [RFKILL_TYPE_UWB] = ultrawideband,
+ [RFKILL_TYPE_WIMAX] = wimax,
+ [RFKILL_TYPE_WWAN] = wwan,
+ [RFKILL_TYPE_GPS] = gps,
+ [RFKILL_TYPE_FM]= fm,
+ [RFKILL_TYPE_NFC] = nfc,
+};
+
+enum rfkill_type rfkill_find_type(const char *name)
+{
+ int i;
+
+ BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_NFC + 1);
That BUILD_BUG_ON() is now less useful - previously it pointed to the
code that needed to change, now you're left wondering if you don't look
up since it isn't quite that obvious from the code what this does.
Something like
BUILD_BUG_ON(rfkill_types[NUM_RFKILL_TYPES - 1] == NULL);
would be better. As we only add here, that would be safe enough - I've
done something similar in the past that a bit more complicated.
OK, I'll change it.
With that and the static inline fixed (which maybe you could even
remove) I'm fine with all these rfkill patches, but I'm not sure how to
merge them since they affect all kinds of other trees. If desired, I
can apply them, but an ACK from the tegra maintainer would be good :)
Andy and Mika are preparing some changes to the device property
handling. I'll wait for their proposal and prepare next version these
after that.
Thanks,
--
heikki
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/5] net: rfkill: add rfkill_find_type function
On Wed, Aug 05, 2015 at 05:07:29PM +0300, Andy Shevchenko wrote:
On Wed, 2015-08-05 at 16:39 +0300, Heikki Krogerus wrote:
Helper for finding the type based on name. Useful if the
type needs to be determined based on device property.
Signed-off-by: Heikki Krogerus heikki.kroge...@linux.intel.com
---
include/linux/rfkill.h | 15 +
net/rfkill/core.c | 57 +---
--
2 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index d901078..02f563c 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -212,6 +212,15 @@ void rfkill_set_states(struct rfkill *rfkill,
bool sw, bool hw);
* @rfkill: rfkill struct to query
*/
bool rfkill_blocked(struct rfkill *rfkill);
+
+/**
+ * rfkill_find_type - Helpper for finding rfkill type by name
+ * @name: the name of the type
+ *
+ * Returns enum rfkill_type that conrresponds the name.
+ */
+enum rfkill_type rfkill_find_type(const char *name);
+
#else /* !RFKILL */
static inline struct rfkill * __must_check
rfkill_alloc(const char *name,
@@ -268,6 +277,12 @@ static inline bool rfkill_blocked(struct rfkill
*rfkill)
{
return false;
}
+
+static inline enum rfkill_type rfkill_find_type(const char *name)
+{
+ return 0;
Hmm… Besides 0 is implicitly casted to enum type the issue with enums
that you rather have to supply existing enum entry. I would suggest to
add RFKILL_TYPE_UNKNOWN if _ALL is reserved for some use cases.
Why would you add a new type just for this? You do realize it would
require adding specific handling all over the place? RFKILL_TYPE_ALL
(0) is already handled as an invalid type. Confused?
I'll change this and return RFKILL_TYPE_ALL instead of 0.
Thanks,
--
heikki
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 5/5] net: rfkill: gpio: remove rfkill_gpio_platform_data
On Wed, Aug 05, 2015 at 05:15:28PM +0300, Andy Shevchenko wrote:
On Wed, 2015-08-05 at 16:39 +0300, Heikki Krogerus wrote:
No more users for it.
Signed-off-by: Heikki Krogerus heikki.kroge...@linux.intel.com
---
include/linux/rfkill-gpio.h | 37 ---
--
net/rfkill/Kconfig | 3 +--
net/rfkill/rfkill-gpio.c| 8
3 files changed, 1 insertion(+), 47 deletions(-)
delete mode 100644 include/linux/rfkill-gpio.h
diff --git a/include/linux/rfkill-gpio.h b/include/linux/rfkill
-gpio.h
deleted file mode 100644
index 20bcb55..000
--- a/include/linux/rfkill-gpio.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2011, NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or
modify
- * it under the terms of the GNU General Public License as published
by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
but WITHOUT
- * ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
along
- * with this program; if not, write to the Free Software Foundation,
Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __RFKILL_GPIO_H
-#define __RFKILL_GPIO_H
-
-#include linux/types.h
-#include linux/rfkill.h
-
-/**
- * struct rfkill_gpio_platform_data - platform data for rfkill gpio
device.
- * for unused gpio's, the expected value is -1.
- * @name: name for the gpio rf kill instance
- */
-
-struct rfkill_gpio_platform_data {
- char*name;
- enum rfkill_typetype;
-};
-
-#endif /* __RFKILL_GPIO_H */
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
index 4c10e7e..6320890 100644
--- a/net/rfkill/Kconfig
+++ b/net/rfkill/Kconfig
@@ -40,5 +40,4 @@ config RFKILL_GPIO
default n
help
If you say yes here you get support of a generic gpio
RFKILL
- driver. The platform should fill in the appropriate fields
in the
- rfkill_gpio_platform_data structure and pass that to the
driver.
+ driver.
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 07323c3..69d92e1 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -27,8 +27,6 @@
#include linux/acpi.h
#include linux/gpio/consumer.h
-#include linux/rfkill-gpio.h
-
struct rfkill_gpio_data {
const char *name;
enum rfkill_typetype;
@@ -89,7 +87,6 @@ static int rfkill_gpio_acpi_probe(struct device
*dev,
static int rfkill_gpio_probe(struct platform_device *pdev)
{
- struct rfkill_gpio_platform_data *pdata = pdev
-dev.platform_data;
struct rfkill_gpio_data *rfkill;
struct gpio_desc *gpio;
const char *type_name;
@@ -111,11 +108,6 @@ static int rfkill_gpio_probe(struct
platform_device *pdev)
ret = rfkill_gpio_acpi_probe(pdev-dev, rfkill);
if (ret)
return ret;
- } else if (pdata) {
- rfkill-name = pdata-name;
- rfkill-type = pdata-type;
- } else {
- return -ENODEV;
Shouldn't we leave the error path and modify to check if we have device
property set set?
We already check them before this point. After this ACPI will be the
only special case where we know the needed information does not come
from device property and needs separate handling. Otherwise, if the
device properties are not set, we cracefully fail.
Thanks,
--
heikki
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5] device property: helper macros for property entry creation
On Wed, Aug 05, 2015 at 05:02:18PM +0300, Andy Shevchenko wrote:
On Wed, 2015-08-05 at 16:39 +0300, Heikki Krogerus wrote:
Marcos for easier creation of build-in property entries.
Signed-off-by: Heikki Krogerus heikki.kroge...@linux.intel.com
---
include/linux/property.h | 35 +++
1 file changed, 35 insertions(+)
diff --git a/include/linux/property.h b/include/linux/property.h
index 76ebde9..204d899 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -152,6 +152,41 @@ struct property_entry {
} value;
};
+#define PROP_ENTRY_U8(_name_, _val_) { \
PROP_ prefix is too generic.
Maybe DEVPROP_ ? At least for the latter no records in the current
sources.
I disagree with that. IMO this kind of macros should ideally resemble
the structure name they are used to fill (struct property_entry in
this case). And there are already definitions for DEV_PROP_* to
describe the types, so using something like DEVPROP_* here is just
confusing.
If PROP_ENTRY_* is really not good enough, we can change them
PROPERTY_ENTRY_*. But is PROP_ENTRY_* really so bad?
Rafael, what is your opinion?
Thanks,
--
heikki
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/5] device property: helper macros for property entry creation
Marcos for easier creation of build-in property entries.
Signed-off-by: Heikki Krogerus heikki.kroge...@linux.intel.com
---
include/linux/property.h | 35 +++
1 file changed, 35 insertions(+)
diff --git a/include/linux/property.h b/include/linux/property.h
index 76ebde9..204d899 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -152,6 +152,41 @@ struct property_entry {
} value;
};
+#define PROP_ENTRY_U8(_name_, _val_) { \
+ .name = _name_, \
+ .type = DEV_PROP_U8, \
+ .nval = 1, \
+ .value.u8_data = _val_, \
+}
+
+#define PROP_ENTRY_U16(_name_, _val_) { \
+ .name = _name_, \
+ .type = DEV_PROP_U16, \
+ .nval = 1, \
+ .value.u16_data = _val_, \
+}
+
+#define PROP_ENTRY_U32(_name_, _val_) { \
+ .name = _name_, \
+ .type = DEV_PROP_U32, \
+ .nval = 1, \
+ .value.u32_data = _val_, \
+}
+
+#define PROP_ENTRY_U64(_name_, _val_) { \
+ .name = _name_, \
+ .type = DEV_PROP_U64, \
+ .nval = 1, \
+ .value.u64_data = _val_, \
+}
+
+#define PROP_ENTRY_STRING(_name_, _val_) { \
+ .name = _name_, \
+ .type = DEV_PROP_STRING, \
+ .nval = 1, \
+ .value.str = (const char **)_val_, \
+}
+
/**
* struct property_set - Collection of built-in device properties.
* @fwnode: Handle to be pointed to by the fwnode field of struct device.
--
2.4.6
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/5] net: rfkill: add rfkill_find_type function
Helper for finding the type based on name. Useful if the
type needs to be determined based on device property.
Signed-off-by: Heikki Krogerus heikki.kroge...@linux.intel.com
---
include/linux/rfkill.h | 15 +
net/rfkill/core.c | 57 +-
2 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index d901078..02f563c 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -212,6 +212,15 @@ void rfkill_set_states(struct rfkill *rfkill, bool sw,
bool hw);
* @rfkill: rfkill struct to query
*/
bool rfkill_blocked(struct rfkill *rfkill);
+
+/**
+ * rfkill_find_type - Helpper for finding rfkill type by name
+ * @name: the name of the type
+ *
+ * Returns enum rfkill_type that conrresponds the name.
+ */
+enum rfkill_type rfkill_find_type(const char *name);
+
#else /* !RFKILL */
static inline struct rfkill * __must_check
rfkill_alloc(const char *name,
@@ -268,6 +277,12 @@ static inline bool rfkill_blocked(struct rfkill *rfkill)
{
return false;
}
+
+static inline enum rfkill_type rfkill_find_type(const char *name)
+{
+ return 0;
+}
+
#endif /* RFKILL || RFKILL_MODULE */
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index f12149a..53d7a97e 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -574,6 +574,33 @@ void rfkill_set_states(struct rfkill *rfkill, bool sw,
bool hw)
}
EXPORT_SYMBOL(rfkill_set_states);
+static const char *rfkill_types[NUM_RFKILL_TYPES] = {
+ [RFKILL_TYPE_WLAN] = wlan,
+ [RFKILL_TYPE_BLUETOOTH] = bluetooth,
+ [RFKILL_TYPE_UWB] = ultrawideband,
+ [RFKILL_TYPE_WIMAX] = wimax,
+ [RFKILL_TYPE_WWAN] = wwan,
+ [RFKILL_TYPE_GPS] = gps,
+ [RFKILL_TYPE_FM]= fm,
+ [RFKILL_TYPE_NFC] = nfc,
+};
+
+enum rfkill_type rfkill_find_type(const char *name)
+{
+ int i;
+
+ BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_NFC + 1);
+
+ if (!name)
+ return RFKILL_TYPE_ALL;
+
+ for (i = 1; i NUM_RFKILL_TYPES; i++)
+ if (!strcmp(name, rfkill_types[i]))
+ return i;
+ return RFKILL_TYPE_ALL;
+}
+EXPORT_SYMBOL(rfkill_find_type);
+
static ssize_t name_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
@@ -583,38 +610,12 @@ static ssize_t name_show(struct device *dev, struct
device_attribute *attr,
}
static DEVICE_ATTR_RO(name);
-static const char *rfkill_get_type_str(enum rfkill_type type)
-{
- BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_NFC + 1);
-
- switch (type) {
- case RFKILL_TYPE_WLAN:
- return wlan;
- case RFKILL_TYPE_BLUETOOTH:
- return bluetooth;
- case RFKILL_TYPE_UWB:
- return ultrawideband;
- case RFKILL_TYPE_WIMAX:
- return wimax;
- case RFKILL_TYPE_WWAN:
- return wwan;
- case RFKILL_TYPE_GPS:
- return gps;
- case RFKILL_TYPE_FM:
- return fm;
- case RFKILL_TYPE_NFC:
- return nfc;
- default:
- BUG();
- }
-}
-
static ssize_t type_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct rfkill *rfkill = to_rfkill(dev);
- return sprintf(buf, %s\n, rfkill_get_type_str(rfkill-type));
+ return sprintf(buf, %s\n, rfkill_types[rfkill-type]);
}
static DEVICE_ATTR_RO(type);
@@ -760,7 +761,7 @@ static int rfkill_dev_uevent(struct device *dev, struct
kobj_uevent_env *env)
if (error)
return error;
error = add_uevent_var(env, RFKILL_TYPE=%s,
- rfkill_get_type_str(rfkill-type));
+ rfkill_types[rfkill-type]);
if (error)
return error;
spin_lock_irqsave(rfkill-lock, flags);
--
2.4.6
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/5] ARM: tegra: use build-in device properties with rfkill_gpio
Pass the rfkill name and type to the device with properties
instead of driver specific platform data.
Signed-off-by: Heikki Krogerus heikki.kroge...@linux.intel.com
CC: Alexandre Courbot gnu...@gmail.com
CC: Thierry Reding thierry.red...@gmail.com
CC: Stephen Warren swar...@wwwdotorg.org
---
arch/arm/mach-tegra/board-paz00.c | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-tegra/board-paz00.c
b/arch/arm/mach-tegra/board-paz00.c
index fbe74c6..5d8d3a4 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -17,23 +17,25 @@
*
*/
+#include linux/property.h
#include linux/gpio/machine.h
#include linux/platform_device.h
-#include linux/rfkill-gpio.h
#include board.h
-static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
- .name = wifi_rfkill,
- .type = RFKILL_TYPE_WLAN,
+static struct property_entry wifi_rfkill_prop[] = {
+ PROP_ENTRY_STRING(name, wifi_rfkill),
+ PROP_ENTRY_STRING(type, wlan),
+ { },
+};
+
+static struct property_set wifi_rfkill_pset = {
+ .properties = wifi_rfkill_prop,
};
static struct platform_device wifi_rfkill_device = {
.name = rfkill_gpio,
.id = -1,
- .dev= {
- .platform_data = wifi_rfkill_platform_data,
- },
};
static struct gpiod_lookup_table wifi_gpio_lookup = {
@@ -47,6 +49,7 @@ static struct gpiod_lookup_table wifi_gpio_lookup = {
void __init tegra_paz00_wifikill_init(void)
{
+ device_add_property_set(wifi_rfkill_device.dev, wifi_rfkill_pset);
gpiod_add_lookup_table(wifi_gpio_lookup);
platform_device_register(wifi_rfkill_device);
}
--
2.4.6
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 5/5] net: rfkill: gpio: remove rfkill_gpio_platform_data
No more users for it.
Signed-off-by: Heikki Krogerus heikki.kroge...@linux.intel.com
---
include/linux/rfkill-gpio.h | 37 -
net/rfkill/Kconfig | 3 +--
net/rfkill/rfkill-gpio.c| 8
3 files changed, 1 insertion(+), 47 deletions(-)
delete mode 100644 include/linux/rfkill-gpio.h
diff --git a/include/linux/rfkill-gpio.h b/include/linux/rfkill-gpio.h
deleted file mode 100644
index 20bcb55..000
--- a/include/linux/rfkill-gpio.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2011, NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __RFKILL_GPIO_H
-#define __RFKILL_GPIO_H
-
-#include linux/types.h
-#include linux/rfkill.h
-
-/**
- * struct rfkill_gpio_platform_data - platform data for rfkill gpio device.
- * for unused gpio's, the expected value is -1.
- * @name: name for the gpio rf kill instance
- */
-
-struct rfkill_gpio_platform_data {
- char*name;
- enum rfkill_typetype;
-};
-
-#endif /* __RFKILL_GPIO_H */
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
index 4c10e7e..6320890 100644
--- a/net/rfkill/Kconfig
+++ b/net/rfkill/Kconfig
@@ -40,5 +40,4 @@ config RFKILL_GPIO
default n
help
If you say yes here you get support of a generic gpio RFKILL
- driver. The platform should fill in the appropriate fields in the
- rfkill_gpio_platform_data structure and pass that to the driver.
+ driver.
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 07323c3..69d92e1 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -27,8 +27,6 @@
#include linux/acpi.h
#include linux/gpio/consumer.h
-#include linux/rfkill-gpio.h
-
struct rfkill_gpio_data {
const char *name;
enum rfkill_typetype;
@@ -89,7 +87,6 @@ static int rfkill_gpio_acpi_probe(struct device *dev,
static int rfkill_gpio_probe(struct platform_device *pdev)
{
- struct rfkill_gpio_platform_data *pdata = pdev-dev.platform_data;
struct rfkill_gpio_data *rfkill;
struct gpio_desc *gpio;
const char *type_name;
@@ -111,11 +108,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
ret = rfkill_gpio_acpi_probe(pdev-dev, rfkill);
if (ret)
return ret;
- } else if (pdata) {
- rfkill-name = pdata-name;
- rfkill-type = pdata-type;
- } else {
- return -ENODEV;
}
rfkill-clk = devm_clk_get(pdev-dev, NULL);
--
2.4.6
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/5] net: rfkill: gpio: replace platform data with build-in property
The first patch adds a few helper macros for build-in property creation and the second makes it possible to get the rfkill type index based on name. The rest deal with rfkill-gpio. Cheers, Heikki Krogerus (5): device property: helper macros for property entry creation net: rfkill: add rfkill_find_type function net: rfkill: gpio: get the name and type from device property ARM: tegra: use build-in device properties with rfkill_gpio net: rfkill: gpio: remove rfkill_gpio_platform_data arch/arm/mach-tegra/board-paz00.c | 17 +++- include/linux/property.h | 35 include/linux/rfkill-gpio.h | 37 - include/linux/rfkill.h| 15 +++ net/rfkill/Kconfig| 3 +-- net/rfkill/core.c | 57 --- net/rfkill/rfkill-gpio.c | 24 - 7 files changed, 101 insertions(+), 87 deletions(-) delete mode 100644 include/linux/rfkill-gpio.h -- 2.4.6 -- To unsubscribe from this list: send the line unsubscribe linux-wireless in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/5] net: rfkill: gpio: get the name and type from device property
This prepares the driver for removal of platform data.
Signed-off-by: Heikki Krogerus heikki.kroge...@linux.intel.com
---
net/rfkill/rfkill-gpio.c | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index d5d58d9..07323c3 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -81,7 +81,6 @@ static int rfkill_gpio_acpi_probe(struct device *dev,
if (!id)
return -ENODEV;
- rfkill-name = dev_name(dev);
rfkill-type = (unsigned)id-driver_data;
return acpi_dev_add_driver_gpios(ACPI_COMPANION(dev),
@@ -93,12 +92,21 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
struct rfkill_gpio_platform_data *pdata = pdev-dev.platform_data;
struct rfkill_gpio_data *rfkill;
struct gpio_desc *gpio;
+ const char *type_name;
int ret;
rfkill = devm_kzalloc(pdev-dev, sizeof(*rfkill), GFP_KERNEL);
if (!rfkill)
return -ENOMEM;
+ device_property_read_string(pdev-dev, name, rfkill-name);
+ device_property_read_string(pdev-dev, type, type_name);
+
+ if (!rfkill-name)
+ rfkill-name = dev_name(pdev-dev);
+
+ rfkill-type = rfkill_find_type(type_name);
+
if (ACPI_HANDLE(pdev-dev)) {
ret = rfkill_gpio_acpi_probe(pdev-dev, rfkill);
if (ret)
@@ -124,10 +132,8 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
rfkill-shutdown_gpio = gpio;
- /* Make sure at-least one of the GPIO is defined and that
-* a name is specified for this instance
-*/
- if ((!rfkill-reset_gpio !rfkill-shutdown_gpio) || !rfkill-name) {
+ /* Make sure at-least one GPIO is defined for this instance */
+ if (!rfkill-reset_gpio !rfkill-shutdown_gpio) {
dev_err(pdev-dev, invalid platform data\n);
return -EINVAL;
}
--
2.4.6
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] net: rfkill: gpio: Implement host wake up support
On Wed, Oct 08, 2014 at 04:09:50PM +0200, Loic Poulain wrote: Thanks, it sounds good to use a label instead of index. However: - DSD is only compatible with BIOS ACPI 5.1 - gpiod_get_index does not take care of con_id (label) parameter in case of ACPI (acpi_find_gpio). - gpiod_get calls gpiod_get_index with index 0. Any patch ongoing to support con_id parameter with ACPI? Yes. This is the latest version being review as we speak: https://lkml.org/lkml/2014/10/6/530 It is really important you get your firmware fixed. We simply can not rely on the order of the resources like GPIOs in the resource templates. They may be different on every second board/BIOS/configuration/whatever. It's even possible for a ACPI device object to have two (or more) different resource templates describing the same GPIOs in different order which are then selected based on some magic condition, for example user selection in BIOS setup. The existing hardware works with the drivers we have now, and it's not possible to change the BIOS/system firmware on those so we just have to live with them and rely on being able to pick the correct resources based on index. But everything new _must_ use _DSD properties, and ACPI 5.1 in general. So basically your BIOS must produce the ACPI tables according to ACPI 5.1. If you are worried about support for ACPI 5.1 in kernel, don't worry about it, it's almost ready. And in the meantime, _DSD is just something kernel will ignore. Cheers, -- heikki -- To unsubscribe from this list: send the line unsubscribe linux-wireless in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5] net: rfkill: gpio: Configurable GPIO idx
On Wed, Oct 08, 2014 at 10:34:36AM +0200, Loic Poulain wrote:
Some devices don't match the current static gpio mapping:
-BCM4752 (GPS) uses gpio res 0 as host wake irq.
-OBDA8723 (Bluetooth) uses gpio res 0 as controller wake gpio
and res 2 as host wake irq.
To allow more flexibility, this patch introduces an index
map description.
By default, legacy config still used (reset: idx 0;
shutdown: idx 1).
Signed-off-by: Loic Poulain loic.poul...@intel.com
---
net/rfkill/rfkill-gpio.c | 125
+--
1 file changed, 88 insertions(+), 37 deletions(-)
NAK
I'm afraid the order of the GPIOs is platform specific. This would
break the systems already out in the market.
You need to fix your firmware to generate ACPI DSDT according to ACPI
spec. v5.1 [1], which introduces the Device Specific Data (_DSD) and
dt like device properties. We need to be able to request the GPIO
based on the label, not the index, with all new platforms. Here is an
example of the type of_ASL you need to have for the device..
...
Method (_CRS, 0, NotSerialized) // _CRS: Current Resource Settings
{
Name (BBUF, ResourceTemplate ()
{
UartSerialBus (0x0001C200, DataBitsEight, StopBitsOne,
0xFC, LittleEndian, ParityTypeNone, FlowControlNone,
0x0020, 0x0020, \\_SB.PCI0.URT1,
0x00, ResourceConsumer, ,
)
GpioInt (Level, ActiveLow, Exclusive, PullNone, 0x,
\\_SB.GPO3, 0x00, ResourceConsumer, ,
)
{ // Pin list
0x003C
}
GpioIo (Exclusive, PullDefault, 0x, 0x,
IoRestrictionOutputOnly,
\\_SB.GPO3, 0x00, ResourceConsumer, ,
)
{ // Pin list
0x003E
}
GpioIo (Exclusive, PullDefault, 0x, 0x,
IoRestrictionOutputOnly,
\\_SB.GPO3, 0x00, ResourceConsumer, ,
)
{ // Pin list
0x0040
}
})
Return (BBUF) /* \_SB_.PCI0.URT1.BTH1._CRS.BBUF */
}
Name (_DSD, Package ()
{
ToUUID(daffd814-6eba-4d8c-8a91-bc9bbf4aa301),
Package () {
Package () {reset-gpio, Package () {^BTH1, 1, 0, 0}},
Package () {shutdown-gpio, Package () {^BTH1, 2, 0, 0}},
}
})
...
That will make sure you get the correct GPIO the moment we get support
for the ACPI properties [2], regardless of the index. So there is no
need for any changes to the driver.
[1] http://www.uefi.org/sites/default/files/resources/ACPI_5_1release.pdf
[2] https://lkml.org/lkml/2014/9/16/229
--
heikki
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] net: rfkill: gpio: Implement host wake up support
On Wed, Oct 08, 2014 at 10:34:38AM +0200, Loic Poulain wrote:
Some GPIO based rfkill devices can wake their host up from suspend by
toggling an input (from the host perspective) GPIO.
This patch adds a generic support for that feature by registering a
threaded interrupt routine and thus setting the corresponding GPIO as a
wake up source.
Signed-off-by: Loic Poulain loic.poul...@intel.com
---
net/rfkill/rfkill-gpio.c | 49
1 file changed, 49 insertions(+)
To continue my previous answer, for this you could have the following
_DSD..
Name (_DSD, Package ()
{
ToUUID(daffd814-6eba-4d8c-8a91-bc9bbf4aa301),
Package () {
Package () {host_wake-gpio, Package () {^BTH1, 0, 0, 0}},
Package () {reset-gpio, Package () {^BTH1, 1, 0, 0}},
Package () {shutdown-gpio, Package () {^BTH1, 2, 0, 0}},
}
})
And in the driver you can then request it without caring about the
index..
...
gpio = devm_gpiod_get_index(dev, host_wake, 3);
if (!IS_ERR(gpio)) {
ret = gpiod_direction_input(gpio);
if (ret)
return ret;
rfkill-irq = gpiod_to_irq(gpio);
...
Actually, we could just use devm_gpiod_get instead of
devm_gpiod_get_index in this case.
Cheers,
--
heikki
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
