Skip to contentSkip to conversation

drivers/gpio: Altera soft IP GPIO driver

PATCH Superseded [email protected] 3 participants 11 messages Dec 24, 2014 – Mar 5, 2015

Subsystems (3)

v8 of 10 Superseded Latest is v10 →

lore
Share & tools
lore
#0 lore raw

v8 cover drivers/gpio: Altera soft IP GPIO driver

From: Tien Hock Loh <[email protected]>

Adds a new device tree binding and driver for Altera soft GPIO IP. The driver is able to do read/write and allows GPIO to be a interrupt controller.

Tested on Altera GHRD on interrupt handling and IO.

v8:
Using for_each_set_bit
added const for struct definition
removed naggy pr_err
changed from
sort alpha header
remove unused macros
use fixed width data types instead of unsigned long whitespace issue fixes
removed _relaxed function for better compatibility across different CPU changed irq_create_mapping to platform_get_irq
updated implementation to use gpiochip_irqchip_add
reserve interrupt-cells number 2 in device tree binding for future use remove confusing sections on devicetree bindings
Added tristate Kconfig help text

v7:
used dev_warn instead of pr_warn
clean up unnecesarry if else indentation

v6:
Added irq_startup and irq_shutdown
changed bitwise clamping style
cleanup bitwise operation to improve readability change naming of mapped irqs from virq to mapped_irq

v5:
dispose irq_domain mapping correctly
update optional binding description in binding docs

v4:
added vendor prefix to devicetree binding for IP specific properties using MMIO GPIO helper library instead of manually map PIO to memory altera_gpio_chip inline struct documentation to kerneldoc using dev_ print to print a better failure message

v2, v3:
Do not reference NO_IRQ
Updated irq_set_type to only allow the hardware configured irq type

Tien Hock Loh (2):
drivers/gpio: Altera soft IP GPIO driver device tree binding drivers/gpio: Altera soft IP GPIO driver

 .../devicetree/bindings/gpio/gpio-altera.txt       |   43 ++
 MAINTAINERS                                        |    6 +
 drivers/gpio/Kconfig                               |    8 +
 drivers/gpio/Makefile                              |    1 +
 drivers/gpio/gpio-altera.c                         |  410 ++++++++++++++++++++
 5 files changed, 468 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-altera.txt
 create mode 100644 drivers/gpio/gpio-altera.c
#1 lore raw

PATCH v8 1/2 drivers/gpio: Altera soft IP GPIO driver device tree binding

From: Tien Hock Loh <[email protected]>

Adds a new driver device tree binding for Altera soft GPIO IP

---
 .../devicetree/bindings/gpio/gpio-altera.txt       |   43 ++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-altera.txt
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +43 -0
new file mode 100644
index 0000000..649fa02
@@ -0,0 +1,43 @@
+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 2
+  - The first cell is the gpio offset number.
+  - The second cell is reserved and is currently unused.
+- gpio-controller : Marks the device node as a GPIO controller.
+- interrupt-controller: Mark the device node as an interrupt controller
+- #interrupt-cells : Should be 1. The interrupt type is fixed in the hardware.
+  - The first cell is the GPIO offset number within the GPIO controller.
+- interrupts: Specify the interrupt.
+- altr,interrupt-trigger: Specifies the interrupt trigger type the GPIO
+  hardware is synthesized. This field is required if the Altera GPIO controller
+  used has IRQ enabled as the interrupt type is not software controlled,
+  but hardware synthesized. Required if GPIO is used as an interrupt
+  controller. The value is defined in <dt-bindings/interrupt-controller/irq.h>
+  Only the following flags are supported:
+    IRQ_TYPE_EDGE_RISING
+    IRQ_TYPE_EDGE_FALLING
+    IRQ_TYPE_EDGE_BOTH
+    IRQ_TYPE_LEVEL_HIGH
+
+Optional properties:
+- altr,ngpio: Width of the GPIO bank. This defines how many pins the
+  GPIO device has. Ranges between 1-32. Optional and defaults to 32 is not
+  specified.
+
+Example:
+
+gpio_altr: gpio@0xff200000 {
+	compatible = "altr,pio-1.0";
+	reg = <0xff200000 0x10>;
+	interrupts = <0 45 4>;
+	altr,ngpio = <32>;
+	altr,interrupt_trigger = <IRQ_TYPE_EDGE_RISING>;
+	#gpio-cells = <1>;
+	gpio-controller;
+	#interrupt-cells = <1>;
+	interrupt-controller;
+};
Signature · 6 lines
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw

Re: [PATCH v8 1/2] drivers/gpio: Altera soft IP GPIO driver device tree binding

Quoted 16 lines · On Wed, Dec 24, 2014 at 9:22 AM, <[email protected]> wrote:

From: Tien Hock Loh <[email protected]>

Adds a new driver device tree binding for Altera soft GPIO IP

---
 .../devicetree/bindings/gpio/gpio-altera.txt       |   43 ++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-altera.txt
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +0 -0
new file mode 100644
index 0000000..649fa02

Documentation/devicetree/bindings/gpio/gpio-altera.txt line 7

Quoted 7 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +7 -0
@@ -0,0 +1,43 @@
+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 2

Yeah.

Quoted 22 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +22 -0
+  - The first cell is the gpio offset number.
+  - The second cell is reserved and is currently unused.
+- gpio-controller : Marks the device node as a GPIO controller.
+- interrupt-controller: Mark the device node as an interrupt controller
+- #interrupt-cells : Should be 1. The interrupt type is fixed in the hardware.
+  - The first cell is the GPIO offset number within the GPIO controller.
+- interrupts: Specify the interrupt.
+- altr,interrupt-trigger: Specifies the interrupt trigger type the GPIO
+  hardware is synthesized. This field is required if the Altera GPIO controller
+  used has IRQ enabled as the interrupt type is not software controlled,
+  but hardware synthesized. Required if GPIO is used as an interrupt
+  controller. The value is defined in <dt-bindings/interrupt-controller/irq.h>
+  Only the following flags are supported:
+    IRQ_TYPE_EDGE_RISING
+    IRQ_TYPE_EDGE_FALLING
+    IRQ_TYPE_EDGE_BOTH
+    IRQ_TYPE_LEVEL_HIGH
+
+Optional properties:
+- altr,ngpio: Width of the GPIO bank. This defines how many pins the
+  GPIO device has. Ranges between 1-32. Optional and defaults to 32 is not
+  specified.

Documentation/devicetree/bindings/gpio/gpio-altera.txt line 39

Quoted 10 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +10 -0
+
+Example:
+
+gpio_altr: gpio@0xff200000 {
+       compatible = "altr,pio-1.0";
+       reg = <0xff200000 0x10>;
+       interrupts = <0 45 4>;
+       altr,ngpio = <32>;
+       altr,interrupt_trigger = <IRQ_TYPE_EDGE_RISING>;
+       #gpio-cells = <1>;

So why is there one cell in the example?

I know the second cell will describe the interrupt type that is anyway hardcoded but yeah, I guess it is best to work like all other controllers.

If you actually want it onecell that is fine too.

Yours,
Linus Walleij

#3 lore raw

Re: [PATCH v8 1/2] drivers/gpio: Altera soft IP GPIO driver device tree binding

Quoted 63 lines · Linus Walleij
Quoted 16 lines · On Wed, Dec 24, 2014 at 9:22 AM, <[email protected]> wrote:

From: Tien Hock Loh <[email protected]>

Adds a new driver device tree binding for Altera soft GPIO IP

---
 .../devicetree/bindings/gpio/gpio-altera.txt       |   43 ++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-altera.txt
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +0 -0
new file mode 100644
index 0000000..649fa02

Documentation/devicetree/bindings/gpio/gpio-altera.txt line 7

Quoted 7 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +7 -0
@@ -0,0 +1,43 @@
+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 2

Yeah.

Quoted 22 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +22 -0
+  - The first cell is the gpio offset number.
+  - The second cell is reserved and is currently unused.
+- gpio-controller : Marks the device node as a GPIO controller.
+- interrupt-controller: Mark the device node as an interrupt controller
+- #interrupt-cells : Should be 1. The interrupt type is fixed in the hardware.
+  - The first cell is the GPIO offset number within the GPIO controller.
+- interrupts: Specify the interrupt.
+- altr,interrupt-trigger: Specifies the interrupt trigger type the GPIO
+  hardware is synthesized. This field is required if the Altera GPIO controller
+  used has IRQ enabled as the interrupt type is not software controlled,
+  but hardware synthesized. Required if GPIO is used as an interrupt
+  controller. The value is defined in <dt-bindings/interrupt-controller/irq.h>
+  Only the following flags are supported:
+    IRQ_TYPE_EDGE_RISING
+    IRQ_TYPE_EDGE_FALLING
+    IRQ_TYPE_EDGE_BOTH
+    IRQ_TYPE_LEVEL_HIGH
+
+Optional properties:
+- altr,ngpio: Width of the GPIO bank. This defines how many pins the
+  GPIO device has. Ranges between 1-32. Optional and defaults to 32 is not
+  specified.

Documentation/devicetree/bindings/gpio/gpio-altera.txt line 39

Quoted 10 lines
Documentation/devicetree/bindings/gpio/gpio-altera.txt new file +10 -0
+
+Example:
+
+gpio_altr: gpio@0xff200000 {
+       compatible = "altr,pio-1.0";
+       reg = <0xff200000 0x10>;
+       interrupts = <0 45 4>;
+       altr,ngpio = <32>;
+       altr,interrupt_trigger = <IRQ_TYPE_EDGE_RISING>;
+       #gpio-cells = <1>;

So why is there one cell in the example?

Quoted 5 lines

I know the second cell will describe the interrupt type that is anyway hardcoded but yeah, I guess it is best to work like all other controllers.

If you actually want it onecell that is fine too.

It should be set to two cells, I'll update this.

Quoted 3 lines

Yours,
Linus Walleij

Regards
Tien Hock Loh

#4 lore raw

PATCH v8 2/2 drivers/gpio: Altera soft IP GPIO driver

In reply to [email protected]

From: Tien Hock Loh <[email protected]>

Adds a new driver for Altera soft GPIO IP. The driver is able to do read/write and allows GPIO to be a interrupt controller.

Tested on Altera GHRD on interrupt handling and IO.

---
 MAINTAINERS                |    6 +
 drivers/gpio/Kconfig       |    8 +
 drivers/gpio/Makefile      |    1 +
 drivers/gpio/gpio-altera.c |  410 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 425 insertions(+), 0 deletions(-)
 create mode 100644 drivers/gpio/gpio-altera.c
MAINTAINERS +6 -0
index ddb9ac8..62936d5 100644
@@ -563,6 +563,12 @@ S:	Odd Fixes
 L:	[email protected]
 F:	arch/alpha/
 
+ALTERA PIO DRIVER
+M:	Tien Hock Loh <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/gpio/gpio-altera.c
+
 ALTERA TRIPLE SPEED ETHERNET DRIVER
 M:	Vince Bridgers <[email protected]>
 L:	[email protected]
drivers/gpio/Kconfig +8 -0
index 633ec21..e38beff 100644
@@ -156,6 +156,14 @@ config GPIO_DWAPB
 	  Say Y or M here to build support for the Synopsys DesignWare APB
 	  GPIO block.
 
+config GPIO_ALTERA
+       tristate "Altera GPIO"
+       depends on OF_GPIO
+       help
+         Say Y or M here to build support for the Altera PIO device.
+
+	 If driver is built as a module it will be called gpio-altera.
+
 config GPIO_IT8761E
 	tristate "IT8761E GPIO support"
 	depends on X86  # unconditional access to IO space.
drivers/gpio/Makefile +1 -0
index 81755f1..239b28b 100644
@@ -17,6 +17,7 @@ obj-$(CONFIG_GPIO_74XX_MMIO)	+= gpio-74xx-mmio.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_BCM_KONA)	+= gpio-bcm-kona.o
drivers/gpio/gpio-altera.c new file +410 -0

410 lines not on this page · raw message

Signature · 1 line
1.7.1
#5 lore raw
Quoted 2 lines · On Wed, 2014-12-24 at 00:22 -0800, [email protected] wrote:

Adds a new driver for Altera soft GPIO IP. The driver is able to do read/write and allows GPIO to be a interrupt controller.

Some trivial comments, some not quite so trivial.

drivers/gpio/gpio-altera.c

Quoted 1 line
drivers/gpio/gpio-altera.c +0 -0

[]

drivers/gpio/gpio-altera.c line 96

Quoted 6 lines
drivers/gpio/gpio-altera.c +6 -0
+static int altera_gpio_irq_set_type(struct irq_data *d,
+				   unsigned int type)
+{
+	struct altera_gpio_chip *altera_gc = irq_data_get_irq_chip_data(d);
+
+	altera_gc = irq_data_get_irq_chip_data(d);

I presume this multiple initialization of altera_gc is unnecessary duplication.

Quoted 13 lines
drivers/gpio/gpio-altera.c +13 -0
+static void altera_gpio_irq_edge_handler(unsigned int irq,
+					struct irq_desc *desc)
+{
+	struct altera_gpio_chip *altera_gc;
+	struct irq_chip *chip;
+	struct of_mm_gpio_chip *mm_gc;
+	unsigned long status;
+	int i;
+
+	altera_gc = irq_desc_get_handler_data(desc);
+	chip = irq_desc_get_chip(desc);
+	mm_gc = &altera_gc->mmchip;
+

drivers/gpio/gpio-altera.c line 237

Quoted 10 lines
drivers/gpio/gpio-altera.c +10 -0
+	chained_irq_enter(chip, desc);
+
+	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_each_set_bit(i, &status, mm_gc->gc.ngpio) {
+			generic_handle_irq(
+				irq_find_mapping(altera_gc->mmchip.gc.irqdomain
+						, i));

That's kind of unpleasant to read.
It might be better to use a separate these statements and use a temporary for irq_find_mapping()

Quoted 11 lines
drivers/gpio/gpio-altera.c +11 -0
+static void altera_gpio_irq_leveL_high_handler(unsigned int irq,
+					      struct irq_desc *desc)
+{
+	struct altera_gpio_chip *altera_gc;
+	struct irq_chip *chip;
+	struct of_mm_gpio_chip *mm_gc;
+	unsigned long status;
+	int i;
+
+	altera_gc = irq_desc_get_handler_data(desc);
+	chip = irq_desc_get_chip(desc);

drivers/gpio/gpio-altera.c line 265

Quoted 10 lines
drivers/gpio/gpio-altera.c +10 -0
+	mm_gc = &altera_gc->mmchip;
+
+	chained_irq_enter(chip, desc);
+
+	status = readl(mm_gc->regs + ALTERA_GPIO_DATA);
+	status &= readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+
+	for_each_set_bit(i, &status, mm_gc->gc.ngpio) {
+		generic_handle_irq(
+			irq_find_mapping(altera_gc->mmchip.gc.irqdomain, i));

Maybe a temporary here too

drivers/gpio/gpio-altera.c line 293

Quoted 10 lines
drivers/gpio/gpio-altera.c +10 -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;
+
+	altera_gc = devm_kzalloc(&pdev->dev, sizeof(*altera_gc), GFP_KERNEL);
+
+	if (altera_gc == NULL)
+		return -ENOMEM;

No blank line after the devm_kzalloc please and

	if (!altera_gc)

is more common.

drivers/gpio/gpio-altera.c line 358

Quoted 11 lines
drivers/gpio/gpio-altera.c +11 -0
+	if (altera_gc->interrupt_trigger == IRQ_TYPE_LEVEL_HIGH) {
+		gpiochip_set_chained_irqchip(&altera_gc->mmchip.gc,
+			&altera_irq_chip,
+			altera_gc->mapped_irq,
+			altera_gpio_irq_leveL_high_handler);
+	} else {
+		gpiochip_set_chained_irqchip(&altera_gc->mmchip.gc,
+			&altera_irq_chip,
+			altera_gc->mapped_irq,
+			altera_gpio_irq_edge_handler);
+	}

Sometimes using a ?: ternary is smaller code

	gpiochip_set_chained_irqchip(&altera_gc->mmchip.gc,
				     &altera_irq_chip,
				     altera_gc->mapped_irq,
				     altera_gc->interrupt_trigger == IRQ_TYPE_LEVEL_HIGH ?
				     altera_gpio_irq_leveL_high_handler :
				     altera_gpio_irq_edge_handler);
Quoted 1 line
#6 lore raw
Quoted 8 lines · Joe Perches
Quoted 2 lines · On Wed, 2014-12-24 at 00:22 -0800, [email protected]…

Adds a new driver for Altera soft GPIO IP. The driver is able to do read/write and allows GPIO to be a interrupt controller.

Some trivial comments, some not quite so trivial.

drivers/gpio/gpio-altera.c

Quoted 1 line
drivers/gpio/gpio-altera.c +0 -0

[]

Quoted 9 lines

drivers/gpio/gpio-altera.c line 96

Quoted 6 lines
drivers/gpio/gpio-altera.c +6 -0
+static int altera_gpio_irq_set_type(struct irq_data *d,
+				   unsigned int type)
+{
+	struct altera_gpio_chip *altera_gc = irq_data_get_irq_chip_data(d);
+
+	altera_gc = irq_data_get_irq_chip_data(d);

I presume this multiple initialization of altera_gc is unnecessary duplication.

I'll remove this.

Quoted 20 lines
Quoted 20 lines
drivers/gpio/gpio-altera.c +19 -0
+static void altera_gpio_irq_edge_handler(unsigned int irq,
+					struct irq_desc *desc)
+{
+	struct altera_gpio_chip *altera_gc;
+	struct irq_chip *chip;
+	struct of_mm_gpio_chip *mm_gc;
+	unsigned long status;
+	int i;
+
+	altera_gc = irq_desc_get_handler_data(desc);
+	chip = irq_desc_get_chip(desc);
+	mm_gc = &altera_gc->mmchip;
+
+	chained_irq_enter(chip, desc);
+
+	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);
Quoted 9 lines

drivers/gpio/gpio-altera.c line 237

Quoted 4 lines
drivers/gpio/gpio-altera.c +4 -0
+		for_each_set_bit(i, &status, mm_gc->gc.ngpio) {
+			generic_handle_irq(
+				irq_find_mapping(altera_gc->mmchip.gc.irqdomain
+						, i));

That's kind of unpleasant to read.
It might be better to use a separate these statements and use a temporary for irq_find_mapping()

OK I'll fix it.

Quoted 15 lines
Quoted 15 lines
drivers/gpio/gpio-altera.c +15 -0
+static void altera_gpio_irq_leveL_high_handler(unsigned int irq,
+					      struct irq_desc *desc)
+{
+	struct altera_gpio_chip *altera_gc;
+	struct irq_chip *chip;
+	struct of_mm_gpio_chip *mm_gc;
+	unsigned long status;
+	int i;
+
+	altera_gc = irq_desc_get_handler_data(desc);
+	chip = irq_desc_get_chip(desc);
+	mm_gc = &altera_gc->mmchip;
+
+	chained_irq_enter(chip, desc);
+
Quoted 9 lines

drivers/gpio/gpio-altera.c line 265

Quoted 6 lines
drivers/gpio/gpio-altera.c +6 -0
+	status = readl(mm_gc->regs + ALTERA_GPIO_DATA);
+	status &= readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+
+	for_each_set_bit(i, &status, mm_gc->gc.ngpio) {
+		generic_handle_irq(
+			irq_find_mapping(altera_gc->mmchip.gc.irqdomain, i));

Maybe a temporary here too

Yup

Quoted 12 lines

drivers/gpio/gpio-altera.c line 293

Quoted 10 lines
drivers/gpio/gpio-altera.c +10 -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;
+
+	altera_gc = devm_kzalloc(&pdev->dev, sizeof(*altera_gc), GFP_KERNEL);
+
+	if (altera_gc == NULL)
+		return -ENOMEM;

No blank line after the devm_kzalloc please and

Quoted 4 lines
	if (!altera_gc)

is more common.

OK noted.

Quoted 14 lines

drivers/gpio/gpio-altera.c line 358

Quoted 11 lines
drivers/gpio/gpio-altera.c +11 -0
+	if (altera_gc->interrupt_trigger == IRQ_TYPE_LEVEL_HIGH) {
+		gpiochip_set_chained_irqchip(&altera_gc->mmchip.gc,
+			&altera_irq_chip,
+			altera_gc->mapped_irq,
+			altera_gpio_irq_leveL_high_handler);
+	} else {
+		gpiochip_set_chained_irqchip(&altera_gc->mmchip.gc,
+			&altera_irq_chip,
+			altera_gc->mapped_irq,
+			altera_gpio_irq_edge_handler);
+	}

Sometimes using a ?: ternary is smaller code

Quoted 8 lines
	gpiochip_set_chained_irqchip(&altera_gc->mmchip.gc,
				     &altera_irq_chip,
				     altera_gc->mapped_irq,
				     altera_gc->interrupt_trigger == IRQ_TYPE_LEVEL_HIGH ?
				     altera_gpio_irq_leveL_high_handler :
				     altera_gpio_irq_edge_handler);
Quoted 1 line

Yup I'll fix it.

Regards,
Tien Hock Loh

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#7 lore raw
In reply to [email protected]
Quoted 8 lines · On Wed, Dec 24, 2014 at 9:22 AM, <[email protected]> wrote:

From: Tien Hock Loh <[email protected]>

Adds a new driver for Altera soft GPIO IP. The driver is able to do read/write and allows GPIO to be a interrupt controller.

Tested on Altera GHRD on interrupt handling and IO.

(...)

drivers/gpio/Kconfig config GPIO_DWAPB · line 161

Quoted 3 lines
drivers/gpio/Kconfig +3 -0
+config GPIO_ALTERA
+       tristate "Altera GPIO"
+       depends on OF_GPIO

select GPIOLIB_IRQCHIP

Also, I think (see below)

select GENERIC_GPIO

Quoted 1 line

+#include <linux/gpio.h>

#include <linux/gpio/driver.h>

should be just fine instead of this old header.

drivers/gpio/gpio-altera.c line 23

Quoted 4 lines
drivers/gpio/gpio-altera.c new file +4 -0
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>

Should not be needed.

drivers/gpio/gpio-altera.c line 25

Quoted 2 lines
drivers/gpio/gpio-altera.c new file +2 -0
+#include <linux/irqchip/chained_irq.h>
+#include <linux/irqdomain.h>

None of these should be needed.

drivers/gpio/gpio-altera.c line 31

Quoted 6 lines
drivers/gpio/gpio-altera.c new file +6 -0
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_irq.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>

#include <linux/basic_mmio_gpio.h>

with GENERIC_GPIO (see below).

Quoted 73 lines
drivers/gpio/gpio-altera.c new file +73 -0
+
+#define ALTERA_GPIO_MAX_NGPIO          32
+#define ALTERA_GPIO_DATA               0x0
+#define ALTERA_GPIO_DIR                        0x4
+#define ALTERA_GPIO_IRQ_MASK           0x8
+#define ALTERA_GPIO_EDGE_CAP           0xc
+
+/**
+* struct altera_gpio_chip
+* @mmchip              : memory mapped chip structure.
+* @gpio_lock           : synchronization lock so that new irq/set/get requests
+                         will be blocked until the current one completes.
+* @interrupt_trigger   : specifies the hardware configured IRQ trigger type
+                         (rising, falling, both, high)
+* @mapped_irq          : kernel mapped irq number.
+*/
+struct altera_gpio_chip {
+       struct of_mm_gpio_chip mmchip;
+       spinlock_t gpio_lock;
+       int interrupt_trigger;
+       int mapped_irq;
+};
+
+static void altera_gpio_irq_unmask(struct irq_data *d)
+{
+       struct altera_gpio_chip *altera_gc;
+       struct of_mm_gpio_chip *mm_gc;
+       unsigned long flags;
+       u32 intmask;
+
+       altera_gc = irq_data_get_irq_chip_data(d);
+       mm_gc = &altera_gc->mmchip;
+
+       spin_lock_irqsave(&altera_gc->gpio_lock, flags);
+       intmask = readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       /* Set ALTERA_GPIO_IRQ_MASK bit to unmask */
+       intmask |= BIT(irqd_to_hwirq(d));
+       writel(intmask, mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       spin_unlock_irqrestore(&altera_gc->gpio_lock, flags);
+}
+
+static void altera_gpio_irq_mask(struct irq_data *d)
+{
+       struct altera_gpio_chip *altera_gc;
+       struct of_mm_gpio_chip *mm_gc;
+       unsigned long flags;
+       u32 intmask;
+
+       altera_gc = irq_data_get_irq_chip_data(d);
+       mm_gc = &altera_gc->mmchip;
+
+       spin_lock_irqsave(&altera_gc->gpio_lock, flags);
+       intmask = readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       /* Clear ALTERA_GPIO_IRQ_MASK bit to mask */
+       intmask &= ~BIT(irqd_to_hwirq(d));
+       writel(intmask, mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       spin_unlock_irqrestore(&altera_gc->gpio_lock, flags);
+}
+
+static int altera_gpio_irq_set_type(struct irq_data *d,
+                                  unsigned int type)
+{
+       struct altera_gpio_chip *altera_gc = irq_data_get_irq_chip_data(d);
+
+       altera_gc = irq_data_get_irq_chip_data(d);
+
+       if (type == IRQ_TYPE_NONE)
+               return 0;
+       if (type == IRQ_TYPE_LEVEL_HIGH &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_LEVEL_HIGH)
+               return 0;
+       if (type == IRQ_TYPE_EDGE_RISING &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_EDGE_RISING)

drivers/gpio/gpio-altera.c line 114

Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10 -0
+               return 0;
+       if (type == IRQ_TYPE_EDGE_FALLING &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_EDGE_FALLING)
+               return 0;
+       if (type == IRQ_TYPE_EDGE_BOTH &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_EDGE_BOTH)
+               return 0;
+
+       return -EINVAL;
+}

It took me a while to understand this. Write in a comment that this is a hardware that is synthesized for a specific trigger type, and that there is no way to software-configure the trigger type.

drivers/gpio/gpio-altera.c line 126

Quoted 12 lines
drivers/gpio/gpio-altera.c new file +12 -0
+
+static unsigned int altera_gpio_irq_startup(struct irq_data *d)
+{
+       altera_gpio_irq_unmask(d);
+
+       return 0;
+}
+
+static void altera_gpio_irq_shutdown(struct irq_data *d)
+{
+       altera_gpio_irq_mask(d);
+}

Instead of those pointless functions just assign the unmask/mask functions in the vtable right below.

drivers/gpio/gpio-altera.c line 134

Quoted 8 lines
drivers/gpio/gpio-altera.c new file +8 -0
+
+static struct irq_chip altera_irq_chip = {
+       .name           = "altera-gpio",
+       .irq_mask       = altera_gpio_irq_mask,
+       .irq_unmask     = altera_gpio_irq_unmask,
+       .irq_set_type   = altera_gpio_irq_set_type,
+       .irq_startup    = altera_gpio_irq_startup,
+       .irq_shutdown   = altera_gpio_irq_shutdown,

i.e. here.

Quoted 67 lines
drivers/gpio/gpio-altera.c new file +67 -0
+static int altera_gpio_get(struct gpio_chip *gc, unsigned offset)
+{
+       struct of_mm_gpio_chip *mm_gc;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+
+       return !!(readl(mm_gc->regs + ALTERA_GPIO_DATA) >> offset);
+}
+
+static void altera_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
+{
+       struct of_mm_gpio_chip *mm_gc;
+       struct altera_gpio_chip *chip;
+       unsigned long flags;
+       unsigned int data_reg;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+       chip = container_of(mm_gc, struct altera_gpio_chip, mmchip);
+
+       spin_lock_irqsave(&chip->gpio_lock, flags);
+       data_reg = readl(mm_gc->regs + ALTERA_GPIO_DATA);
+       if (value)
+               data_reg |= BIT(offset);
+       else
+               data_reg &= ~BIT(offset);
+       writel(data_reg, mm_gc->regs + ALTERA_GPIO_DATA);
+       spin_unlock_irqrestore(&chip->gpio_lock, flags);
+}
+
+static int altera_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
+{
+       struct of_mm_gpio_chip *mm_gc;
+       struct altera_gpio_chip *chip;
+       unsigned long flags;
+       unsigned int gpio_ddr;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+       chip = container_of(mm_gc, struct altera_gpio_chip, mmchip);
+
+       spin_lock_irqsave(&chip->gpio_lock, flags);
+       /* Set pin as input, assumes software controlled IP */
+       gpio_ddr = readl(mm_gc->regs + ALTERA_GPIO_DIR);
+       gpio_ddr &= ~BIT(offset);
+       writel(gpio_ddr, mm_gc->regs + ALTERA_GPIO_DIR);
+       spin_unlock_irqrestore(&chip->gpio_lock, flags);
+
+       return 0;
+}
+
+static int altera_gpio_direction_output(struct gpio_chip *gc,
+               unsigned offset, int value)
+{
+       struct of_mm_gpio_chip *mm_gc;
+       struct altera_gpio_chip *chip;
+       unsigned long flags;
+       unsigned int data_reg, gpio_ddr;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+       chip = container_of(mm_gc, struct altera_gpio_chip, mmchip);
+
+       spin_lock_irqsave(&chip->gpio_lock, flags);
+       /* Sets the GPIO value */
+       data_reg = readl(mm_gc->regs + ALTERA_GPIO_DATA);
+       if (value)
+               data_reg |= BIT(offset);
+       else
+               data_reg &= ~BIT(offset);

drivers/gpio/gpio-altera.c line 213

Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10 -0
+       writel(data_reg, mm_gc->regs + ALTERA_GPIO_DATA);
+
+       /* Set pin as output, assumes software controlled IP */
+       gpio_ddr = readl(mm_gc->regs + ALTERA_GPIO_DIR);
+       gpio_ddr |= BIT(offset);
+       writel(gpio_ddr, mm_gc->regs + ALTERA_GPIO_DIR);
+       spin_unlock_irqrestore(&chip->gpio_lock, flags);
+
+       return 0;
+}

These calls seem like pretty vanilla generic GPIO functions. Use GENERIC_GPIO with bgpio_init() and override the default functions only when really needed.

See e.g. drivers/gpio/gpio-74xx-mmio.c

drivers/gpio/gpio-altera.c line 282

Quoted 13 lines
drivers/gpio/gpio-altera.c new file +13 -0
+static int altera_gpio_irq_map(struct irq_domain *h, unsigned int irq,
+                             irq_hw_number_t hw_irq_num)
+{
+       irq_set_chip_data(irq, h->host_data);
+       irq_set_chip_and_handler(irq, &altera_irq_chip, handle_level_irq);
+
+       return 0;
+}
+
+static const struct irq_domain_ops altera_gpio_irq_ops = {
+       .map    = altera_gpio_irq_map,
+       .xlate = irq_domain_xlate_onecell,
+};

This looks like some leftover garbage. You don't need them with GPIOLIB_IRQCHIP so delete these two.

drivers/gpio/gpio-altera.c line 376

Quoted 8 lines
drivers/gpio/gpio-altera.c new file +8 -0
+static int altera_gpio_remove(struct platform_device *pdev)
+{
+       struct altera_gpio_chip *altera_gc = platform_get_drvdata(pdev);
+
+       gpiochip_remove(&altera_gc->mmchip.gc);
+
+       irq_set_handler_data(altera_gc->mapped_irq, NULL);
+       irq_set_chained_handler(altera_gc->mapped_irq, NULL);

These two calls should not be needed either.

Yours,
Linus Walleij

#8 lore raw
Quoted 49 lines · Linus Walleij
Quoted 8 lines · On Wed, Dec 24, 2014 at 9:22 AM, <[email protected]…

From: Tien Hock Loh <[email protected]>

Adds a new driver for Altera soft GPIO IP. The driver is able to do read/write and allows GPIO to be a interrupt controller.

Tested on Altera GHRD on interrupt handling and IO.

(...)

drivers/gpio/Kconfig config GPIO_DWAPB · line 161

Quoted 3 lines
drivers/gpio/Kconfig +3 -0
+config GPIO_ALTERA
+       tristate "Altera GPIO"
+       depends on OF_GPIO

select GPIOLIB_IRQCHIP

Also, I think (see below)

select GENERIC_GPIO

Quoted 1 line

+#include <linux/gpio.h>

#include <linux/gpio/driver.h>

should be just fine instead of this old header.

drivers/gpio/gpio-altera.c line 23

Quoted 4 lines
drivers/gpio/gpio-altera.c new file +4 -0
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>

Should not be needed.

drivers/gpio/gpio-altera.c line 25

Quoted 2 lines
drivers/gpio/gpio-altera.c new file +2 -0
+#include <linux/irqchip/chained_irq.h>
+#include <linux/irqdomain.h>

None of these should be needed.

drivers/gpio/gpio-altera.c line 31

Quoted 6 lines
drivers/gpio/gpio-altera.c new file +6 -0
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_irq.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>

#include <linux/basic_mmio_gpio.h>

Quoted 1 line

with GENERIC_GPIO (see below).

OK

Quoted 80 lines
Quoted 80 lines
drivers/gpio/gpio-altera.c new file +80 -0
+
+#define ALTERA_GPIO_MAX_NGPIO          32
+#define ALTERA_GPIO_DATA               0x0
+#define ALTERA_GPIO_DIR                        0x4
+#define ALTERA_GPIO_IRQ_MASK           0x8
+#define ALTERA_GPIO_EDGE_CAP           0xc
+
+/**
+* struct altera_gpio_chip
+* @mmchip              : memory mapped chip structure.
+* @gpio_lock           : synchronization lock so that new irq/set/get requests
+                         will be blocked until the current one completes.
+* @interrupt_trigger   : specifies the hardware configured IRQ trigger type
+                         (rising, falling, both, high)
+* @mapped_irq          : kernel mapped irq number.
+*/
+struct altera_gpio_chip {
+       struct of_mm_gpio_chip mmchip;
+       spinlock_t gpio_lock;
+       int interrupt_trigger;
+       int mapped_irq;
+};
+
+static void altera_gpio_irq_unmask(struct irq_data *d)
+{
+       struct altera_gpio_chip *altera_gc;
+       struct of_mm_gpio_chip *mm_gc;
+       unsigned long flags;
+       u32 intmask;
+
+       altera_gc = irq_data_get_irq_chip_data(d);
+       mm_gc = &altera_gc->mmchip;
+
+       spin_lock_irqsave(&altera_gc->gpio_lock, flags);
+       intmask = readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       /* Set ALTERA_GPIO_IRQ_MASK bit to unmask */
+       intmask |= BIT(irqd_to_hwirq(d));
+       writel(intmask, mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       spin_unlock_irqrestore(&altera_gc->gpio_lock, flags);
+}
+
+static void altera_gpio_irq_mask(struct irq_data *d)
+{
+       struct altera_gpio_chip *altera_gc;
+       struct of_mm_gpio_chip *mm_gc;
+       unsigned long flags;
+       u32 intmask;
+
+       altera_gc = irq_data_get_irq_chip_data(d);
+       mm_gc = &altera_gc->mmchip;
+
+       spin_lock_irqsave(&altera_gc->gpio_lock, flags);
+       intmask = readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       /* Clear ALTERA_GPIO_IRQ_MASK bit to mask */
+       intmask &= ~BIT(irqd_to_hwirq(d));
+       writel(intmask, mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       spin_unlock_irqrestore(&altera_gc->gpio_lock, flags);
+}
+
+static int altera_gpio_irq_set_type(struct irq_data *d,
+                                  unsigned int type)
+{
+       struct altera_gpio_chip *altera_gc = irq_data_get_irq_chip_data(d);
+
+       altera_gc = irq_data_get_irq_chip_data(d);
+
+       if (type == IRQ_TYPE_NONE)
+               return 0;
+       if (type == IRQ_TYPE_LEVEL_HIGH &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_LEVEL_HIGH)
+               return 0;
+       if (type == IRQ_TYPE_EDGE_RISING &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_EDGE_RISING)
+               return 0;
+       if (type == IRQ_TYPE_EDGE_FALLING &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_EDGE_FALLING)
+               return 0;
+       if (type == IRQ_TYPE_EDGE_BOTH &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_EDGE_BOTH)
+               return 0;
Quoted 9 lines

drivers/gpio/gpio-altera.c line 114

Quoted 3 lines
drivers/gpio/gpio-altera.c new file +3 -0
+
+       return -EINVAL;
+}

It took me a while to understand this. Write in a comment that this is a hardware that is synthesized for a specific trigger type, and that there is no way to software-configure the trigger type.

OK noted.

Quoted 7 lines
Quoted 7 lines
drivers/gpio/gpio-altera.c new file +7 -0
+
+static unsigned int altera_gpio_irq_startup(struct irq_data *d)
+{
+       altera_gpio_irq_unmask(d);
+
+       return 0;
+}
Quoted 9 lines

drivers/gpio/gpio-altera.c line 126

Quoted 5 lines
drivers/gpio/gpio-altera.c new file +5 -0
+
+static void altera_gpio_irq_shutdown(struct irq_data *d)
+{
+       altera_gpio_irq_mask(d);
+}

Instead of those pointless functions just assign the unmask/mask functions in the vtable right below.

OK

Quoted 93 lines

drivers/gpio/gpio-altera.c line 134

Quoted 8 lines
drivers/gpio/gpio-altera.c new file +8 -0
+
+static struct irq_chip altera_irq_chip = {
+       .name           = "altera-gpio",
+       .irq_mask       = altera_gpio_irq_mask,
+       .irq_unmask     = altera_gpio_irq_unmask,
+       .irq_set_type   = altera_gpio_irq_set_type,
+       .irq_startup    = altera_gpio_irq_startup,
+       .irq_shutdown   = altera_gpio_irq_shutdown,

i.e. here.

Quoted 67 lines
drivers/gpio/gpio-altera.c new file +67 -0
+static int altera_gpio_get(struct gpio_chip *gc, unsigned offset)
+{
+       struct of_mm_gpio_chip *mm_gc;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+
+       return !!(readl(mm_gc->regs + ALTERA_GPIO_DATA) >> offset);
+}
+
+static void altera_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
+{
+       struct of_mm_gpio_chip *mm_gc;
+       struct altera_gpio_chip *chip;
+       unsigned long flags;
+       unsigned int data_reg;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+       chip = container_of(mm_gc, struct altera_gpio_chip, mmchip);
+
+       spin_lock_irqsave(&chip->gpio_lock, flags);
+       data_reg = readl(mm_gc->regs + ALTERA_GPIO_DATA);
+       if (value)
+               data_reg |= BIT(offset);
+       else
+               data_reg &= ~BIT(offset);
+       writel(data_reg, mm_gc->regs + ALTERA_GPIO_DATA);
+       spin_unlock_irqrestore(&chip->gpio_lock, flags);
+}
+
+static int altera_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
+{
+       struct of_mm_gpio_chip *mm_gc;
+       struct altera_gpio_chip *chip;
+       unsigned long flags;
+       unsigned int gpio_ddr;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+       chip = container_of(mm_gc, struct altera_gpio_chip, mmchip);
+
+       spin_lock_irqsave(&chip->gpio_lock, flags);
+       /* Set pin as input, assumes software controlled IP */
+       gpio_ddr = readl(mm_gc->regs + ALTERA_GPIO_DIR);
+       gpio_ddr &= ~BIT(offset);
+       writel(gpio_ddr, mm_gc->regs + ALTERA_GPIO_DIR);
+       spin_unlock_irqrestore(&chip->gpio_lock, flags);
+
+       return 0;
+}
+
+static int altera_gpio_direction_output(struct gpio_chip *gc,
+               unsigned offset, int value)
+{
+       struct of_mm_gpio_chip *mm_gc;
+       struct altera_gpio_chip *chip;
+       unsigned long flags;
+       unsigned int data_reg, gpio_ddr;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+       chip = container_of(mm_gc, struct altera_gpio_chip, mmchip);
+
+       spin_lock_irqsave(&chip->gpio_lock, flags);
+       /* Sets the GPIO value */
+       data_reg = readl(mm_gc->regs + ALTERA_GPIO_DATA);
+       if (value)
+               data_reg |= BIT(offset);
+       else
+               data_reg &= ~BIT(offset);

drivers/gpio/gpio-altera.c line 213

Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10 -0
+       writel(data_reg, mm_gc->regs + ALTERA_GPIO_DATA);
+
+       /* Set pin as output, assumes software controlled IP */
+       gpio_ddr = readl(mm_gc->regs + ALTERA_GPIO_DIR);
+       gpio_ddr |= BIT(offset);
+       writel(gpio_ddr, mm_gc->regs + ALTERA_GPIO_DIR);
+       spin_unlock_irqrestore(&chip->gpio_lock, flags);
+
+       return 0;
+}

These calls seem like pretty vanilla generic GPIO functions. Use GENERIC_GPIO with bgpio_init() and override the default functions only when really needed.

Quoted 2 lines

See e.g. drivers/gpio/gpio-74xx-mmio.c

OK, I'll update this.

Quoted 8 lines
Quoted 8 lines
drivers/gpio/gpio-altera.c new file +8 -0
+static int altera_gpio_irq_map(struct irq_domain *h, unsigned int irq,
+                             irq_hw_number_t hw_irq_num)
+{
+       irq_set_chip_data(irq, h->host_data);
+       irq_set_chip_and_handler(irq, &altera_irq_chip, handle_level_irq);
+
+       return 0;
+}
Quoted 9 lines

drivers/gpio/gpio-altera.c line 282

Quoted 5 lines
drivers/gpio/gpio-altera.c new file +5 -0
+
+static const struct irq_domain_ops altera_gpio_irq_ops = {
+       .map    = altera_gpio_irq_map,
+       .xlate = irq_domain_xlate_onecell,
+};

This looks like some leftover garbage. You don't need them with GPIOLIB_IRQCHIP so delete these two.

OK

Quoted 11 lines

drivers/gpio/gpio-altera.c line 376

Quoted 8 lines
drivers/gpio/gpio-altera.c new file +8 -0
+static int altera_gpio_remove(struct platform_device *pdev)
+{
+       struct altera_gpio_chip *altera_gc = platform_get_drvdata(pdev);
+
+       gpiochip_remove(&altera_gc->mmchip.gc);
+
+       irq_set_handler_data(altera_gc->mapped_irq, NULL);
+       irq_set_chained_handler(altera_gc->mapped_irq, NULL);

These two calls should not be needed either.

OK

Quoted 2 lines

Yours,
Linus Walleij

Regards,
Tien Hock Loh
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#9 lore raw
Quoted 256 lines · Tien Hock Loh
Quoted 49 lines · Linus Walleij
Quoted 8 lines · On Wed, Dec 24, 2014 at 9:22 AM, <[email protected]> wrote:

From: Tien Hock Loh <[email protected]>

Adds a new driver for Altera soft GPIO IP. The driver is able to do read/write and allows GPIO to be a interrupt controller.

Tested on Altera GHRD on interrupt handling and IO.

(...)

drivers/gpio/Kconfig config GPIO_DWAPB · line 161

Quoted 3 lines
drivers/gpio/Kconfig +3 -0
+config GPIO_ALTERA
+       tristate "Altera GPIO"
+       depends on OF_GPIO

select GPIOLIB_IRQCHIP

Also, I think (see below)

select GENERIC_GPIO

Quoted 1 line

+#include <linux/gpio.h>

#include <linux/gpio/driver.h>

should be just fine instead of this old header.

drivers/gpio/gpio-altera.c line 23

Quoted 4 lines
drivers/gpio/gpio-altera.c new file +4 -0
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>

Should not be needed.

drivers/gpio/gpio-altera.c line 25

Quoted 2 lines
drivers/gpio/gpio-altera.c new file +2 -0
+#include <linux/irqchip/chained_irq.h>
+#include <linux/irqdomain.h>

None of these should be needed.

drivers/gpio/gpio-altera.c line 31

Quoted 6 lines
drivers/gpio/gpio-altera.c new file +6 -0
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_irq.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>

#include <linux/basic_mmio_gpio.h>

Quoted 1 line

with GENERIC_GPIO (see below).

OK

Quoted 80 lines
Quoted 80 lines
drivers/gpio/gpio-altera.c new file +80 -0
+
+#define ALTERA_GPIO_MAX_NGPIO          32
+#define ALTERA_GPIO_DATA               0x0
+#define ALTERA_GPIO_DIR                        0x4
+#define ALTERA_GPIO_IRQ_MASK           0x8
+#define ALTERA_GPIO_EDGE_CAP           0xc
+
+/**
+* struct altera_gpio_chip
+* @mmchip              : memory mapped chip structure.
+* @gpio_lock           : synchronization lock so that new irq/set/get requests
+                         will be blocked until the current one completes.
+* @interrupt_trigger   : specifies the hardware configured IRQ trigger type
+                         (rising, falling, both, high)
+* @mapped_irq          : kernel mapped irq number.
+*/
+struct altera_gpio_chip {
+       struct of_mm_gpio_chip mmchip;
+       spinlock_t gpio_lock;
+       int interrupt_trigger;
+       int mapped_irq;
+};
+
+static void altera_gpio_irq_unmask(struct irq_data *d)
+{
+       struct altera_gpio_chip *altera_gc;
+       struct of_mm_gpio_chip *mm_gc;
+       unsigned long flags;
+       u32 intmask;
+
+       altera_gc = irq_data_get_irq_chip_data(d);
+       mm_gc = &altera_gc->mmchip;
+
+       spin_lock_irqsave(&altera_gc->gpio_lock, flags);
+       intmask = readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       /* Set ALTERA_GPIO_IRQ_MASK bit to unmask */
+       intmask |= BIT(irqd_to_hwirq(d));
+       writel(intmask, mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       spin_unlock_irqrestore(&altera_gc->gpio_lock, flags);
+}
+
+static void altera_gpio_irq_mask(struct irq_data *d)
+{
+       struct altera_gpio_chip *altera_gc;
+       struct of_mm_gpio_chip *mm_gc;
+       unsigned long flags;
+       u32 intmask;
+
+       altera_gc = irq_data_get_irq_chip_data(d);
+       mm_gc = &altera_gc->mmchip;
+
+       spin_lock_irqsave(&altera_gc->gpio_lock, flags);
+       intmask = readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       /* Clear ALTERA_GPIO_IRQ_MASK bit to mask */
+       intmask &= ~BIT(irqd_to_hwirq(d));
+       writel(intmask, mm_gc->regs + ALTERA_GPIO_IRQ_MASK);
+       spin_unlock_irqrestore(&altera_gc->gpio_lock, flags);
+}
+
+static int altera_gpio_irq_set_type(struct irq_data *d,
+                                  unsigned int type)
+{
+       struct altera_gpio_chip *altera_gc = irq_data_get_irq_chip_data(d);
+
+       altera_gc = irq_data_get_irq_chip_data(d);
+
+       if (type == IRQ_TYPE_NONE)
+               return 0;
+       if (type == IRQ_TYPE_LEVEL_HIGH &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_LEVEL_HIGH)
+               return 0;
+       if (type == IRQ_TYPE_EDGE_RISING &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_EDGE_RISING)
+               return 0;
+       if (type == IRQ_TYPE_EDGE_FALLING &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_EDGE_FALLING)
+               return 0;
+       if (type == IRQ_TYPE_EDGE_BOTH &&
+               altera_gc->interrupt_trigger == IRQ_TYPE_EDGE_BOTH)
+               return 0;
Quoted 9 lines

drivers/gpio/gpio-altera.c line 114

Quoted 3 lines
drivers/gpio/gpio-altera.c new file +3 -0
+
+       return -EINVAL;
+}

It took me a while to understand this. Write in a comment that this is a hardware that is synthesized for a specific trigger type, and that there is no way to software-configure the trigger type.

OK noted.

Quoted 7 lines
Quoted 7 lines
drivers/gpio/gpio-altera.c new file +7 -0
+
+static unsigned int altera_gpio_irq_startup(struct irq_data *d)
+{
+       altera_gpio_irq_unmask(d);
+
+       return 0;
+}
Quoted 9 lines

drivers/gpio/gpio-altera.c line 126

Quoted 5 lines
drivers/gpio/gpio-altera.c new file +5 -0
+
+static void altera_gpio_irq_shutdown(struct irq_data *d)
+{
+       altera_gpio_irq_mask(d);
+}

Instead of those pointless functions just assign the unmask/mask functions in the vtable right below.

OK

Quoted 93 lines

drivers/gpio/gpio-altera.c line 134

Quoted 8 lines
drivers/gpio/gpio-altera.c new file +8 -0
+
+static struct irq_chip altera_irq_chip = {
+       .name           = "altera-gpio",
+       .irq_mask       = altera_gpio_irq_mask,
+       .irq_unmask     = altera_gpio_irq_unmask,
+       .irq_set_type   = altera_gpio_irq_set_type,
+       .irq_startup    = altera_gpio_irq_startup,
+       .irq_shutdown   = altera_gpio_irq_shutdown,

i.e. here.

Quoted 67 lines
drivers/gpio/gpio-altera.c new file +67 -0
+static int altera_gpio_get(struct gpio_chip *gc, unsigned offset)
+{
+       struct of_mm_gpio_chip *mm_gc;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+
+       return !!(readl(mm_gc->regs + ALTERA_GPIO_DATA) >> offset);
+}
+
+static void altera_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
+{
+       struct of_mm_gpio_chip *mm_gc;
+       struct altera_gpio_chip *chip;
+       unsigned long flags;
+       unsigned int data_reg;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+       chip = container_of(mm_gc, struct altera_gpio_chip, mmchip);
+
+       spin_lock_irqsave(&chip->gpio_lock, flags);
+       data_reg = readl(mm_gc->regs + ALTERA_GPIO_DATA);
+       if (value)
+               data_reg |= BIT(offset);
+       else
+               data_reg &= ~BIT(offset);
+       writel(data_reg, mm_gc->regs + ALTERA_GPIO_DATA);
+       spin_unlock_irqrestore(&chip->gpio_lock, flags);
+}
+
+static int altera_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
+{
+       struct of_mm_gpio_chip *mm_gc;
+       struct altera_gpio_chip *chip;
+       unsigned long flags;
+       unsigned int gpio_ddr;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+       chip = container_of(mm_gc, struct altera_gpio_chip, mmchip);
+
+       spin_lock_irqsave(&chip->gpio_lock, flags);
+       /* Set pin as input, assumes software controlled IP */
+       gpio_ddr = readl(mm_gc->regs + ALTERA_GPIO_DIR);
+       gpio_ddr &= ~BIT(offset);
+       writel(gpio_ddr, mm_gc->regs + ALTERA_GPIO_DIR);
+       spin_unlock_irqrestore(&chip->gpio_lock, flags);
+
+       return 0;
+}
+
+static int altera_gpio_direction_output(struct gpio_chip *gc,
+               unsigned offset, int value)
+{
+       struct of_mm_gpio_chip *mm_gc;
+       struct altera_gpio_chip *chip;
+       unsigned long flags;
+       unsigned int data_reg, gpio_ddr;
+
+       mm_gc = to_of_mm_gpio_chip(gc);
+       chip = container_of(mm_gc, struct altera_gpio_chip, mmchip);
+
+       spin_lock_irqsave(&chip->gpio_lock, flags);
+       /* Sets the GPIO value */
+       data_reg = readl(mm_gc->regs + ALTERA_GPIO_DATA);
+       if (value)
+               data_reg |= BIT(offset);
+       else
+               data_reg &= ~BIT(offset);

drivers/gpio/gpio-altera.c line 213

Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10 -0
+       writel(data_reg, mm_gc->regs + ALTERA_GPIO_DATA);
+
+       /* Set pin as output, assumes software controlled IP */
+       gpio_ddr = readl(mm_gc->regs + ALTERA_GPIO_DIR);
+       gpio_ddr |= BIT(offset);
+       writel(gpio_ddr, mm_gc->regs + ALTERA_GPIO_DIR);
+       spin_unlock_irqrestore(&chip->gpio_lock, flags);
+
+       return 0;
+}

These calls seem like pretty vanilla generic GPIO functions. Use GENERIC_GPIO with bgpio_init() and override the default functions only when really needed.

Quoted 3 lines
Quoted 2 lines

See e.g. drivers/gpio/gpio-74xx-mmio.c

OK, I'll update this.

I just recall that I couldn't use bgpio because the number of gpio pins is configurable and may not be multiple of 8, thus I'll not be updating this to use bgpio.

Quoted 31 lines
Quoted 18 lines
Quoted 4 lines
drivers/gpio/gpio-altera.c new file +3 -0
+static int altera_gpio_irq_map(struct irq_domain *h, unsigned int irq,
+                             irq_hw_number_t hw_irq_num)
+{

drivers/gpio/gpio-altera.c line 282

Quoted 10 lines
drivers/gpio/gpio-altera.c new file +10 -0
+       irq_set_chip_data(irq, h->host_data);
+       irq_set_chip_and_handler(irq, &altera_irq_chip, handle_level_irq);
+
+       return 0;
+}
+
+static const struct irq_domain_ops altera_gpio_irq_ops = {
+       .map    = altera_gpio_irq_map,
+       .xlate = irq_domain_xlate_onecell,
+};

This looks like some leftover garbage. You don't need them with GPIOLIB_IRQCHIP so delete these two.

OK

Quoted 11 lines

drivers/gpio/gpio-altera.c line 376

Quoted 8 lines
drivers/gpio/gpio-altera.c new file +8 -0
+static int altera_gpio_remove(struct platform_device *pdev)
+{
+       struct altera_gpio_chip *altera_gc = platform_get_drvdata(pdev);
+
+       gpiochip_remove(&altera_gc->mmchip.gc);
+
+       irq_set_handler_data(altera_gc->mapped_irq, NULL);
+       irq_set_chained_handler(altera_gc->mapped_irq, NULL);

These two calls should not be needed either.

Quoted 7 lines

OK

Quoted 2 lines

Yours,
Linus Walleij

Regards,
Tien Hock Loh

Regards,
Tien Hock Loh

#10 lore raw
Quoted 11 lines · Tien Hock Loh
Quoted 7 lines
Quoted 6 lines

These calls seem like pretty vanilla generic GPIO functions. Use GENERIC_GPIO with bgpio_init() and override the default functions only when really needed.

See e.g. drivers/gpio/gpio-74xx-mmio.c

OK, I'll update this.

I just recall that I couldn't use bgpio because the number of gpio pins is configurable and may not be multiple of 8, thus I'll not be updating this to use bgpio.

It doesn't matter. ngpio will be respected by gpio_request() so you will not be able to request any of the GPIOs above the lower bits anyway.

Yours,
Linus Walleij