| Message ID | 20241008081450.1490955-8-billy_tsai@aspeedtech.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add Aspeed G7 gpio support | expand |
> > In the 7th generation of the SoC from Aspeed, the control logic of the > > GPIO controller has been updated to support per-pin control. Each pin now > > has its own 32-bit register, allowing for individual control of the pin's > > value, direction, interrupt type, and other settings. The permission for > > coprocessor access is supported by the hardware but hasn't been > > implemented in the current patch. > > > > Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> > > --- > > drivers/gpio/gpio-aspeed.c | 147 +++++++++++++++++++++++++++++++++++++ > > 1 file changed, 147 insertions(+) > > > > diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c > > index 5d583cc9cbc7..208f95fb585e 100644 > > --- a/drivers/gpio/gpio-aspeed.c > > +++ b/drivers/gpio/gpio-aspeed.c > > @@ -30,6 +30,27 @@ > > #include <linux/gpio/consumer.h> > > #include "gpiolib.h" > > > > +/* Non-constant mask variant of FIELD_GET() and FIELD_PREP() */ > > +#define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1)) > > +#define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask)) > > + > > +#define GPIO_G7_IRQ_STS_BASE 0x100 > > +#define GPIO_G7_IRQ_STS_OFFSET(x) (GPIO_G7_IRQ_STS_BASE + (x) * 0x4) > > +#define GPIO_G7_CTRL_REG_BASE 0x180 > > +#define GPIO_G7_CTRL_REG_OFFSET(x) (GPIO_G7_CTRL_REG_BASE + (x) * 0x4) > > +#define GPIO_G7_CTRL_OUT_DATA BIT(0) > > +#define GPIO_G7_CTRL_DIR BIT(1) > > +#define GPIO_G7_CTRL_IRQ_EN BIT(2) > > +#define GPIO_G7_CTRL_IRQ_TYPE0 BIT(3) > > +#define GPIO_G7_CTRL_IRQ_TYPE1 BIT(4) > > +#define GPIO_G7_CTRL_IRQ_TYPE2 BIT(5) > > +#define GPIO_G7_CTRL_RST_TOLERANCE BIT(6) > > +#define GPIO_G7_CTRL_DEBOUNCE_SEL1 BIT(7) > > +#define GPIO_G7_CTRL_DEBOUNCE_SEL2 BIT(8) > > +#define GPIO_G7_CTRL_INPUT_MASK BIT(9) > > +#define GPIO_G7_CTRL_IRQ_STS BIT(12) > > +#define GPIO_G7_CTRL_IN_DATA BIT(13) > > + > > struct aspeed_bank_props { > > unsigned int bank; > > u32 input; > > @@ -95,6 +116,22 @@ struct aspeed_gpio_bank { > > */ > > > > static const int debounce_timers[4] = { 0x00, 0x50, 0x54, 0x58 }; > > +static const int g7_debounce_timers[4] = { 0x00, 0x00, 0x04, 0x08 }; > > + > > +/* > > + * The debounce timers array is used to configure the debounce timer settings.Here’s how it works: > > + * Array Value: Indicates the offset for configuring the debounce timer. > > + * Array Index: Corresponds to the debounce setting register. > > + * The debounce timers array follows this pattern for configuring the debounce setting registers: > > + * Array Index 0: No debounce timer is set; > > + * Array Value is irrelevant (don’t care). > > + * Array Index 1: Debounce setting #2 is set to 1, and debounce setting #1 is set to 0. > > + * Array Value: offset for configuring debounce timer 0 (g4: 0x50, g7: 0x00) > > + * Array Index 2: Debounce setting #2 is set to 0, and debounce setting #1 is set to 1. > > + * Array Value: offset for configuring debounce timer 1 (g4: 0x54, g7: 0x04) > > + * Array Index 3: Debounce setting #2 is set to 1, and debounce setting #1 is set to 1. > > + * Array Value: offset for configuring debounce timer 2 (g4: 0x58, g7: 0x8) > > + */ > > > > static const struct aspeed_gpio_copro_ops *copro_ops; > > static void *copro_data; > > @@ -250,6 +287,39 @@ static void __iomem *aspeed_gpio_g4_bank_reg(struct aspeed_gpio *gpio, > > BUG(); > > } > > > > +static u32 aspeed_gpio_g7_reg_mask(const enum aspeed_gpio_reg reg) > > +{ > > + switch (reg) { > > + case reg_val: > > + return GPIO_G7_CTRL_OUT_DATA; > I think a problem is that we want this to be GPIO_G7_CTRL_IN_DATA for > reads, but GPIO_G7_CTRL_OUT_DATA for writes? Yes. So in my aspeed_g7_bit_get, I will change the mask to GPIO_G7_CTRL_IN_DATA. +static bool aspeed_g7_reg_bit_get(struct aspeed_gpio *gpio, unsigned int offset, + const enum aspeed_gpio_reg reg) +{ + u32 mask = aspeed_gpio_g7_reg_mask(reg); + void __iomem *addr; + + addr = gpio->base + GPIO_G7_CTRL_REG_OFFSET(offset); + if (reg == reg_val) + mask = GPIO_G7_CTRL_IN_DATA; + + if (mask) + return field_get(mask, ioread32(addr)); + else + return 0; +} +
On Wed, 2024-10-09 at 02:28 +0000, Billy Tsai wrote: > > > In the 7th generation of the SoC from Aspeed, the control logic > > > of the > > > GPIO controller has been updated to support per-pin control. Each > > > pin now > > > has its own 32-bit register, allowing for individual control of > > > the pin's > > > value, direction, interrupt type, and other settings. The > > > permission for > > > coprocessor access is supported by the hardware but hasn't been > > > implemented in the current patch. > > > > > > Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> > > > --- > > > drivers/gpio/gpio-aspeed.c | 147 > > > +++++++++++++++++++++++++++++++++++++ > > > 1 file changed, 147 insertions(+) > > > > > > diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio- > > > aspeed.c > > > index 5d583cc9cbc7..208f95fb585e 100644 > > > --- a/drivers/gpio/gpio-aspeed.c > > > +++ b/drivers/gpio/gpio-aspeed.c > > > @@ -30,6 +30,27 @@ > > > #include <linux/gpio/consumer.h> > > > #include "gpiolib.h" > > > > > > +/* Non-constant mask variant of FIELD_GET() and FIELD_PREP() */ > > > +#define field_get(_mask, _reg) (((_reg) & (_mask)) >> > > > (ffs(_mask) - 1)) > > > +#define field_prep(_mask, _val) (((_val) << (ffs(_mask) - > > > 1)) & (_mask)) > > > + > > > +#define GPIO_G7_IRQ_STS_BASE 0x100 > > > +#define GPIO_G7_IRQ_STS_OFFSET(x) (GPIO_G7_IRQ_STS_BASE + (x) * > > > 0x4) > > > +#define GPIO_G7_CTRL_REG_BASE 0x180 > > > +#define GPIO_G7_CTRL_REG_OFFSET(x) (GPIO_G7_CTRL_REG_BASE + (x) > > > * 0x4) > > > +#define GPIO_G7_CTRL_OUT_DATA BIT(0) > > > +#define GPIO_G7_CTRL_DIR BIT(1) > > > +#define GPIO_G7_CTRL_IRQ_EN BIT(2) > > > +#define GPIO_G7_CTRL_IRQ_TYPE0 BIT(3) > > > +#define GPIO_G7_CTRL_IRQ_TYPE1 BIT(4) > > > +#define GPIO_G7_CTRL_IRQ_TYPE2 BIT(5) > > > +#define GPIO_G7_CTRL_RST_TOLERANCE BIT(6) > > > +#define GPIO_G7_CTRL_DEBOUNCE_SEL1 BIT(7) > > > +#define GPIO_G7_CTRL_DEBOUNCE_SEL2 BIT(8) > > > +#define GPIO_G7_CTRL_INPUT_MASK BIT(9) > > > +#define GPIO_G7_CTRL_IRQ_STS BIT(12) > > > +#define GPIO_G7_CTRL_IN_DATA BIT(13) > > > + > > > struct aspeed_bank_props { > > > unsigned int bank; > > > u32 input; > > > @@ -95,6 +116,22 @@ struct aspeed_gpio_bank { > > > */ > > > > > > static const int debounce_timers[4] = { 0x00, 0x50, 0x54, 0x58 > > > }; > > > +static const int g7_debounce_timers[4] = { 0x00, 0x00, 0x04, > > > 0x08 }; > > > + > > > +/* > > > + * The debounce timers array is used to configure the debounce > > > timer settings.Here’s how it works: > > > + * Array Value: Indicates the offset for configuring the > > > debounce timer. > > > + * Array Index: Corresponds to the debounce setting register. > > > + * The debounce timers array follows this pattern for > > > configuring the debounce setting registers: > > > + * Array Index 0: No debounce timer is set; > > > + * Array Value is irrelevant (don’t care). > > > + * Array Index 1: Debounce setting #2 is set to 1, and debounce > > > setting #1 is set to 0. > > > + * Array Value: offset for configuring debounce > > > timer 0 (g4: 0x50, g7: 0x00) > > > + * Array Index 2: Debounce setting #2 is set to 0, and debounce > > > setting #1 is set to 1. > > > + * Array Value: offset for configuring debounce > > > timer 1 (g4: 0x54, g7: 0x04) > > > + * Array Index 3: Debounce setting #2 is set to 1, and debounce > > > setting #1 is set to 1. > > > + * Array Value: offset for configuring debounce > > > timer 2 (g4: 0x58, g7: 0x8) > > > + */ > > > > > > static const struct aspeed_gpio_copro_ops *copro_ops; > > > static void *copro_data; > > > @@ -250,6 +287,39 @@ static void __iomem > > > *aspeed_gpio_g4_bank_reg(struct aspeed_gpio *gpio, > > > BUG(); > > > } > > > > > > +static u32 aspeed_gpio_g7_reg_mask(const enum aspeed_gpio_reg > > > reg) > > > +{ > > > + switch (reg) { > > > + case reg_val: > > > + return GPIO_G7_CTRL_OUT_DATA; > > > I think a problem is that we want this to be GPIO_G7_CTRL_IN_DATA > > for > > reads, but GPIO_G7_CTRL_OUT_DATA for writes? > > Yes. So in my aspeed_g7_bit_get, I will change the mask to > GPIO_G7_CTRL_IN_DATA. > > +static bool aspeed_g7_reg_bit_get(struct aspeed_gpio *gpio, unsigned > int offset, > + const enum aspeed_gpio_reg reg) > +{ > + u32 mask = aspeed_gpio_g7_reg_mask(reg); > + void __iomem *addr; > + > + addr = gpio->base + GPIO_G7_CTRL_REG_OFFSET(offset); > + if (reg == reg_val) > + mask = GPIO_G7_CTRL_IN_DATA; > + > + if (mask) > + return field_get(mask, ioread32(addr)); > + else > + return 0; > +} > + Ah, I see that's already what you have. Thanks. Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au>
diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index 5d583cc9cbc7..208f95fb585e 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -30,6 +30,27 @@ #include <linux/gpio/consumer.h> #include "gpiolib.h" +/* Non-constant mask variant of FIELD_GET() and FIELD_PREP() */ +#define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1)) +#define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask)) + +#define GPIO_G7_IRQ_STS_BASE 0x100 +#define GPIO_G7_IRQ_STS_OFFSET(x) (GPIO_G7_IRQ_STS_BASE + (x) * 0x4) +#define GPIO_G7_CTRL_REG_BASE 0x180 +#define GPIO_G7_CTRL_REG_OFFSET(x) (GPIO_G7_CTRL_REG_BASE + (x) * 0x4) +#define GPIO_G7_CTRL_OUT_DATA BIT(0) +#define GPIO_G7_CTRL_DIR BIT(1) +#define GPIO_G7_CTRL_IRQ_EN BIT(2) +#define GPIO_G7_CTRL_IRQ_TYPE0 BIT(3) +#define GPIO_G7_CTRL_IRQ_TYPE1 BIT(4) +#define GPIO_G7_CTRL_IRQ_TYPE2 BIT(5) +#define GPIO_G7_CTRL_RST_TOLERANCE BIT(6) +#define GPIO_G7_CTRL_DEBOUNCE_SEL1 BIT(7) +#define GPIO_G7_CTRL_DEBOUNCE_SEL2 BIT(8) +#define GPIO_G7_CTRL_INPUT_MASK BIT(9) +#define GPIO_G7_CTRL_IRQ_STS BIT(12) +#define GPIO_G7_CTRL_IN_DATA BIT(13) + struct aspeed_bank_props { unsigned int bank; u32 input; @@ -95,6 +116,22 @@ struct aspeed_gpio_bank { */ static const int debounce_timers[4] = { 0x00, 0x50, 0x54, 0x58 }; +static const int g7_debounce_timers[4] = { 0x00, 0x00, 0x04, 0x08 }; + +/* + * The debounce timers array is used to configure the debounce timer settings.Here’s how it works: + * Array Value: Indicates the offset for configuring the debounce timer. + * Array Index: Corresponds to the debounce setting register. + * The debounce timers array follows this pattern for configuring the debounce setting registers: + * Array Index 0: No debounce timer is set; + * Array Value is irrelevant (don’t care). + * Array Index 1: Debounce setting #2 is set to 1, and debounce setting #1 is set to 0. + * Array Value: offset for configuring debounce timer 0 (g4: 0x50, g7: 0x00) + * Array Index 2: Debounce setting #2 is set to 0, and debounce setting #1 is set to 1. + * Array Value: offset for configuring debounce timer 1 (g4: 0x54, g7: 0x04) + * Array Index 3: Debounce setting #2 is set to 1, and debounce setting #1 is set to 1. + * Array Value: offset for configuring debounce timer 2 (g4: 0x58, g7: 0x8) + */ static const struct aspeed_gpio_copro_ops *copro_ops; static void *copro_data; @@ -250,6 +287,39 @@ static void __iomem *aspeed_gpio_g4_bank_reg(struct aspeed_gpio *gpio, BUG(); } +static u32 aspeed_gpio_g7_reg_mask(const enum aspeed_gpio_reg reg) +{ + switch (reg) { + case reg_val: + return GPIO_G7_CTRL_OUT_DATA; + case reg_dir: + return GPIO_G7_CTRL_DIR; + case reg_irq_enable: + return GPIO_G7_CTRL_IRQ_EN; + case reg_irq_type0: + return GPIO_G7_CTRL_IRQ_TYPE0; + case reg_irq_type1: + return GPIO_G7_CTRL_IRQ_TYPE1; + case reg_irq_type2: + return GPIO_G7_CTRL_IRQ_TYPE2; + case reg_tolerance: + return GPIO_G7_CTRL_RST_TOLERANCE; + case reg_debounce_sel1: + return GPIO_G7_CTRL_DEBOUNCE_SEL1; + case reg_debounce_sel2: + return GPIO_G7_CTRL_DEBOUNCE_SEL2; + case reg_rdata: + return GPIO_G7_CTRL_OUT_DATA; + case reg_irq_status: + return GPIO_G7_CTRL_IRQ_STS; + case reg_cmdsrc0: + case reg_cmdsrc1: + default: + WARN_ON_ONCE(1); + return 0; + } +} + #define GPIO_BANK(x) ((x) >> 5) #define GPIO_OFFSET(x) ((x) & 0x1f) #define GPIO_BIT(x) BIT(GPIO_OFFSET(x)) @@ -1106,6 +1176,59 @@ static const struct aspeed_gpio_llops aspeed_g4_llops = { .copro_request = aspeed_g4_copro_request, .copro_release = aspeed_g4_copro_release, }; + +static void aspeed_g7_reg_bit_set(struct aspeed_gpio *gpio, unsigned int offset, + const enum aspeed_gpio_reg reg, bool val) +{ + u32 mask = aspeed_gpio_g7_reg_mask(reg); + void __iomem *addr = gpio->base + GPIO_G7_CTRL_REG_OFFSET(offset); + u32 write_val; + + if (mask) { + write_val = (ioread32(addr) & ~(mask)) | field_prep(mask, val); + iowrite32(write_val, addr); + } +} + +static bool aspeed_g7_reg_bit_get(struct aspeed_gpio *gpio, unsigned int offset, + const enum aspeed_gpio_reg reg) +{ + u32 mask = aspeed_gpio_g7_reg_mask(reg); + void __iomem *addr; + + addr = gpio->base + GPIO_G7_CTRL_REG_OFFSET(offset); + if (reg == reg_val) + mask = GPIO_G7_CTRL_IN_DATA; + + if (mask) + return field_get(mask, ioread32(addr)); + else + return 0; +} + +static int aspeed_g7_reg_bank_get(struct aspeed_gpio *gpio, unsigned int offset, + const enum aspeed_gpio_reg reg) +{ + void __iomem *addr; + + if (reg == reg_irq_status) { + addr = gpio->base + GPIO_G7_IRQ_STS_OFFSET(offset >> 5); + return ioread32(addr); + } else { + return -EOPNOTSUPP; + } +} + +static const struct aspeed_gpio_llops aspeed_g7_llops = { + .reg_bit_set = aspeed_g7_reg_bit_set, + .reg_bit_get = aspeed_g7_reg_bit_get, + .reg_bank_get = aspeed_g7_reg_bank_get, + .privilege_ctrl = NULL, + .privilege_init = NULL, + .copro_request = NULL, + .copro_release = NULL, +}; + /* * Any banks not specified in a struct aspeed_bank_props array are assumed to * have the properties: @@ -1173,10 +1296,34 @@ static const struct aspeed_gpio_config ast2600_config = .require_dcache = true, }; +static const struct aspeed_bank_props ast2700_bank_props[] = { + /* input output */ + { 1, 0x0fffffff, 0x0fffffff }, /* E/F/G/H, 4-GPIO hole */ + { 6, 0x00ffffff, 0x00ff0000 }, /* Y/Z/AA */ + {}, +}; + +static const struct aspeed_gpio_config ast2700_config = + /* + * ast2700 has two controllers one with 212 GPIOs and one with 16 GPIOs. + * 216 for simplicity, actual number is 212 (4-GPIO hole in GPIOH) + * We expect ngpio being set in the device tree and this is a fallback + * option. + */ + { + .nr_gpios = 216, + .props = ast2700_bank_props, + .llops = &aspeed_g7_llops, + .debounce_timers_array = g7_debounce_timers, + .debounce_timers_num = ARRAY_SIZE(g7_debounce_timers), + .require_dcache = false, + }; + static const struct of_device_id aspeed_gpio_of_table[] = { { .compatible = "aspeed,ast2400-gpio", .data = &ast2400_config, }, { .compatible = "aspeed,ast2500-gpio", .data = &ast2500_config, }, { .compatible = "aspeed,ast2600-gpio", .data = &ast2600_config, }, + { .compatible = "aspeed,ast2700-gpio", .data = &ast2700_config, }, {} }; MODULE_DEVICE_TABLE(of, aspeed_gpio_of_table);
In the 7th generation of the SoC from Aspeed, the control logic of the GPIO controller has been updated to support per-pin control. Each pin now has its own 32-bit register, allowing for individual control of the pin's value, direction, interrupt type, and other settings. The permission for coprocessor access is supported by the hardware but hasn't been implemented in the current patch. Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> --- drivers/gpio/gpio-aspeed.c | 147 +++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+)