i.MX: Add GPIO devices to i.MX SOC
v3 cover i.MX: Add GPIO devices to i.MX SOC
Add GPIO devices to i.MX31 and i.MX25 SOC
Jean-Christophe Dubois (3):
i.MX: Add GPIO device
i.MX: Add GPIO devices to i.MX31 SOC
i.MX: Add GPIO devices to i.MX25 SOC
hw/arm/fsl-imx25.c | 29 ++++ hw/arm/fsl-imx31.c | 30 ++++ hw/gpio/Makefile.objs | 1 + hw/gpio/imx_gpio.c | 340 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/fsl-imx25.h | 15 ++ include/hw/arm/fsl-imx31.h | 12 ++ include/hw/gpio/imx_gpio.h | 63 +++++++++ 7 files changed, 490 insertions(+) create mode 100644 hw/gpio/imx_gpio.c create mode 100644 include/hw/gpio/imx_gpio.h
Signature · 1 line
2.1.4
PATCH v3 1/3 i.MX: Add GPIO device
---
Changes since V1:
* added "has-edge-sel" property
* use extract64() and deposit64() in read/write icr access
* set "number of GPIO pin" as a #define
* reorganize functions in file to group them
* various coding style cleanup
* rename state handler array in output array.
Changes since v2:
* always compile DEBUG functions
* Fix imx_gpio_update_int to use isr, imr and gdir
* Fix imx_gpio_set_int_line to check gdir instead of imr
* Fix imx_gpio_set to update psr even if line is output
* Fix PSR read to use gdir.
hw/gpio/Makefile.objs | 1 + hw/gpio/imx_gpio.c | 340 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/gpio/imx_gpio.h | 63 +++++++++ 3 files changed, 404 insertions(+) create mode 100644 hw/gpio/imx_gpio.c create mode 100644 include/hw/gpio/imx_gpio.h
hw/gpio/Makefile.objs +1 -0
@@ -5,3 +5,4 @@ common-obj-$(CONFIG_ZAURUS) += zaurus.o common-obj-$(CONFIG_E500) += mpc8xxx.o obj-$(CONFIG_OMAP) += omap_gpio.o +obj-$(CONFIG_IMX) += imx_gpio.o
hw/gpio/imx_gpio.c new file +340 -0
340 lines not on this page · raw message
include/hw/gpio/imx_gpio.h new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.1.4
Re: [Qemu-devel] [PATCH v3 1/3] i.MX: Add GPIO device
Quoted 94 lines · Jean-Christophe Dubois
Signed-off-by Jean-Christophe Dubois <[email protected]>---
Changes since V1:
* added "has-edge-sel" property
* useextract64()anddeposit64()in read/write icr access
* set "number of GPIO pin" as a #define
* reorganize functions in file to group them
* various coding style cleanup
* rename state handler array in output array.Changes since v2:
* always compile DEBUG functions
* Fiximx_gpio_update_intto use isr, imr and gdir
* Fiximx_gpio_set_int_lineto check gdir instead of imr
* Fiximx_gpio_setto update psr even if line is output
* Fix PSR read to use gdir.hw/gpio/Makefile.objs | 1 + hw/gpio/imx_gpio.c | 340 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/gpio/imx_gpio.h | 63 +++++++++ 3 files changed, 404 insertions(+) create mode 100644 hw/gpio/imx_gpio.c create mode 100644 include/hw/gpio/imx_gpio.hhw/gpio/Makefile.objs +1
-0@@ -5,3 +5,4 @@ common-obj-$(CONFIG_ZAURUS) += zaurus.o common-obj-$(CONFIG_E500) += mpc8xxx.o obj-$(CONFIG_OMAP) += omap_gpio.o +obj-$(CONFIG_IMX) += imx_gpio.ohw/gpio/imx_gpio.c new file +54
-0@@ -0,0 +1,340 @@ +/* +* i.MX processors GPIO emulation. +* +* Copyright (C) 2015 Jean-Christophe Dubois <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 or +* (at your option) version 3 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#include "hw/gpio/imx_gpio.h" + +#ifndef DEBUG_IMX_GPIO +#define DEBUG_IMX_GPIO 0 +#endif + +typedef enum IMXGPIOLevel { +IMX_GPIO_LEVEL_LOW =0 , +IMX_GPIO_LEVEL_HIGH =1 , +}IMXGPIOLevel ; + +#define DPRINTF(fmt, args...) \ + do { \ + if (DEBUG_IMX_GPIO) { \ + fprintf(stderr, "%s: " fmt , __func__, ##args); \ + } \ + } while (0) + +static const char *imx_gpio_reg_name (uint32_t reg) +{ +switch (reg) { +case DR_ADDR : +return "DR" ; +case GDIR_ADDR : +return "GDIR" ; +case PSR_ADDR : +return "PSR" ; +case ICR1_ADDR : +return "ICR1" ; +case ICR2_ADDR : +return "ICR2" ; +case IMR_ADDR : +return "IMR" ; +case ISR_ADDR : +return "ISR" ;
hw/gpio/imx_gpio.c line 64
Quoted 10 lines
hw/gpio/imx_gpio.c new file +10
-0+case EDGE_SEL_ADDR : +return "EDGE_SEL" ; +default : +return "[?]" ; + } +} + +static void imx_gpio_update_int (IMXGPIOState *s) +{ +qemu_set_irq (s->irq, (s->isr & s->imr & ~s->gdir) ?1 :0 );
This doesn't look right, having it conditional on the gdir. I think you already implement the gdir masking in set_int_line, why do you need this extra mask?
Quoted 24 lines
hw/gpio/imx_gpio.c new file +22
-0+} + +static void imx_gpio_set_int_line (IMXGPIOState *s,int line,IMXGPIOLevel level) +{ +/* if this signal isn't configured as an input signal, nothing to do */ +/* i.MX GPIO memory map */ +#define DR_ADDR 0x00/* DATA REGISTER */ +#define GDIR_ADDR 0x04/* DIRECTION REGISTER */ +#define PSR_ADDR 0x08/* PAD STATUS REGISTER */ +#define ICR1_ADDR 0x0c/* INTERRUPT CONFIGURATION REGISTER 1 */ +#define ICR2_ADDR 0x10/* INTERRUPT CONFIGURATION REGISTER 2 */ +#define IMR_ADDR 0x14/* INTERRUPT MASK REGISTER */ +#define ISR_ADDR 0x18/* INTERRUPT STATUS REGISTER */ +#define EDGE_SEL_ADDR 0x1c/* EDGE SEL REGISTER */ + +#define IMX_GPIO_PIN_COUNT 32 + +typedef struct IMXGPIOState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/
hw/gpio/imx_gpio.c
Quoted 10 lines
hw/gpio/imx_gpio.c new file +10
-0+MemoryRegion iomem; + +uint32_t dr; +uint32_t gdir; +uint32_t psr; +uint64_t icr; +uint32_t imr; +uint32_t isr; +bool has_edge_sel; +/* This register is not present in i.MX31 */
Drop comment.
Otherwise,
Regards,
Peter
Quoted 10 lines
hw/gpio/imx_gpio.c new file +7
-1+uint32_t edge_sel; + +qemu_irq irq; + qemu_irq output[IMX_GPIO_PIN_COUNT]; +} IMXGPIOState; + +#endif /* __IMX_GPIO_H_ */ --2.1.4
Re: [Qemu-devel] [PATCH v3 1/3] i.MX: Add GPIO device
Quoted 101 lines · Peter Crosthwaite
Quoted 99 lines · Jean-Christophe Dubois
Signed-off-by Jean-Christophe Dubois <[email protected]>---
Changes since V1:
* added "has-edge-sel" property
* useextract64()anddeposit64()in read/write icr access
* set "number of GPIO pin" as a #define
* reorganize functions in file to group them
* various coding style cleanup
* rename state handler array in output array.Changes since v2:
* always compile DEBUG functions
* Fiximx_gpio_update_intto use isr, imr and gdir
* Fiximx_gpio_set_int_lineto check gdir instead of imr
* Fiximx_gpio_setto update psr even if line is output
* Fix PSR read to use gdir.hw/gpio/Makefile.objs | 1 + hw/gpio/imx_gpio.c | 340 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/gpio/imx_gpio.h | 63 +++++++++ 3 files changed, 404 insertions(+)create mode 100644
hw/gpio/imx_gpio.c
create mode 100644include/hw/gpio/imx_gpio.hhw/gpio/Makefile.objs +1
-0@@ -5,3 +5,4 @@ common-obj-$(CONFIG_ZAURUS) += zaurus.o common-obj-$(CONFIG_E500) += mpc8xxx.o obj-$(CONFIG_OMAP) += omap_gpio.o +obj-$(CONFIG_IMX) += imx_gpio.ohw/gpio/imx_gpio.c new file +59
-0@@ -0,0 +1,340 @@ +/* +* i.MX processors GPIO emulation. +* +* Copyright (C) 2015 Jean-Christophe Dubois <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 or +* (at your option) version 3 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#include "hw/gpio/imx_gpio.h" + +#ifndef DEBUG_IMX_GPIO +#define DEBUG_IMX_GPIO 0 +#endif + +typedef enum IMXGPIOLevel { +IMX_GPIO_LEVEL_LOW =0 , +IMX_GPIO_LEVEL_HIGH =1 , +}IMXGPIOLevel ; + +#define DPRINTF(fmt, args...) \ + do { \ + if (DEBUG_IMX_GPIO) { \ + fprintf(stderr, "%s: " fmt , __func__, ##args); \ + } \ + } while (0) + +static const char *imx_gpio_reg_name (uint32_t reg) +{ +switch (reg) { +case DR_ADDR : +return "DR" ; +case GDIR_ADDR : +return "GDIR" ; +case PSR_ADDR : +return "PSR" ; +case ICR1_ADDR : +return "ICR1" ; +case ICR2_ADDR : +return "ICR2" ; +case IMR_ADDR : +return "IMR" ; +case ISR_ADDR : +return "ISR" ; +case EDGE_SEL_ADDR : +return "EDGE_SEL" ; +default : +return "[?]" ; + }
Quoted 8 lines
hw/gpio/imx_gpio.c line 64
Quoted 5 lines
hw/gpio/imx_gpio.c new file +5
-0+} + +static void imx_gpio_update_int (IMXGPIOState *s) +{ +qemu_set_irq (s->irq, (s->isr & s->imr & ~s->gdir) ?1 :0 );This doesn't look right, having it conditional on the gdir. I think you already implement the gdir masking in
set_int_line, why do you need this extra mask?
This might be extra cautious (and unnecessary) but in order to raise an interrupt a "line"/pin needs to be set as an input line.
But OK, I'll remove it as it is also taken care of elsewhere (set_int_line).
Quoted 27 lines
Quoted 27 lines
hw/gpio/imx_gpio.c new file +25
-0+} + +static void imx_gpio_set_int_line (IMXGPIOState *s,int line,IMXGPIOLevel level) +{ +/* if this signal isn't configured as an input signal, nothing to do */ +/* i.MX GPIO memory map */ +#define DR_ADDR 0x00/* DATA REGISTER */ +#define GDIR_ADDR 0x04/* DIRECTION REGISTER */ +#define PSR_ADDR 0x08/* PAD STATUS REGISTER */ +#define ICR1_ADDR 0x0c/* INTERRUPT CONFIGURATION REGISTER 1 */ +#define ICR2_ADDR 0x10/* INTERRUPT CONFIGURATION REGISTER 2 */ +#define IMR_ADDR 0x14/* INTERRUPT MASK REGISTER */ +#define ISR_ADDR 0x18/* INTERRUPT STATUS REGISTER */ +#define EDGE_SEL_ADDR 0x1c/* EDGE SEL REGISTER */ + +#define IMX_GPIO_PIN_COUNT 32 + +typedef struct IMXGPIOState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + MemoryRegion iomem; + + uint32_t dr;
Quoted 8 lines
hw/gpio/imx_gpio.c
Quoted 7 lines
hw/gpio/imx_gpio.c new file +7
-0+uint32_t gdir; +uint32_t psr; +uint64_t icr; +uint32_t imr; +uint32_t isr; +bool has_edge_sel; +/* This register is not present in i.MX31 */ Drop comment.
OK
Quoted 18 lines
Otherwise,
Reviewed-by Peter Crosthwaite <[email protected]>Regards,
PeterQuoted 10 lines
hw/gpio/imx_gpio.c new file +7
-1+uint32_t edge_sel; + +qemu_irq irq; + qemu_irq output[IMX_GPIO_PIN_COUNT]; +} IMXGPIOState; + +#endif /* __IMX_GPIO_H_ */ --2.1.4
PATCH v3 2/3 i.MX: Add GPIO devices to i.MX31 SOC
In reply to Jean-Christophe Dubois---
Changes since v1:
* Use "has-edge-sel" property for i.MX31
* various coding style cleanup
Changes since v2:
* failing to set "has-edge-sel" is fatal.
hw/arm/fsl-imx31.c | 30 ++++++++++++++++++++++++++++++ include/hw/arm/fsl-imx31.h | 12 ++++++++++++ 2 files changed, 42 insertions(+)
hw/arm/fsl-imx31.c +30 -0
@@ -55,6 +55,11 @@ static void fsl_imx31_init(Object *obj)object_initialize (&s->i2c[i],sizeof (s->i2c[i]),TYPE_IMX_I2C );qdev_set_parent_bus (DEVICE (&s->i2c[i]),sysbus_get_default ()); } + +for (i =0 ; i <FSL_IMX31_NUM_GPIOS ; i++) { +object_initialize (&s->gpio[i],sizeof (s->gpio[i]),TYPE_IMX_GPIO ); +qdev_set_parent_bus (DEVICE (&s->gpio[i]),sysbus_get_default ()); + } }static void fsl_imx31_realize (DeviceState *dev,Error **errp)
@@ -184,6 +189,31 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) i2c_table[i].irq)); } +/* Initialize all GPIOs */ +for (i =0 ; i <FSL_IMX31_NUM_GPIOS ; i++) { +static const struct { +hwaddr addr; +unsigned int irq; + } gpio_table[FSL_IMX31_NUM_GPIOS ] = { + {FSL_IMX31_GPIO1_ADDR ,FSL_IMX31_GPIO1_IRQ }, + {FSL_IMX31_GPIO2_ADDR ,FSL_IMX31_GPIO2_IRQ }, + {FSL_IMX31_GPIO3_ADDR ,FSL_IMX31_GPIO3_IRQ } + }; + +object_property_set_bool (OBJECT (&s->gpio[i]), false,"has-edge-sel" , + &error_abort); +object_property_set_bool (OBJECT (&s->gpio[i]), true,"realized" , &err); +if (err) { +error_propagate (errp, err); +return ; + } +sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpio[i]),0 , gpio_table[i].addr); +/* Connect GPIO IRQ to PIC */ +sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio[i]),0 , +qdev_get_gpio_in (DEVICE (&s->avic), + gpio_table[i].irq)); + } +/* On a real system, the first 16k is a `secure boot rom' */ memory_region_init_rom_device(&s->secure_rom, NULL, NULL, NULL, "imx31.secure_rom",
include/hw/arm/fsl-imx31.h +12 -0
@@ -24,6 +24,7 @@#include "hw/timer/imx_gpt.h" #include "hw/timer/imx_epit.h" #include "hw/i2c/imx_i2c.h" +#include "hw/gpio/imx_gpio.h" #include "exec/memory.h" #define TYPE_FSL_IMX31 "fsl,imx31"
@@ -32,6 +33,7 @@#define FSL_IMX31_NUM_UARTS 2#define FSL_IMX31_NUM_EPITS 2#define FSL_IMX31_NUM_I2CS 3 +#define FSL_IMX31_NUM_GPIOS 3 typedef struct FslIMX31State { /*< private >*/
@@ -45,6 +47,7 @@ typedef struct FslIMX31State {IMXGPTState gpt;IMXEPITState epit[FSL_IMX31_NUM_EPITS ];IMXI2CState i2c[FSL_IMX31_NUM_I2CS ]; +IMXGPIOState gpio[FSL_IMX31_NUM_GPIOS ];MemoryRegion secure_rom;MemoryRegion rom;MemoryRegion iram;
@@ -77,6 +80,12 @@ typedef struct FslIMX31State {#define FSL_IMX31_EPIT1_SIZE 0x4000#define FSL_IMX31_EPIT2_ADDR 0x53F98000#define FSL_IMX31_EPIT2_SIZE 0x4000 +#define FSL_IMX31_GPIO3_ADDR 0x53FA4000 +#define FSL_IMX31_GPIO3_SIZE 0x4000 +#define FSL_IMX31_GPIO1_ADDR 0x53FCC000 +#define FSL_IMX31_GPIO1_SIZE 0x4000 +#define FSL_IMX31_GPIO2_ADDR 0x53FD0000 +#define FSL_IMX31_GPIO2_SIZE 0x4000#define FSL_IMX31_AVIC_ADDR 0x68000000#define FSL_IMX31_AVIC_SIZE 0x100#define FSL_IMX31_SDRAM0_ADDR 0x80000000
@@ -106,5 +115,8 @@ typedef struct FslIMX31State {#define FSL_IMX31_I2C1_IRQ 10#define FSL_IMX31_I2C2_IRQ 4#define FSL_IMX31_I2C3_IRQ 3 +#define FSL_IMX31_GPIO1_IRQ 52 +#define FSL_IMX31_GPIO2_IRQ 51 +#define FSL_IMX31_GPIO3_IRQ 56#endif /* FSL_IMX31_H */
Signature · 1 line
2.1.4
PATCH v3 3/3 i.MX: Add GPIO devices to i.MX25 SOC
In reply to Jean-Christophe Dubois---
Changes since v1:
* various coding style cleanup
Changes since v2:
* no change.
hw/arm/fsl-imx25.c | 29 +++++++++++++++++++++++++++++ include/hw/arm/fsl-imx25.h | 15 +++++++++++++++ 2 files changed, 44 insertions(+)
hw/arm/fsl-imx25.c +29 -0
@@ -63,6 +63,11 @@ static void fsl_imx25_init(Object *obj)object_initialize (&s->i2c[i],sizeof (s->i2c[i]),TYPE_IMX_I2C );qdev_set_parent_bus (DEVICE (&s->i2c[i]),sysbus_get_default ()); } + +for (i =0 ; i <FSL_IMX25_NUM_GPIOS ; i++) { +object_initialize (&s->gpio[i],sizeof (s->gpio[i]),TYPE_IMX_GPIO ); +qdev_set_parent_bus (DEVICE (&s->gpio[i]),sysbus_get_default ()); + } }static void fsl_imx25_realize (DeviceState *dev,Error **errp)
@@ -214,6 +219,30 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) i2c_table[i].irq)); } +/* Initialize all GPIOs */ +for (i =0 ; i <FSL_IMX25_NUM_GPIOS ; i++) { +static const struct { +hwaddr addr; +unsigned int irq; + } gpio_table[FSL_IMX25_NUM_GPIOS ] = { + {FSL_IMX25_GPIO1_ADDR ,FSL_IMX25_GPIO1_IRQ }, + {FSL_IMX25_GPIO2_ADDR ,FSL_IMX25_GPIO2_IRQ }, + {FSL_IMX25_GPIO3_ADDR ,FSL_IMX25_GPIO3_IRQ }, + {FSL_IMX25_GPIO4_ADDR ,FSL_IMX25_GPIO4_IRQ } + }; + +object_property_set_bool (OBJECT (&s->gpio[i]), true,"realized" , &err); +if (err) { +error_propagate (errp, err); +return ; + } +sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpio[i]),0 , gpio_table[i].addr); +/* Connect GPIO IRQ to PIC */ +sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio[i]),0 , +qdev_get_gpio_in (DEVICE (&s->avic), + gpio_table[i].irq)); + } +/* initialize 2 x 16 KB ROM */ memory_region_init_rom_device (&s->rom[0 ],NULL ,NULL ,NULL ,"imx25.rom0" ,FSL_IMX25_ROM0_SIZE , &err);
include/hw/arm/fsl-imx25.h +15 -0
@@ -25,6 +25,7 @@#include "hw/timer/imx_epit.h" #include "hw/net/imx_fec.h" #include "hw/i2c/imx_i2c.h" +#include "hw/gpio/imx_gpio.h" #include "exec/memory.h" #define TYPE_FSL_IMX25 "fsl,imx25"
@@ -34,6 +35,7 @@#define FSL_IMX25_NUM_GPTS 4#define FSL_IMX25_NUM_EPITS 2#define FSL_IMX25_NUM_I2CS 3 +#define FSL_IMX25_NUM_GPIOS 4 typedef struct FslIMX25State { /*< private >*/
@@ -48,6 +50,7 @@ typedef struct FslIMX25State {IMXEPITState epit[FSL_IMX25_NUM_EPITS ];IMXFECState fec;IMXI2CState i2c[FSL_IMX25_NUM_I2CS ]; +IMXGPIOState gpio[FSL_IMX25_NUM_GPIOS ];MemoryRegion rom[2 ];MemoryRegion iram;MemoryRegion iram_alias;
@@ -204,6 +207,14 @@ typedef struct FslIMX25State {#define FSL_IMX25_EPIT1_SIZE 0x4000#define FSL_IMX25_EPIT2_ADDR 0x53F98000#define FSL_IMX25_EPIT2_SIZE 0x4000 +#define FSL_IMX25_GPIO4_ADDR 0x53F9C000 +#define FSL_IMX25_GPIO4_SIZE 0x4000 +#define FSL_IMX25_GPIO3_ADDR 0x53FA4000 +#define FSL_IMX25_GPIO3_SIZE 0x4000 +#define FSL_IMX25_GPIO1_ADDR 0x53FCC000 +#define FSL_IMX25_GPIO1_SIZE 0x4000 +#define FSL_IMX25_GPIO2_ADDR 0x53FD0000 +#define FSL_IMX25_GPIO2_SIZE 0x4000#define FSL_IMX25_AVIC_ADDR 0x68000000#define FSL_IMX25_AVIC_SIZE 0x4000#define FSL_IMX25_IRAM_ADDR 0x78000000
@@ -230,5 +241,9 @@ typedef struct FslIMX25State {#define FSL_IMX25_I2C1_IRQ 3#define FSL_IMX25_I2C2_IRQ 4#define FSL_IMX25_I2C3_IRQ 10 +#define FSL_IMX25_GPIO1_IRQ 52 +#define FSL_IMX25_GPIO2_IRQ 51 +#define FSL_IMX25_GPIO3_IRQ 16 +#define FSL_IMX25_GPIO4_IRQ 23#endif /* FSL_IMX25_H */
Signature · 1 line
2.1.4