drivers/gpio: Altera soft IP GPIO driver
Subsystems (3)
PATCH 1/1 drivers/gpio: Altera soft IP GPIO driver
Add driver support for Altera GPIO soft IP, including interrupts and I/O. Tested on Altera CV SoC board.
--- .../devicetree/bindings/gpio/gpio-altera.txt | 40 +++ drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-altera.c | 375 +++++++++++++++++++++ 4 files changed, 423 insertions(+) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-altera.txt create mode 100644 drivers/gpio/gpio-altera.c
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +40 -0
@@ -0,0 +1,40 @@ +Altera GPIO controller bindings + +Required properties: +- compatible: + - "altr,pio-1.0" +- reg: Physical base address and length of the controller's registers. +- #gpio-cells : Should be two. + - first cell is the gpio offset number + - second cell is used to specify optional parameters (unused) +- gpio-controller : Marks the device node as a GPIO controller. +- #interrupt-cells : Should be 1. +- interrupts: Specify the interrupt. +- interrupt-controller: Mark the device node as an interrupt controller + The first cell is the GPIO number. + +Altera GPIO specific properties: +- width: Width of the GPIO bank, range from 1-32 +- level_trigger: Specifies whether the GPIO interrupt is level trigger. + This field is required if the Altera GPIO controller used has IRQ enabled. + Note: This field is does not specify whether Altera GPIO controller is + level or edge trigger. It is used to detect internally how the trigger is + handled. + +Note: If the Altera GPIO is set to be built as a module, peripherals that uses +Altera GPIO as interrupt-parent should be a module so that the peripheral +doesn't get initialized before Altera GPIO is initialized. + +Example: + +gpio_altr: gpio_altr { + compatible = "altr,pio-1.0"; + reg = <0xff200000 0x10>; + interrupts = <0 45 4>; + width = <32>; + level_trigger = <0>; + #gpio-cells = <2>; + gpio-controller; + #interrupt-cells = <1>; + interrupt-controller; +};
drivers/gpio/Kconfig +7 -0
@@ -119,6 +119,13 @@ config GPIO_GENERIC_PLATFORM help Say yes here to support basic platform_device memory-mapped GPIO controllers. +config GPIO_ALTERA + tristate "Altera GPIO" + select IRQ_DOMAIN + depends on OF_GPIO + help + Say yes here to support the Altera PIO device. + config GPIO_IT8761E tristate "IT8761E GPIO support" depends on X86 # unconditional access to IO space.
drivers/gpio/Makefile +1 -0
@@ -14,6 +14,7 @@ obj-$(CONFIG_GPIO_74X164) += gpio-74x164.o obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o obj-$(CONFIG_GPIO_ADP5520) += gpio-adp5520.o obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5588.o +obj-$(CONFIG_GPIO_ALTERA) += gpio-altera.o obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o
drivers/gpio/gpio-altera.c new file +375 -0
375 lines not on this page · raw message
Signature · 1 line
1.7.11.GIT
Quoted 4 lines · Tien Hock Loh
Add driver support for Altera GPIO soft IP, including interrupts and I/O. Tested on Altera CV SoC board.
Signed-off-by Tien Hock Loh <[email protected]>
(...)
Note: I have come to realize that there is apparently almost zero review on the devicetree-discuss list, is there anyone in the world reviewing new device tree bindings for generality, or is it all up to Linux subsystem maintainers like myself to take care of this?
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 5
Quoted 7 lines
+++
b/Documentation/devicetree/bindings/gpio/gpio-altera.txtDocumentation/devicetree/bindings/gpio/gpio-altera.txt new file +5
-0@@ -0,0 +1,40 @@ +Altera GPIO controller bindings + +Required properties: +- compatible: + - "altr,pio-1.0"
This vendor prefix does not exist in Documentation/devicetree/bindings/vendor-prefixes.txt so atleast add it.
I don't see the point in abbreviating "altera" to "altr" to save two letters, use the full name of the company!
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 9
Quoted 4 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +4
-0+- reg: Physical base address and length of the controller's registers. +- #gpio-cells : Should be two. + - first cell is the gpio offset number + - second cell is used to specify optional parameters (unused)
So why do you add it? Because all other GPIO controllers use it? Or because you will use it for something later?
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 19
Quoted 9 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +9
-0+- gpio-controller : Marks the device node as a GPIO controller. +- #interrupt-cells : Should be 1. +- interrupts: Specify the interrupt. +- interrupt-controller: Mark the device node as an interrupt controller + The first cell is the GPIO number. +Altera GPIO specific properties: +- width: Width of the GPIO bank, range from 1-32 +- level_trigger: Specifies whether the GPIO interrupt is level trigger. + This field is required if the Altera GPIO controller used has IRQ enabled.
Is this how other GPIO controllers do it?
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 22
Quoted 3 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +3
-0+ Note: This field is does not specify whether Altera GPIO controller is + level or edge trigger. It is used to detect internally how the trigger is + handled.
I don't get it, but I guess reading the code will. I suspect this needs editing since DT bindings shall be *reusable* without having to read the code to understand them.
Explain exactly what you mean when you say it is "used to detect internally how the trigger is handled". Used how? Handled how? Internally to what?
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 26
Quoted 3 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +3
-0+Note: If the Altera GPIO is set to be built as a module, peripherals that uses +Altera GPIO as interrupt-parent should be a module so that the peripheral +doesn't get initialized before Altera GPIO is initialized.
Delete this. We do not put Linux-specific information into the device tree bindings.
(...)
Quoted 1 line
(quoted diff) +1
-0+++ b/drivers/gpio/gpio-altera.c
(...)
Quoted 1 line
+#include <
linux/platform_device.h>
Suggest
#include <linux/basic_mmio_gpio.h>
drivers/gpio/gpio-altera.c line 27
Quoted 6 lines
drivers/gpio/gpio-altera.c new file +6
-0+#define ALTERA_GPIO_DATA 0x0 +#define ALTERA_GPIO_DIR 0x4 +#define ALTERA_GPIO_IRQ_MASK 0x8 +#define ALTERA_GPIO_EDGE_CAP 0xc +#define ALTERA_GPIO_OUTSET 0x10 +#define ALTERA_GPIO_OUTCLEAR 0x14
Looking at this is is pretty apparent that you shall use the generic basic MMIO GPIO helper library.
In Kconfig:
select GPIO_GENERIC
Include #include <linux/basic_mmio_gpio.h>
See other GPIO drivers to figure out how to reuse the generic MMIO GPIO helpers. For example the new GRGPIO driver, drivers/gpio/gpio-grgpio.c.
drivers/gpio/gpio-altera.c line 40
Quoted 7 lines
drivers/gpio/gpio-altera.c new file +7
-0+struct altera_gpio_chip { +struct of_mm_gpio_chip mmchip; +struct irq_domain *irq;/* GPIO controller IRQ number */ +spinlock_t gpio_lock;/* Lock used for synchronization */ +bool level_trigger; +int hwirq; +};
Convert inline documentation to kerneldoc. Document the rest of the members as well because I don't understand them, and the documentation for the irqdomain is plain wrong, the other comment is just stating the obvious: tell us *what* is it locking and *why*.
(...)
drivers/gpio/gpio-altera.c line 78
Quoted 7 lines
drivers/gpio/gpio-altera.c new file +7
-0+static int altera_gpio_irq_set_type (struct irq_data *d, +unsigned int type) +{ +/* There is no way to know the soft IP configuration, +so we accept any interrupt types that are supported by the soft +IP. Nothing to do here since it is hardware defined. Just return +OK status to the caller. */
Eh what? Why don't you say pass in the capabilities from the device tree then, if the hardware cannot say what it is capable of, something else has to.
/*
* Please use this multiline comment
* style, it is easier to read.
*/
drivers/gpio/gpio-altera.c line 84
Quoted 6 lines
drivers/gpio/gpio-altera.c new file +6
-0+if (type ==IRQ_TYPE_EDGE_RISING || + type ==IRQ_TYPE_EDGE_FALLING || + type ==IRQ_TYPE_EDGE_BOTH || + type ==IRQ_TYPE_NONE ) { +return 0 ; + }
This is not OK if it is unclear whether this is all supported.
Get that info from somewhere.
Apparently this is exactly what the level trigger field in the device tree defines.
Especially handling both edges is quite tricky, have you actually tested this?
(...)
drivers/gpio/gpio-altera.c line 137
Quoted 5 lines
drivers/gpio/gpio-altera.c new file +5
-0+static int altera_gpio_get(struct gpio_chip *gc, unsigned offset) +static void altera_gpio_set(struct gpio_chip *gc, unsigned offset, int value) +static int altera_gpio_direction_input(struct gpio_chip *gc, unsigned offset) +static int altera_gpio_direction_output(struct gpio_chip *gc, + unsigned offset, int value)
These look like they could all use basic_mmio_gpio instead of being verbatim copies of generic code.
Quoted 15 lines
drivers/gpio/gpio-altera.c new file +15
-0+static int altera_gpio_to_irq (struct gpio_chip *gc,unsigned offset) +static void altera_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +{ +struct altera_gpio_chip *altera_gc =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct of_mm_gpio_chip *mm_gc = &altera_gc->mmchip; +unsigned long status; + +int base; + chip->irq_mask (&desc->irq_data); + +if (altera_gc->level_trigger ==ALTERA_TRIGGER_LEVEL_HIGH ) { +{ +struct of_mm_gpio_chip *mm_gc =to_of_mm_gpio_chip (gc); + struct altera_gpio_chip *altera_gc = container_of(mm_gc,
drivers/gpio/gpio-altera.c line 255
Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10
-0+ struct altera_gpio_chip, mmchip); + +if (altera_gc->irq ==0 ) +return -ENXIO ; +if ((altera_gc->irq && offset) < altera_gc->mmchip.gc.ngpio) +return irq_create_mapping (altera_gc->irq, offset); +else +return -ENXIO ; +} +
So here it is pretty clear what this thing in the device tree means. It means "I am a level triggered chip".
drivers/gpio/gpio-altera.c line 194
Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10
-0+ status =readl (mm_gc->regs +ALTERA_GPIO_DATA ); + status &=readl (mm_gc->regs +ALTERA_GPIO_IRQ_MASK ); + +for (base =0 ; base < mm_gc->gc.ngpio; base++) { +if ((1 << base) & status) { +generic_handle_irq (irq_linear_revmap ( + altera_gc->irq, base)); + } + } + }else {
And if I'm not level triggered I'm edge triggered, right?
Quoted 15 lines
drivers/gpio/gpio-altera.c new file +15
-0+while ((status = (readl (mm_gc->regs +ALTERA_GPIO_EDGE_CAP ) & +readl (mm_gc->regs +ALTERA_GPIO_IRQ_MASK )))) { +writel (status, mm_gc->regs +ALTERA_GPIO_EDGE_CAP ); +for (base =0 ; base < mm_gc->gc.ngpio; base++) { +if ((1 << base) & status) { +generic_handle_irq (irq_linear_revmap ( + altera_gc->irq, base)); + } + } + } + } + + chip->irq_eoi (irq_desc_get_irq_data (desc)); + chip->irq_unmask (&desc->irq_data); +}
(...)
drivers/gpio/gpio-altera.c line 236
Quoted 11 lines
drivers/gpio/gpio-altera.c new file +11
-0+int altera_gpio_probe (struct platform_device *pdev) +{ +struct device_node *node = pdev->dev.of_node; +int id, reg, ret; +struct altera_gpio_chip *altera_gc =devm_kzalloc (&pdev->dev, +sizeof (*altera_gc),GFP_KERNEL ); +if (altera_gc ==NULL ) { + ret = -ENOMEM ; +pr_err ("%s: registration failed with status %d\n" , + node->full_name, ret); +return ret;
dev_err(&pdev->dev, "%s out of memory\n");
return -ENOMEM;
So:
- Use dev_* print primitives
- Print the actual error, or we go back to the 1980ies habit of having to look up an abstract error code in a binder.
- Just return the error.
Quoted 19 lines
drivers/gpio/gpio-altera.c new file +19
-0+ } + altera_gc->irq =0 ; + +spin_lock_init (&altera_gc->gpio_lock); + + id = pdev->id; + +if (of_property_read_u32 (node,"width" , ®)) +/*By default assume full GPIO controller*/ + altera_gc->mmchip.gc.ngpio =32 ; +else + altera_gc->mmchip.gc.ngpio = reg; + +if (altera_gc->mmchip.gc.ngpio >32 ) { +pr_warn ("%s: ngpio is greater than 32, defaulting to 32\n" , + node->full_name); + altera_gc->mmchip.gc.ngpio =32 ; + } +
drivers/gpio/gpio-altera.c line 265
Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10
-0+ altera_gc->mmchip.gc.direction_input = altera_gpio_direction_input; + altera_gc->mmchip.gc.direction_output = altera_gpio_direction_output; + altera_gc->mmchip.gc.get = altera_gpio_get; + altera_gc->mmchip.gc.set = altera_gpio_set; + altera_gc->mmchip.gc.to_irq = altera_gpio_to_irq; + altera_gc->mmchip.gc.owner =THIS_MODULE ; + + ret =of_mm_gpiochip_add (node, &altera_gc->mmchip); +if (ret) + goto err;
Just print the error and return directly.
There is nothing to free or clean up at the err: label.
Quoted 30 lines
drivers/gpio/gpio-altera.c new file +30
-0+platform_set_drvdata (pdev, altera_gc); + +if (of_get_property (node,"interrupts" , ®) ==NULL ) + goto skip_irq; + altera_gc->hwirq =irq_of_parse_and_map (node,0 ); + +if (altera_gc->hwirq ==NO_IRQ ) + goto skip_irq; + + altera_gc->irq =irq_domain_add_linear (node, altera_gc->mmchip.gc.ngpio, + &altera_gpio_irq_ops, altera_gc); + +if (!altera_gc->irq) { + ret = -ENODEV ; + goto dispose_irq; + } + +if (of_property_read_u32 (node,"level_trigger" , ®)) { + ret = -EINVAL ; +pr_err ("%s: level_trigger value not set in device tree\n" , + node->full_name); + goto teardown; + } + altera_gc->level_trigger = reg; + +irq_set_handler_data (altera_gc->hwirq, altera_gc); +irq_set_chained_handler (altera_gc->hwirq, altera_gpio_irq_handler); + +return 0 ; +
drivers/gpio/gpio-altera.c line 306
Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10
-0+teardown: +irq_domain_remove (altera_gc->irq); +dispose_irq: +irq_dispose_mapping (altera_gc->hwirq); +WARN_ON (gpiochip_remove (&altera_gc->mmchip.gc) <0 ); + +err: +pr_err ("%s: registration failed with status %d\n" , + node->full_name, ret); +devm_kfree (&pdev->dev, altera_gc);
No. The devm_* managed resources take care of freeing when probe fails, that is the major idea with it.
Quoted 22 lines
drivers/gpio/gpio-altera.c new file +22
-0+ +return ret; +skip_irq: +return 0 ; +} + +static int altera_gpio_remove (struct platform_device *pdev) +{ +unsigned int irq, i; +int status; +struct altera_gpio_chip *altera_gc =platform_get_drvdata (pdev); + + status =gpiochip_remove (&altera_gc->mmchip.gc); + +if (status <0 ) +return status; + +if (altera_gc->irq) { +irq_dispose_mapping (altera_gc->hwirq); + +for (i =0 ; i < altera_gc->mmchip.gc.ngpio; i++) { + irq =irq_find_mapping (altera_gc->irq, i);
drivers/gpio/gpio-altera.c line 338
Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10
-0+if (irq >0 ) +irq_dispose_mapping (irq); + } + +irq_domain_remove (altera_gc->irq); + } + +irq_set_handler_data (altera_gc->hwirq,NULL ); +irq_set_chained_handler (altera_gc->hwirq,NULL ); +devm_kfree (&pdev->dev, altera_gc);
Again no. You're missing the point with devm*.
drivers/gpio/gpio-altera.c line 350
Quoted 9 lines
drivers/gpio/gpio-altera.c new file +9
-0+#ifdef CONFIG_OF +static struct of_device_id altera_gpio_of_match[] = { + { .compatible ="altr,pio-1.0" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, altera_gpio_of_match); +#else +#define altera_gpio_of_match NULL +#endif
Your driver depends on OF_GPIO, which depends on OF.
Skip the #ifdefs.
Yours,
Linus Walleij
Quoted 26 lines · Linus Walleij
Quoted 4 lines · Tien Hock Loh
Add driver support for Altera GPIO soft IP, including interrupts and I/O. Tested on Altera CV SoC board.
Signed-off-by Tien Hock Loh <[email protected]>(...)
Note: I have come to realize that there is apparently almost zero review on the devicetree-discuss list, is there anyone in the world reviewing new device tree bindings for generality, or is it all up to Linux subsystem maintainers like myself to take care of this?
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 5
Quoted 7 lines
+++
b/Documentation/devicetree/bindings/gpio/gpio-altera.txtDocumentation/devicetree/bindings/gpio/gpio-altera.txt new file +5
-0@@ -0,0 +1,40 @@ +Altera GPIO controller bindings + +Required properties: +- compatible: + - "altr,pio-1.0"This vendor prefix does not exist in
Documentation/devicetree/bindings/vendor-prefixes.txtso atleast add it.
Quoted 2 lines
I don't see the point in abbreviating "altera" to "altr" to save two letters, use the full name of the company!
"altr" is used for all other Altera soft IP driver currently in kernel.org (such as drivers/tty/serial/altera_jtaguart.c and altera_uart.c), thus for consistency, we are using "altr" instead of "altera".
Quoted 9 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 9
Quoted 5 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +4
-0+- reg: Physical base address and length of the controller's registers. +- #gpio-cells : Should be two. + - first cell is the gpio offset number + - second cell is used to specify optional parameters (unused)So why do you add it? Because all other GPIO controllers use it? Or because you will use it for something later?
My bad, I copied over from other GPIO controller and assumed that is how things works. I'll update this.
Quoted 11 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 19
Quoted 9 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +9
-0+- gpio-controller : Marks the device node as a GPIO controller. +- #interrupt-cells : Should be 1. +- interrupts: Specify the interrupt. +- interrupt-controller: Mark the device node as an interrupt controller + The first cell is the GPIO number. +Altera GPIO specific properties: +- width: Width of the GPIO bank, range from 1-32 +- level_trigger: Specifies whether the GPIO interrupt is level trigger. + This field is required if the Altera GPIO controller used has IRQ enabled.Is this how other GPIO controllers do it?
Altera GPIO is configurable during hardware generation time, and cannot be changed in software. Other GPIOs are different because they have a software configurable trigger, thus we need this.
Quoted 5 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 22
Quoted 4 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +3
-0+ Note: This field is does not specify whether Altera GPIO controller is + level or edge trigger. It is used to detect internally how the trigger is + handled.
Quoted 7 lines
I don't get it, but I guess reading the code will. I suspect this needs editing since DT bindings shall be *reusable* without having to read the code to understand them.
Explain exactly what you mean when you say it is "used to detect internally how the trigger is handled". Used how? Handled how? Internally to what?
Sorry that the note is a little ambiguous. I'll update this (as what you replied below as well on the trigger handling).
Quoted 8 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt line 26
Quoted 4 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +3
-0+Note: If the Altera GPIO is set to be built as a module, peripherals that uses +Altera GPIO as interrupt-parent should be a module so that the peripheral +doesn't get initialized before Altera GPIO is initialized.Delete this. We do not put Linux-specific information into the device tree bindings.
Noted.
Quoted 27 lines
(...)
Quoted 1 line
+++
b/drivers/gpio/gpio-altera.c(...)
Quoted 1 line
+#include <
linux/platform_device.h>Suggest
#include <linux/basic_mmio_gpio.h>drivers/gpio/gpio-altera.c line 27
Quoted 6 lines
drivers/gpio/gpio-altera.c new file +6
-0+#define ALTERA_GPIO_DATA 0x0 +#define ALTERA_GPIO_DIR 0x4 +#define ALTERA_GPIO_IRQ_MASK 0x8 +#define ALTERA_GPIO_EDGE_CAP 0xc +#define ALTERA_GPIO_OUTSET 0x10 +#define ALTERA_GPIO_OUTCLEAR 0x14Looking at this is is pretty apparent that you shall use the generic basic MMIO GPIO helper library.
In
Kconfig:
selectGPIO_GENERICInclude #include <
linux/basic_mmio_gpio.h>See other GPIO drivers to figure out how to reuse the generic MMIO GPIO helpers. For example the new GRGPIO driver,
drivers/gpio/gpio-grgpio.c.
Quoted 14 lines
drivers/gpio/gpio-altera.c line 40
Quoted 7 lines
drivers/gpio/gpio-altera.c new file +7
-0+struct altera_gpio_chip { +struct of_mm_gpio_chip mmchip; +struct irq_domain *irq;/* GPIO controller IRQ number */ +spinlock_t gpio_lock;/* Lock used for synchronization */ +bool level_trigger; +int hwirq; +};Convert inline documentation to kerneldoc. Document the rest of the members as well because I don't understand them, and the documentation for the irqdomain is plain wrong, the other comment is just stating the obvious: tell us *what* is it locking and *why*.
Okay.
Quoted 13 lines
(...)
drivers/gpio/gpio-altera.c line 78
Quoted 7 lines
drivers/gpio/gpio-altera.c new file +7
-0+static int altera_gpio_irq_set_type (struct irq_data *d, +unsigned int type) +{ +/* There is no way to know the soft IP configuration, +so we accept any interrupt types that are supported by the soft +IP. Nothing to do here since it is hardware defined. Just return +OK status to the caller. */ Eh what? Why don't you say pass in the capabilities from the device tree then, if the hardware cannot say what it is capable of, something else has to.
I've updated Altera's tool to export this parameter to device tree generated so that we can handle this better.
I'll update this in the next patch.
Quoted 5 lines
/*
* Please use this multiline comment
* style, it is easier to read.
*/
Understood.
Quoted 10 lines
drivers/gpio/gpio-altera.c line 84
Quoted 7 lines
drivers/gpio/gpio-altera.c new file +6
-0+if (type ==IRQ_TYPE_EDGE_RISING || + type ==IRQ_TYPE_EDGE_FALLING || + type ==IRQ_TYPE_EDGE_BOTH || + type ==IRQ_TYPE_NONE ) { +return 0 ; + }This is not OK if it is unclear whether this is all supported.
Quoted 7 lines
Get that info from somewhere.
Apparently this is exactly what the level trigger field in the device tree defines.
Especially handling both edges is quite tricky, have you actually tested this?
As above, I'll update this in the next patch. Yes, the level trigger tells if it is a level triggered. I'll add an edge_type field to identify when it is not level triggered, what is the edge type (rising, falling, both).
I've tested "both edges" on a dev kit to control a LED blinking and it worked correctly.
Quoted 10 lines
(...)
drivers/gpio/gpio-altera.c line 137
Quoted 5 lines
drivers/gpio/gpio-altera.c new file +5
-0+static int altera_gpio_get(struct gpio_chip *gc, unsigned offset) +static void altera_gpio_set(struct gpio_chip *gc, unsigned offset, int value) +static int altera_gpio_direction_input(struct gpio_chip *gc, unsigned offset) +static int altera_gpio_direction_output(struct gpio_chip *gc, + unsigned offset, int value)These look like they could all use
basic_mmio_gpioinstead of being verbatim copies of generic code.
I couldn't update this because the bgpio_init doesn't really support ngpio that is other than 8, 16, 32, and 64. In Altera GPIO IP, the ngpio can be anywhere between 1-32.
Please advise if you disagree.
Quoted 21 lines
Quoted 21 lines
drivers/gpio/gpio-altera.c new file +20
-0+static int altera_gpio_to_irq (struct gpio_chip *gc,unsigned offset) +static void altera_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +{ +struct altera_gpio_chip *altera_gc =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct of_mm_gpio_chip *mm_gc = &altera_gc->mmchip; +unsigned long status; + +int base; + chip->irq_mask (&desc->irq_data); + +if (altera_gc->level_trigger ==ALTERA_TRIGGER_LEVEL_HIGH ) { +{ +struct of_mm_gpio_chip *mm_gc =to_of_mm_gpio_chip (gc); +struct altera_gpio_chip *altera_gc =container_of (mm_gc, + struct altera_gpio_chip, mmchip); + +if (altera_gc->irq ==0 ) +return -ENXIO ; +if ((altera_gc->irq && offset) < altera_gc->mmchip.gc.ngpio)
Quoted 8 lines
drivers/gpio/gpio-altera.c line 173
Quoted 5 lines
drivers/gpio/gpio-altera.c new file +5
-0+return irq_create_mapping (altera_gc->irq, offset); + else + return -ENXIO; +} +So here it is pretty clear what this thing in the device tree means. It means "I am a level triggered chip".
Yes, will do.
Quoted 12 lines
drivers/gpio/gpio-altera.c line 194
Quoted 11 lines
drivers/gpio/gpio-altera.c new file +10
-0+ status =readl (mm_gc->regs +ALTERA_GPIO_DATA ); + status &=readl (mm_gc->regs +ALTERA_GPIO_IRQ_MASK ); + +for (base =0 ; base < mm_gc->gc.ngpio; base++) { +if ((1 << base) & status) { +generic_handle_irq (irq_linear_revmap ( + altera_gc->irq, base)); + } + } + }else {
Quoted 1 line
And if I'm not level triggered I'm edge triggered, right?
Yup, will update this.
Quoted 35 lines
Quoted 16 lines
drivers/gpio/gpio-altera.c new file +15
-0+while ((status = (readl (mm_gc->regs +ALTERA_GPIO_EDGE_CAP ) & +readl (mm_gc->regs +ALTERA_GPIO_IRQ_MASK )))) { +writel (status, mm_gc->regs +ALTERA_GPIO_EDGE_CAP ); +for (base =0 ; base < mm_gc->gc.ngpio; base++) { +if ((1 << base) & status) { +generic_handle_irq (irq_linear_revmap ( + altera_gc->irq, base)); + } + } + } + } + + chip->irq_eoi (irq_desc_get_irq_data (desc)); + chip->irq_unmask (&desc->irq_data); +}(...)
drivers/gpio/gpio-altera.c line 236
Quoted 11 lines
drivers/gpio/gpio-altera.c new file +11
-0+int altera_gpio_probe (struct platform_device *pdev) +{ +struct device_node *node = pdev->dev.of_node; +int id, reg, ret; +struct altera_gpio_chip *altera_gc =devm_kzalloc (&pdev->dev, +sizeof (*altera_gc),GFP_KERNEL ); +if (altera_gc ==NULL ) { + ret = -ENOMEM ; +pr_err ("%s: registration failed with status %d\n" , + node->full_name, ret); +return ret;
dev_err(&pdev->dev, "%s out of memory\n");
return-ENOMEM;So:
Quoted 7 lines
- Use dev_* print primitives
- Print the actual error, or we go back to the 1980ies habit of having to look up an abstract error code in a binder.
- Just return the error.
Understood.
Quoted 34 lines
Quoted 21 lines
drivers/gpio/gpio-altera.c new file +19
-0+ } + altera_gc->irq =0 ; + +spin_lock_init (&altera_gc->gpio_lock); + + id = pdev->id; + +if (of_property_read_u32 (node,"width" , ®)) +/*By default assume full GPIO controller*/ + altera_gc->mmchip.gc.ngpio =32 ; +else + altera_gc->mmchip.gc.ngpio = reg; + +if (altera_gc->mmchip.gc.ngpio >32 ) { +pr_warn ("%s: ngpio is greater than 32, defaulting to 32\n" , + node->full_name); + altera_gc->mmchip.gc.ngpio =32 ; + } +drivers/gpio/gpio-altera.c line 265
Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10
-0+ altera_gc->mmchip.gc.direction_input = altera_gpio_direction_input; + altera_gc->mmchip.gc.direction_output = altera_gpio_direction_output; + altera_gc->mmchip.gc.get = altera_gpio_get; + altera_gc->mmchip.gc.set = altera_gpio_set; + altera_gc->mmchip.gc.to_irq = altera_gpio_to_irq; + altera_gc->mmchip.gc.owner =THIS_MODULE ; + + ret =of_mm_gpiochip_add (node, &altera_gc->mmchip); +if (ret) + goto err;Just print the error and return directly.
Quoted 1 line
There is nothing to free or clean up at the err: label.
Okay
Quoted 36 lines
Quoted 36 lines
drivers/gpio/gpio-altera.c new file +35
-0+platform_set_drvdata (pdev, altera_gc); + +if (of_get_property (node,"interrupts" , ®) ==NULL ) + goto skip_irq; + altera_gc->hwirq =irq_of_parse_and_map (node,0 ); + +if (altera_gc->hwirq ==NO_IRQ ) + goto skip_irq; + + altera_gc->irq =irq_domain_add_linear (node, altera_gc->mmchip.gc.ngpio, + &altera_gpio_irq_ops, altera_gc); + +if (!altera_gc->irq) { + ret = -ENODEV ; + goto dispose_irq; + } + +if (of_property_read_u32 (node,"level_trigger" , ®)) { + ret = -EINVAL ; +pr_err ("%s: level_trigger value not set in device tree\n" , + node->full_name); + goto teardown; + } + altera_gc->level_trigger = reg; + +irq_set_handler_data (altera_gc->hwirq, altera_gc); +irq_set_chained_handler (altera_gc->hwirq, altera_gpio_irq_handler); + +return 0 ; + +teardown: +irq_domain_remove (altera_gc->irq); +dispose_irq: +irq_dispose_mapping (altera_gc->hwirq); +WARN_ON (gpiochip_remove (&altera_gc->mmchip.gc) <0 );
Quoted 9 lines
drivers/gpio/gpio-altera.c line 306
Quoted 5 lines
drivers/gpio/gpio-altera.c new file +5
-0+ +err: +pr_err ("%s: registration failed with status %d\n" , + node->full_name, ret); +devm_kfree (&pdev->dev, altera_gc);No. The devm_* managed resources take care of freeing when probe fails, that is the major idea with it.
Understood
Quoted 26 lines
Quoted 26 lines
drivers/gpio/gpio-altera.c new file +26
-0+ +return ret; +skip_irq: +return 0 ; +} + +static int altera_gpio_remove (struct platform_device *pdev) +{ +unsigned int irq, i; +int status; +struct altera_gpio_chip *altera_gc =platform_get_drvdata (pdev); + + status =gpiochip_remove (&altera_gc->mmchip.gc); + +if (status <0 ) +return status; + +if (altera_gc->irq) { +irq_dispose_mapping (altera_gc->hwirq); + +for (i =0 ; i < altera_gc->mmchip.gc.ngpio; i++) { + irq =irq_find_mapping (altera_gc->irq, i); +if (irq >0 ) +irq_dispose_mapping (irq); + } +
Quoted 8 lines
drivers/gpio/gpio-altera.c line 338
Quoted 6 lines
drivers/gpio/gpio-altera.c new file +6
-0+irq_domain_remove (altera_gc->irq); + } + +irq_set_handler_data (altera_gc->hwirq,NULL ); +irq_set_chained_handler (altera_gc->hwirq,NULL ); +devm_kfree (&pdev->dev, altera_gc);Again no. You're missing the point with devm*.
Understood.
Quoted 13 lines
drivers/gpio/gpio-altera.c line 350
Quoted 10 lines
drivers/gpio/gpio-altera.c new file +9
-0+#ifdef CONFIG_OF +static struct of_device_id altera_gpio_of_match[] = { + { .compatible ="altr,pio-1.0" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, altera_gpio_of_match); +#else +#define altera_gpio_of_match NULL +#endif Your driver depends on
OF_GPIO, which depends on OF.
Quoted 1 line
Skip the #ifdefs.
Will update this.
Quoted 3 lines
Yours,
Linus Walleij