Skip to contentSkip to conversation

gpiolib: fix compiling when CONFIG_GPIO_CDEV_V1 is not defined

PATCH In review Nick Hainke 3 participants 6 messages Dec 2, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpiolib: fix compiling when CONFIG_GPIO_CDEV_V1 is not defined

If CONFIG_GPIO_CDEV_V1 is not defined compiling will fail with:

drivers/gpio/gpiolib-cdev.c: In function 'linereq_ioctl':
drivers/gpio/gpiolib-cdev.c:1468:16: error: implicit declaration of
function 'call_ioctl_locked' [-Werror=implicit-function-declaration]
1468 | return call_ioctl_locked(file, cmd, arg, lr->gdev,

      |                ^~~~~~~~~~~~~~~~~

drivers/gpio/gpiolib-cdev.c: In function 'linereq_poll':
drivers/gpio/gpiolib-cdev.c:1503:16: error: implicit declaration of
function 'call_poll_locked'; did you mean 'wake_up_all_locked'? [-Werror=implicit-function-declaration]
1503 | return call_poll_locked(file, wait, lr->gdev,

                                      linereq_poll_unlocked);
      |                ^~~~~~~~~~~~~~~~
      |                wake_up_all_locked

drivers/gpio/gpiolib-cdev.c: In function 'linereq_read':
drivers/gpio/gpiolib-cdev.c:1566:16: error: implicit declaration of
function 'call_read_locked'; did you mean 'xa_head_locked'? [-Werror=implicit-function-declaration]

 1566 |         return call_read_locked(file, buf, count, f_ps, lr->gdev,
      |                ^~~~~~~~~~~~~~~~
      |                xa_head_locked

Move "call_poll_locked", "call_ioctl_locked", "call_read_locked" and the necessary typedefs "poll_fn", "ioctl_fn", "read_fn" in front of the ifdef-statement checking CONFIG_GPIO_CDEV_V1.

Fixes 98d8b93c6171 ("gpiolib: protect the GPIO device against being dropped while in use by user-space")
---
 drivers/gpio/gpiolib-cdev.c | 50 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/gpio/gpiolib-cdev.c +25 -25
index e8079c1d2e1b..067e26a00775 100644
@@ -61,31 +61,6 @@ static_assert(IS_ALIGNED(sizeof(struct gpio_v2_line_values), 8));
  * GPIO line handle management
  */
 
-#ifdef CONFIG_GPIO_CDEV_V1
-/**
- * struct linehandle_state - contains the state of a userspace handle
- * @gdev: the GPIO device the handle pertains to
- * @label: consumer label used to tag descriptors
- * @descs: the GPIO descriptors held by this handle
- * @num_descs: the number of descriptors held in the descs array
- */
-struct linehandle_state {
-	struct gpio_device *gdev;
-	const char *label;
-	struct gpio_desc *descs[GPIOHANDLES_MAX];
-	u32 num_descs;
-};
-
-#define GPIOHANDLE_REQUEST_VALID_FLAGS \
-	(GPIOHANDLE_REQUEST_INPUT | \
-	GPIOHANDLE_REQUEST_OUTPUT | \
-	GPIOHANDLE_REQUEST_ACTIVE_LOW | \
-	GPIOHANDLE_REQUEST_BIAS_PULL_UP | \
-	GPIOHANDLE_REQUEST_BIAS_PULL_DOWN | \
-	GPIOHANDLE_REQUEST_BIAS_DISABLE | \
-	GPIOHANDLE_REQUEST_OPEN_DRAIN | \
-	GPIOHANDLE_REQUEST_OPEN_SOURCE)
-
 typedef __poll_t (*poll_fn)(struct file *, struct poll_table_struct *);
 typedef long (*ioctl_fn)(struct file *, unsigned int, unsigned long);
 typedef ssize_t (*read_fn)(struct file *, char __user *,
@@ -133,6 +108,31 @@ static ssize_t call_read_locked(struct file *file, char __user *buf,
 	return ret;
 }
 
+#ifdef CONFIG_GPIO_CDEV_V1
+/**
+ * struct linehandle_state - contains the state of a userspace handle
+ * @gdev: the GPIO device the handle pertains to
+ * @label: consumer label used to tag descriptors
+ * @descs: the GPIO descriptors held by this handle
+ * @num_descs: the number of descriptors held in the descs array
+ */
+struct linehandle_state {
+	struct gpio_device *gdev;
+	const char *label;
+	struct gpio_desc *descs[GPIOHANDLES_MAX];
+	u32 num_descs;
+};
+
+#define GPIOHANDLE_REQUEST_VALID_FLAGS \
+	(GPIOHANDLE_REQUEST_INPUT | \
+	GPIOHANDLE_REQUEST_OUTPUT | \
+	GPIOHANDLE_REQUEST_ACTIVE_LOW | \
+	GPIOHANDLE_REQUEST_BIAS_PULL_UP | \
+	GPIOHANDLE_REQUEST_BIAS_PULL_DOWN | \
+	GPIOHANDLE_REQUEST_BIAS_DISABLE | \
+	GPIOHANDLE_REQUEST_OPEN_DRAIN | \
+	GPIOHANDLE_REQUEST_OPEN_SOURCE)
+
 static int linehandle_validate_flags(u32 flags)
 {
 	/* Return an error if an unknown flag is set */
Signature · 1 line
2.38.1
#1 lore raw

On Fri, Dec 02, 2022 at 03:04:54PM +0100, Nick Hainke wrote:

Thank you for the report!

I believe Bart needs to fold it into his patch / PR, because it's not good to send a broken PR to Linus.

Quoted 15 lines

If CONFIG_GPIO_CDEV_V1 is not defined compiling will fail with:

drivers/gpio/gpiolib-cdev.c: In function 'linereq_ioctl':
drivers/gpio/gpiolib-cdev.c:1468:16: error: implicit declaration of
function 'call_ioctl_locked' [-Werror=implicit-function-declaration]
1468 | return call_ioctl_locked(file, cmd, arg, lr->gdev,

      |                ^~~~~~~~~~~~~~~~~

drivers/gpio/gpiolib-cdev.c: In function 'linereq_poll':
drivers/gpio/gpiolib-cdev.c:1503:16: error: implicit declaration of
function 'call_poll_locked'; did you mean 'wake_up_all_locked'? [-Werror=implicit-function-declaration]
1503 | return call_poll_locked(file, wait, lr->gdev,

                                      linereq_poll_unlocked);
      |                ^~~~~~~~~~~~~~~~
      |                wake_up_all_locked
Quoted 7 lines

drivers/gpio/gpiolib-cdev.c: In function 'linereq_read':
drivers/gpio/gpiolib-cdev.c:1566:16: error: implicit declaration of
function 'call_read_locked'; did you mean 'xa_head_locked'? [-Werror=implicit-function-declaration]

 1566 |         return call_read_locked(file, buf, count, f_ps, lr->gdev,
      |                ^~~~~~~~~~~~~~~~
      |                xa_head_locked

Above is a bit too noisy for the commit message. It can be trimmed 3x times.

Quoted 7 lines

Move "call_poll_locked", "call_ioctl_locked", "call_read_locked" and the necessary typedefs "poll_fn", "ioctl_fn", "read_fn" in front of the ifdef-statement checking CONFIG_GPIO_CDEV_V1.

Fixes 98d8b93c6171 ("gpiolib: protect the GPIO device against being dropped while in use by user-space")

Mustn't be blank line(s) in the tag block.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 1 line · Andy Shevchenko

On Fri, Dec 02, 2022 at 03:04:54PM +0100, Nick Hainke wrote:

...

Quoted 7 lines
Quoted 6 lines

drivers/gpio/gpiolib-cdev.c:1468:16: error: implicit declaration of
function 'call_ioctl_locked' [-Werror=implicit-function-declaration]

drivers/gpio/gpiolib-cdev.c:1503:16: error: implicit declaration of
function 'call_poll_locked'; did you mean 'wake_up_all_locked'? [-Werror=implicit-function-declaration]

Quoted 5 lines
Quoted 3 lines

drivers/gpio/gpiolib-cdev.c:1566:16: error: implicit declaration of
function 'call_read_locked'; did you mean 'xa_head_locked'? [-Werror=implicit-function-declaration]

Above is a bit too noisy for the commit message. It can be trimmed 3x times.

To be precise leave only the above and make them as is (i.e. unwrapped even if they are so long), because it's a citation from the compiler.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw
In reply to Andy Shevchenko
Quoted 8 lines · Andy Shevchenko

On Fri, Dec 02, 2022 at 03:04:54PM +0100, Nick Hainke wrote:

Thank you for the report!

I believe Bart needs to fold it into his patch / PR, because it's not good to send a broken PR to Linus.

Ah cr*p, I saw today's next build went fine, so I assumed the patch was good to go and sent the PR.

Yeah, if Nick is fine with that, I'd like to squash it with the offending commit or we'll break bisectability.

Thanks for the report.

Bartosz

author
#4 lore raw
Quoted 2 lines · Bartosz Golaszewski

Yeah, if Nick is fine with that, I'd like to squash it with the offending commit or we'll break bisectability.

Go for it. :)

#5 lore raw
In reply to Nick Hainke
Quoted 40 lines · Nick Hainke

If CONFIG_GPIO_CDEV_V1 is not defined compiling will fail with:

drivers/gpio/gpiolib-cdev.c: In function 'linereq_ioctl':
drivers/gpio/gpiolib-cdev.c:1468:16: error: implicit declaration of
function 'call_ioctl_locked' [-Werror=implicit-function-declaration]
1468 | return call_ioctl_locked(file, cmd, arg, lr->gdev,

      |                ^~~~~~~~~~~~~~~~~

drivers/gpio/gpiolib-cdev.c: In function 'linereq_poll':
drivers/gpio/gpiolib-cdev.c:1503:16: error: implicit declaration of
function 'call_poll_locked'; did you mean 'wake_up_all_locked'? [-Werror=implicit-function-declaration]
1503 | return call_poll_locked(file, wait, lr->gdev,

                                      linereq_poll_unlocked);
      |                ^~~~~~~~~~~~~~~~
      |                wake_up_all_locked

drivers/gpio/gpiolib-cdev.c: In function 'linereq_read':
drivers/gpio/gpiolib-cdev.c:1566:16: error: implicit declaration of
function 'call_read_locked'; did you mean 'xa_head_locked'? [-Werror=implicit-function-declaration]

 1566 |         return call_read_locked(file, buf, count, f_ps, lr->gdev,
      |                ^~~~~~~~~~~~~~~~
      |                xa_head_locked

Move "call_poll_locked", "call_ioctl_locked", "call_read_locked" and the necessary typedefs "poll_fn", "ioctl_fn", "read_fn" in front of the ifdef-statement checking CONFIG_GPIO_CDEV_V1.

Fixes 98d8b93c6171 ("gpiolib: protect the GPIO device against being dropped while in use by user-space")
---
 drivers/gpio/gpiolib-cdev.c | 50 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/gpio/gpiolib-cdev.c +0 -0
index e8079c1d2e1b..067e26a00775 100644

drivers/gpio/gpiolib-cdev.c static_assert(IS_ALIGNED(sizeof(struct gpio_v2_line_values), 8)); · line 62

Quoted 2 lines
drivers/gpio/gpiolib-cdev.c +0 -0
@@ -61,31 +61,6 @@ static_assert(IS_ALIGNED(sizeof(struct gpio_v2_line_values), 8));
  * GPIO line handle management
  */

This comment refers to the below code so should be moved too. Don't worry about it, I'll resend my series with that included.

Bartosz

Quoted 64 lines
drivers/gpio/gpiolib-cdev.c +25 -26
-#ifdef CONFIG_GPIO_CDEV_V1
-/**
- * struct linehandle_state - contains the state of a userspace handle
- * @gdev: the GPIO device the handle pertains to
- * @label: consumer label used to tag descriptors
- * @descs: the GPIO descriptors held by this handle
- * @num_descs: the number of descriptors held in the descs array
- */
-struct linehandle_state {
-       struct gpio_device *gdev;
-       const char *label;
-       struct gpio_desc *descs[GPIOHANDLES_MAX];
-       u32 num_descs;
-};
-
-#define GPIOHANDLE_REQUEST_VALID_FLAGS \
-       (GPIOHANDLE_REQUEST_INPUT | \
-       GPIOHANDLE_REQUEST_OUTPUT | \
-       GPIOHANDLE_REQUEST_ACTIVE_LOW | \
-       GPIOHANDLE_REQUEST_BIAS_PULL_UP | \
-       GPIOHANDLE_REQUEST_BIAS_PULL_DOWN | \
-       GPIOHANDLE_REQUEST_BIAS_DISABLE | \
-       GPIOHANDLE_REQUEST_OPEN_DRAIN | \
-       GPIOHANDLE_REQUEST_OPEN_SOURCE)
-
 typedef __poll_t (*poll_fn)(struct file *, struct poll_table_struct *);
 typedef long (*ioctl_fn)(struct file *, unsigned int, unsigned long);
 typedef ssize_t (*read_fn)(struct file *, char __user *,
@@ -133,6 +108,31 @@ static ssize_t call_read_locked(struct file *file, char __user *buf,
        return ret;
 }
 
+#ifdef CONFIG_GPIO_CDEV_V1
+/**
+ * struct linehandle_state - contains the state of a userspace handle
+ * @gdev: the GPIO device the handle pertains to
+ * @label: consumer label used to tag descriptors
+ * @descs: the GPIO descriptors held by this handle
+ * @num_descs: the number of descriptors held in the descs array
+ */
+struct linehandle_state {
+       struct gpio_device *gdev;
+       const char *label;
+       struct gpio_desc *descs[GPIOHANDLES_MAX];
+       u32 num_descs;
+};
+
+#define GPIOHANDLE_REQUEST_VALID_FLAGS \
+       (GPIOHANDLE_REQUEST_INPUT | \
+       GPIOHANDLE_REQUEST_OUTPUT | \
+       GPIOHANDLE_REQUEST_ACTIVE_LOW | \
+       GPIOHANDLE_REQUEST_BIAS_PULL_UP | \
+       GPIOHANDLE_REQUEST_BIAS_PULL_DOWN | \
+       GPIOHANDLE_REQUEST_BIAS_DISABLE | \
+       GPIOHANDLE_REQUEST_OPEN_DRAIN | \
+       GPIOHANDLE_REQUEST_OPEN_SOURCE)
+
 static int linehandle_validate_flags(u32 flags)
 {
        /* Return an error if an unknown flag is set */
--

2.38.1