Support GPIO for AST2700
cover Support GPIO for AST2700
v1: support GPIO for AST2700
Jamin Lin (5):
hw/gpio/aspeed: Fix coding style hw/gpio/aspeed: Support to set the different memory size hw/gpio/aspeed: Support different memory region ops hw/gpio/aspeed: Add AST2700 support
aspeed/soc: Support GPIO for AST2700
hw/arm/aspeed_ast27x0.c | 18 +- hw/gpio/aspeed_gpio.c | 390 +++++++++++++++++++++++++++++++++- include/hw/gpio/aspeed_gpio.h | 4 +- 3 files changed, 405 insertions(+), 7 deletions(-)
Signature · 1 line
2.34.1
PATCH 2/5 hw/gpio/aspeed: Support to set the different memory size
According to the datasheet of ASPEED SOCs,
a GPIO controller owns 4KB of register space for AST2700, AST2500, AST2400 and AST1030; owns 2KB of register space for AST2600 1.8v and owns 2KB of register space for AST2600 3.3v.
It set the memory region size 2KB by default and it does not compatible register space for AST2700.
Introduce a new class attribute to set the GPIO controller memory size for different ASPEED SOCs.
--- hw/gpio/aspeed_gpio.c | 7 ++++++- include/hw/gpio/aspeed_gpio.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
hw/gpio/aspeed_gpio.c +6 -1
@@ -1048,7 +1048,7 @@ static void aspeed_gpio_realize(DeviceState *dev, Error **errp) }memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_gpio_ops, s, -TYPE_ASPEED_GPIO ,0x800 ); +TYPE_ASPEED_GPIO , agc->mem_size);sysbus_init_mmio (sbd, &s->iomem); }
@@ -1131,6 +1131,7 @@ static void aspeed_gpio_ast2400_class_init(ObjectClass *klass, void *data) agc->nr_gpio_sets =7 ; agc->reg_table = aspeed_3_3v_gpios; agc->reg_table_count =GPIO_3_3V_REG_ARRAY_SIZE ; + agc->mem_size =0x1000 ; }static void aspeed_gpio_2500_class_init (ObjectClass *klass,void *data)
@@ -1142,6 +1143,7 @@ static void aspeed_gpio_2500_class_init(ObjectClass *klass, void *data) agc->nr_gpio_sets =8 ; agc->reg_table = aspeed_3_3v_gpios; agc->reg_table_count =GPIO_3_3V_REG_ARRAY_SIZE ; + agc->mem_size =0x1000 ; }static void aspeed_gpio_ast2600_3_3v_class_init (ObjectClass *klass,void *data)
@@ -1153,6 +1155,7 @@ static void aspeed_gpio_ast2600_3_3v_class_init(ObjectClass *klass, void *data) agc->nr_gpio_sets =7 ; agc->reg_table = aspeed_3_3v_gpios; agc->reg_table_count =GPIO_3_3V_REG_ARRAY_SIZE ; + agc->mem_size =0x800 ; }static void aspeed_gpio_ast2600_1_8v_class_init (ObjectClass *klass,void *data)
@@ -1164,6 +1167,7 @@ static void aspeed_gpio_ast2600_1_8v_class_init(ObjectClass *klass, void *data) agc->nr_gpio_sets =2 ; agc->reg_table = aspeed_1_8v_gpios; agc->reg_table_count =GPIO_1_8V_REG_ARRAY_SIZE ; + agc->mem_size =0x800 ; }static void aspeed_gpio_1030_class_init (ObjectClass *klass,void *data)
@@ -1175,6 +1179,7 @@ static void aspeed_gpio_1030_class_init(ObjectClass *klass, void *data) agc->nr_gpio_sets =6 ; agc->reg_table = aspeed_3_3v_gpios; agc->reg_table_count =GPIO_3_3V_REG_ARRAY_SIZE ; + agc->mem_size =0x1000 ; }static const TypeInfo aspeed_gpio_info = {
include/hw/gpio/aspeed_gpio.h +1 -0
@@ -76,6 +76,7 @@ struct AspeedGPIOClass {uint32_t nr_gpio_sets;const AspeedGPIOReg *reg_table;unsigned reg_table_count; +uint64_t mem_size; };struct AspeedGPIOState {
Signature · 1 line
2.34.1
PATCH 5/5 aspeed/soc: Support GPIO for AST2700
In reply to Jamin Lin viaAdd GPIO model for AST2700 GPIO support.
The GPIO controller registers base address is start at 0x14C0_B000 and its address space is 0x1000.
The AST2700 GPIO controller interrupt is connected to GICINT130_INTC at bit 18.
--- hw/arm/aspeed_ast27x0.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
hw/arm/aspeed_ast27x0.c +15 -3
@@ -62,6 +62,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_GIC_REDIST] = 0x12280000, [ASPEED_DEV_ADC] = 0x14C00000, [ASPEED_DEV_I2C] = 0x14C0F000, + [ASPEED_DEV_GPIO] = 0x14C0B000, };#define AST2700_MAX_IRQ 288
@@ -87,8 +88,7 @@ static const int aspeed_soc_ast2700_irqmap[] = { [ASPEED_DEV_ADC] = 130, [ASPEED_DEV_XDMA] = 5, [ASPEED_DEV_EMMC] = 15, - [ASPEED_DEV_GPIO] = 11, - [ASPEED_DEV_GPIO_1_8V] = 130, + [ASPEED_DEV_GPIO] = 130, [ASPEED_DEV_RTC] = 13, [ASPEED_DEV_TIMER1] = 16, [ASPEED_DEV_TIMER2] = 17,
@@ -124,7 +124,7 @@ static const int aspeed_soc_ast2700_gic128_intcmap[] = {static const int aspeed_soc_ast2700_gic130_intcmap[] = { [ASPEED_DEV_I2C ] =0 , [ASPEED_DEV_ADC ] =16 , - [ASPEED_DEV_GPIO_1_8V ] =18 , + [ASPEED_DEV_GPIO ] =18 , };/* GICINT 131 */
@@ -373,6 +373,9 @@ static void aspeed_soc_ast2700_init(Object *obj)snprintf (typename,sizeof (typename),"aspeed.i2c-%s" , socname);object_initialize_child (obj,"i2c" , &s->i2c, typename); + +snprintf (typename,sizeof (typename),"aspeed.gpio-%s" , socname); +object_initialize_child (obj,"gpio" , &s->gpio, typename); }/*
@@ -658,6 +661,15 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->i2c.busses[i]),0 , irq); } +/* GPIO */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->gpio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->gpio),0 , + sc->memmap[ASPEED_DEV_GPIO ]); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_GPIO )); +create_unimplemented_device ("ast2700.dpmcu" ,0x11000000 ,0x40000 );create_unimplemented_device ("ast2700.iomem0" ,0x12000000 ,0x01000000 );create_unimplemented_device ("ast2700.iomem1" ,0x14000000 ,0x01000000 );
Signature · 1 line
2.34.1
PATCH 4/5 hw/gpio/aspeed: Add AST2700 support
In reply to Jamin Lin viaAST2700 integrates two set of Parallel GPIO Controller with maximum 212 control pins, which are 27 groups. (H, exclude pin: H7 H6 H5 H4)
In the previous design of ASPEED SOCs,
one register is used for setting one function for one set which are 32 pins and 4 groups.
ex: GPIO000 is used for setting data value for GPIO A, B, C and D in AST2600.
ex: GPIO004 is used for setting direction for GPIO A, B, C and D in AST2600.
However, the register set have a significant change since AST2700.
Each GPIO pin has their own individual control register. In other words, users are able to set one GPIO pin’s direction, interrupt enable, input mask and so on
in the same one register.
Currently, aspeed_gpio_read/aspeed_gpio_write callback functions are not compatible AST2700.
Introduce new aspeed_gpio_2700_read/aspeed_gpio_2700_write callback functions and aspeed_gpio_2700_ops memory region operation for AST2700. Introduce a new ast2700 class to support AST2700.
--- hw/gpio/aspeed_gpio.c | 373 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+)
hw/gpio/aspeed_gpio.c +373 -0
@@ -227,6 +227,38 @@ REG32(GPIO_INDEX_REG, 0x2AC) FIELD(GPIO_INDEX_REG, COMMAND_SRC_1, 21, 1)FIELD (GPIO_INDEX_REG ,INPUT_MASK ,20 ,1 ) +/* AST2700 GPIO Register Address Offsets */ +REG32(GPIO_2700_DEBOUNCE_TIME_1, 0x000) +REG32(GPIO_2700_DEBOUNCE_TIME_2, 0x004) +REG32(GPIO_2700_DEBOUNCE_TIME_3, 0x008) +REG32(GPIO_2700_INT_STATUS_1, 0x100) +REG32(GPIO_2700_INT_STATUS_2, 0x104) +REG32(GPIO_2700_INT_STATUS_3, 0x108) +REG32(GPIO_2700_INT_STATUS_4, 0x10C) +REG32(GPIO_2700_INT_STATUS_5, 0x110) +REG32(GPIO_2700_INT_STATUS_6, 0x114) +REG32 (GPIO_2700_INT_STATUS_7 ,0x118 ) +/* GPIOA0 - GPIOAA7 Control Register*/ +REG32(GPIO_A0_CONTROL, 0x180) + SHARED_FIELD(GPIO_CONTROL_OUT_DATA, 0, 1) + SHARED_FIELD(GPIO_CONTROL_DIRECTION, 1, 1) + SHARED_FIELD(GPIO_CONTROL_INT_ENABLE, 2, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_0, 3, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_1, 4, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_2, 5, 1) + SHARED_FIELD(GPIO_CONTROL_RESET_TOLERANCE, 6, 1) + SHARED_FIELD(GPIO_CONTROL_DEBOUNCE_1, 7, 1) + SHARED_FIELD(GPIO_CONTROL_DEBOUNCE_2, 8, 1) + SHARED_FIELD(GPIO_CONTROL_INPUT_MASK, 9, 1) + SHARED_FIELD(GPIO_CONTROL_BLINK_COUNTER_1, 10, 1) + SHARED_FIELD(GPIO_CONTROL_BLINK_COUNTER_2, 11, 1) + SHARED_FIELD(GPIO_CONTROL_INT_STATUS, 12, 1) + SHARED_FIELD(GPIO_CONTROL_IN_DATA, 13, 1) + SHARED_FIELD(GPIO_CONTROL_RESERVED, 14, 18) +REG32(GPIO_AA7_CONTROL, 0x4DC) +#define GPIO_2700_MEM_SIZE 0x4E0 +#define GPIO_2700_REG_ARRAY_SIZE (GPIO_2700_MEM_SIZE >> 2) +static int aspeed_evaluate_irq (GPIOSets *regs,int gpio_prev_high,int gpio) {uint32_t falling_edge =0 , rising_edge =0 ;
@@ -964,6 +996,309 @@ static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,aspeed_gpio_set_pin_level (s, set_idx, pin, level); } +static uint64_t aspeed_gpio_read_control_reg (AspeedGPIOState *s,uint32_t pin) +{ +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +GPIOSets *set; +uint64_t value =0 ; +uint32_t set_idx; +uint32_t pin_idx; + + set_idx = pin /ASPEED_GPIOS_PER_SET ; + pin_idx = pin %ASPEED_GPIOS_PER_SET ; + +if (set_idx >= agc->nr_gpio_sets) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: set index: %d, out of bounds\n" , + __func__, set_idx); +return 0 ; + } + + set = &s->sets[set_idx]; + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_OUT_DATA , +extract32 (set->data_read, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_DIRECTION , +extract32 (set->direction, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_ENABLE , +extract32 (set->int_enable, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_SENS_0 , +extract32 (set->int_sens_0, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_SENS_1 , +extract32 (set->int_sens_1, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_SENS_2 , +extract32 (set->int_sens_2, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_RESET_TOLERANCE , +extract32 (set->reset_tol, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_DEBOUNCE_1 , +extract32 (set->debounce_1, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_DEBOUNCE_2 , +extract32 (set->debounce_2, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INPUT_MASK , +extract32 (set->input_mask, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_STATUS , +extract32 (set->int_status, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_IN_DATA , +extract32 (set->data_value, pin_idx,1 )); +return value; +} + +static void aspeed_gpio_write_control_reg (AspeedGPIOState *s, +uint32_t pin,uint32_t type,uint64_t data) +{ +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +const GPIOSetProperties *props; +GPIOSets *set; +uint32_t cleared; +uint32_t set_idx; +uint32_t pin_idx; +uint32_t group_value =0 ; + + set_idx = pin /ASPEED_GPIOS_PER_SET ; + pin_idx = pin %ASPEED_GPIOS_PER_SET ; + +if (set_idx >= agc->nr_gpio_sets) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: set index: %d, out of bounds\n" , + __func__, set_idx); +return ; + } + + set = &s->sets[set_idx]; + props = &agc->props[set_idx]; + +/* direction */ + group_value = set->direction; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_DIRECTION )); +/* +* where data is the value attempted to be written to the pin: +* pin type | input mask | output mask | expected value +* ------------------------------------------------------------ +* bidirectional | 1 | 1 | data +* input only | 1 | 0 | 0 +* output only | 0 | 1 | 1 +* no pin | 0 | 0 | 0 +* +* which is captured by: +* data = ( data | ~input) & output; +*/ + group_value = (group_value | ~props->input) & props->output; + set->direction =update_value_control_source (set, set->direction, + group_value); + +/* out data */ + group_value = set->data_read; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_OUT_DATA )); + group_value &= props->output; + group_value =update_value_control_source (set, set->data_read, + group_value); + set->data_read = group_value; + +/* interrupt enable */ + group_value = set->int_enable; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_ENABLE )); + set->int_enable =update_value_control_source (set, set->int_enable, + group_value); + +/* interrupt sensitivity type 0 */ + group_value = set->int_sens_0; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_SENS_0 )); + set->int_sens_0 =update_value_control_source (set, set->int_sens_0, + group_value); + +/* interrupt sensitivity type 1 */ + group_value = set->int_sens_1; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_SENS_1 )); + set->int_sens_1 =update_value_control_source (set, set->int_sens_1, + group_value); + +/* interrupt sensitivity type 2 */ + group_value = set->int_sens_2; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_SENS_2 )); + set->int_sens_2 =update_value_control_source (set, set->int_sens_2, + group_value); + +/* reset tolerance enable */ + group_value = set->reset_tol; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_RESET_TOLERANCE )); + set->reset_tol =update_value_control_source (set, set->reset_tol, + group_value); + +/* debounce 1 */ + group_value = set->debounce_1; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_DEBOUNCE_1 )); + set->debounce_1 =update_value_control_source (set, set->debounce_1, + group_value); + +/* debounce 2 */ + group_value = set->debounce_2; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_DEBOUNCE_2 )); + set->debounce_2 =update_value_control_source (set, set->debounce_2, + group_value); + +/* input mask */ + group_value = set->input_mask; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INPUT_MASK )); +/* +* feeds into interrupt generation +* 0: read from data value reg will be updated +* 1: read from data value reg will not be updated +*/ + set->input_mask = group_value & props->input; + +/* blink counter 1 */ +/* blink counter 2 */ +/* unimplement */ + +/* interrupt status */ + group_value = set->int_status; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_STATUS )); + cleared =ctpop32 (group_value & set->int_status); +if (s->pending && cleared) { +assert (s->pending >= cleared); + s->pending -= cleared; + } + set->int_status &= ~group_value; + +aspeed_gpio_update (s, set, set->data_value,UINT32_MAX ); +return ; +} + +static uint64_t aspeed_gpio_2700_read (void *opaque,hwaddr offset, +uint32_t size) +{ +AspeedGPIOState *s =ASPEED_GPIO (opaque); +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +GPIOSets *set; +uint64_t value; +uint64_t reg; +uint32_t pin; +uint32_t idx; + + reg = offset >>2 ; + +if (reg >= agc->reg_table_count) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: offset 0x%" PRIx64" out of bounds\n" , + __func__, offset); +return 0 ; + } + +switch (reg) { + case R_GPIO_2700_DEBOUNCE_TIME_1 ... R_GPIO_2700_DEBOUNCE_TIME_3: + idx = reg -R_GPIO_2700_DEBOUNCE_TIME_1 ; + +if (idx >=ASPEED_GPIO_NR_DEBOUNCE_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: debounce index: %d, out of bounds\n" , + __func__, idx); +return 0 ; + } + + value = (uint64_t ) s->debounce_regs[idx]; +break ; + case R_GPIO_2700_INT_STATUS_1 ... R_GPIO_2700_INT_STATUS_7: + idx = reg -R_GPIO_2700_INT_STATUS_1 ; + +if (idx >= agc->nr_gpio_sets) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: interrupt status index: %d, out of bounds\n" , + __func__, idx); +return 0 ; + } + + set = &s->sets[idx]; + value = (uint64_t ) set->int_status; +break ; + case R_GPIO_A0_CONTROL ... R_GPIO_AA7_CONTROL: + pin = reg -R_GPIO_A0_CONTROL ; + +if (pin >= agc->nr_gpio_pins) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid pin number: %d\n" , + __func__, pin); +return 0 ; + } + + value =aspeed_gpio_read_control_reg (s, pin); +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: no getter for offset 0x%" + PRIx64"\n" , __func__, offset); +return 0 ; + } + +trace_aspeed_gpio_read (offset, value); +return value; +} + +static void aspeed_gpio_2700_write (void *opaque,hwaddr offset, +uint64_t data,uint32_t size) +{ +AspeedGPIOState *s =ASPEED_GPIO (opaque); +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +uint64_t reg; +uint32_t pin; +uint32_t type; +uint32_t idx; + +trace_aspeed_gpio_write (offset, data); + + reg = offset >>2 ; + +if (reg >= agc->reg_table_count) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: offset 0x%" PRIx64" out of bounds\n" , + __func__, offset); +return ; + } + +switch (reg) { + case R_GPIO_2700_DEBOUNCE_TIME_1 ... R_GPIO_2700_DEBOUNCE_TIME_3: + idx = reg -R_GPIO_2700_DEBOUNCE_TIME_1 ; + +if (idx >=ASPEED_GPIO_NR_DEBOUNCE_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: debounce index: %d out of bounds\n" , + __func__, idx); +return ; + } + + s->debounce_regs[idx] = (uint32_t ) data; +break ; + case R_GPIO_A0_CONTROL ... R_GPIO_AA7_CONTROL: + pin = reg -R_GPIO_A0_CONTROL ; + +if (pin >= agc->nr_gpio_pins) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid pin number: %d\n" , + __func__, pin); +return ; + } + +if (SHARED_FIELD_EX32 (data,GPIO_CONTROL_RESERVED )) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid reserved data: 0x%" + PRIx64"\n" , __func__, data); +return ; + } + +aspeed_gpio_write_control_reg (s, pin, type, data); +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: no setter for offset 0x%" + PRIx64"\n" , __func__, offset); +break ; + } + +return ; +} +/****************** Setup functions ******************/ static const GPIOSetProperties ast2400_set_props[ASPEED_GPIO_MAX_NR_SETS ] = { [0 ] = {0xffffffff ,0xffffffff , {"A" ,"B" ,"C" ,"D" } },
@@ -1010,6 +1345,16 @@ static GPIOSetProperties ast1030_set_props[ASPEED_GPIO_MAX_NR_SETS] = { [5] = {0x000000ff, 0x00000000, {"U"} }, }; +static GPIOSetProperties ast2700_set_props[ASPEED_GPIO_MAX_NR_SETS ] = { + [0 ] = {0xffffffff ,0xffffffff , {"A" ,"B" ,"C" ,"D" } }, + [1 ] = {0x0fffffff ,0x0fffffff , {"E" ,"F" ,"G" ,"H" } }, + [2 ] = {0xffffffff ,0xffffffff , {"I" ,"J" ,"K" ,"L" } }, + [3 ] = {0xffffffff ,0xffffffff , {"M" ,"N" ,"O" ,"P" } }, + [4 ] = {0xffffffff ,0xffffffff , {"Q" ,"R" ,"S" ,"T" } }, + [5 ] = {0xffffffff ,0xffffffff , {"U" ,"V" ,"W" ,"X" } }, + [6 ] = {0x00ffffff ,0x00ffffff , {"Y" ,"Z" ,"AA" } }, +}; +static const MemoryRegionOps aspeed_gpio_ops = { .read = aspeed_gpio_read, .write = aspeed_gpio_write,
@@ -1018,6 +1363,14 @@ static const MemoryRegionOps aspeed_gpio_ops = { .valid.max_access_size = 4, }; +static const MemoryRegionOps aspeed_gpio_2700_ops = { + .read = aspeed_gpio_2700_read, + .write = aspeed_gpio_2700_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid.min_access_size =4 , + .valid.max_access_size =4 , +}; +static void aspeed_gpio_reset (DeviceState *dev) {AspeedGPIOState *s =ASPEED_GPIO (dev);
@@ -1187,6 +1540,18 @@ static void aspeed_gpio_1030_class_init(ObjectClass *klass, void *data) agc->reg_ops = &aspeed_gpio_ops; } +static void aspeed_gpio_2700_class_init (ObjectClass *klass,void *data) +{ +AspeedGPIOClass *agc =ASPEED_GPIO_CLASS (klass); + + agc->props = ast2700_set_props; + agc->nr_gpio_pins =216 ; + agc->nr_gpio_sets =7 ; + agc->reg_table_count =GPIO_2700_REG_ARRAY_SIZE ; + agc->mem_size =0x1000 ; + agc->reg_ops = &aspeed_gpio_2700_ops; +} +static const TypeInfo aspeed_gpio_info = { .name =TYPE_ASPEED_GPIO , .parent =TYPE_SYS_BUS_DEVICE ,
@@ -1231,6 +1596,13 @@ static const TypeInfo aspeed_gpio_ast1030_info = { .instance_init = aspeed_gpio_init, }; +static const TypeInfo aspeed_gpio_ast2700_info = { + .name =TYPE_ASPEED_GPIO "-ast2700" , + .parent =TYPE_ASPEED_GPIO , + .class_init = aspeed_gpio_2700_class_init, + .instance_init = aspeed_gpio_init, +}; +static void aspeed_gpio_register_types (void ) {type_register_static (&aspeed_gpio_info);
@@ -1239,6 +1611,7 @@ static void aspeed_gpio_register_types(void)type_register_static (&aspeed_gpio_ast2600_3_3v_info);type_register_static (&aspeed_gpio_ast2600_1_8v_info);type_register_static (&aspeed_gpio_ast1030_info); +type_register_static (&aspeed_gpio_ast2700_info); }type_init (aspeed_gpio_register_types);
Signature · 1 line
2.34.1
PATCH 1/5 hw/gpio/aspeed: Fix coding style
In reply to Jamin Lin viaFix coding style issues from checkpatch.pl
--- hw/gpio/aspeed_gpio.c | 3 ++- include/hw/gpio/aspeed_gpio.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
hw/gpio/aspeed_gpio.c +2 -1
@@ -340,7 +340,8 @@ static void aspeed_gpio_set_pin_level(AspeedGPIOState *s, uint32_t set_idx, value &= ~pin_mask; } -aspeed_gpio_update (s, &s->sets[set_idx], value, ~s->sets[set_idx].direction); +aspeed_gpio_update (s, &s->sets[set_idx], value, + ~s->sets[set_idx].direction); }/*
include/hw/gpio/aspeed_gpio.h +1 -1
@@ -88,7 +88,7 @@ struct AspeedGPIOState {qemu_irq irq;qemu_irq gpios[ASPEED_GPIO_MAX_NR_SETS ][ASPEED_GPIOS_PER_SET ]; -/* Parallel GPIO Registers */ +/* Parallel GPIO Registers */ uint32_t debounce_regs[ASPEED_GPIO_NR_DEBOUNCE_REGS ];struct GPIOSets {uint32_t data_value;/* Reflects pin values */
Signature · 1 line
2.34.1
PATCH 3/5 hw/gpio/aspeed: Support different memory region ops
In reply to Jamin Lin viaIt set "aspeed_gpio_ops" struct which containing read and write callbacks to be used when I/O is performed on the GPIO region.
Besides, in the previous design of ASPEED SOCs,
one register is used for setting one function for 32 GPIO pins.
ex: GPIO000 is used for setting data value for GPIO A, B, C and D in AST2600.
ex: GPIO004 is used for setting direction for GPIO A, B, C and D in AST2600.
However, the register set have a significant change in AST2700. Each GPIO pin has their own control register. In other words, users are able to set one GPIO pin’s direction, interrupt enable, input mask and so on in one register. The aspeed_gpio_read/aspeed_gpio_write callback functions are not compatible AST2700.
Introduce a new "const MemoryRegionOps *" attribute in AspeedGPIOClass and use it in aspeed_gpio_realize function.
--- hw/gpio/aspeed_gpio.c | 7 ++++++- include/hw/gpio/aspeed_gpio.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
hw/gpio/aspeed_gpio.c +6 -1
@@ -1047,7 +1047,7 @@ static void aspeed_gpio_realize(DeviceState *dev, Error **errp) } } -memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_gpio_ops, s, +memory_region_init_io (&s->iomem,OBJECT (s), agc->reg_ops, s,TYPE_ASPEED_GPIO , agc->mem_size);sysbus_init_mmio (sbd, &s->iomem);
@@ -1132,6 +1132,7 @@ static void aspeed_gpio_ast2400_class_init(ObjectClass *klass, void *data) agc->reg_table = aspeed_3_3v_gpios; agc->reg_table_count =GPIO_3_3V_REG_ARRAY_SIZE ; agc->mem_size =0x1000 ; + agc->reg_ops = &aspeed_gpio_ops; }static void aspeed_gpio_2500_class_init (ObjectClass *klass,void *data)
@@ -1144,6 +1145,7 @@ static void aspeed_gpio_2500_class_init(ObjectClass *klass, void *data) agc->reg_table = aspeed_3_3v_gpios; agc->reg_table_count =GPIO_3_3V_REG_ARRAY_SIZE ; agc->mem_size =0x1000 ; + agc->reg_ops = &aspeed_gpio_ops; }static void aspeed_gpio_ast2600_3_3v_class_init (ObjectClass *klass,void *data)
@@ -1156,6 +1158,7 @@ static void aspeed_gpio_ast2600_3_3v_class_init(ObjectClass *klass, void *data) agc->reg_table = aspeed_3_3v_gpios; agc->reg_table_count =GPIO_3_3V_REG_ARRAY_SIZE ; agc->mem_size =0x800 ; + agc->reg_ops = &aspeed_gpio_ops; }static void aspeed_gpio_ast2600_1_8v_class_init (ObjectClass *klass,void *data)
@@ -1168,6 +1171,7 @@ static void aspeed_gpio_ast2600_1_8v_class_init(ObjectClass *klass, void *data) agc->reg_table = aspeed_1_8v_gpios; agc->reg_table_count =GPIO_1_8V_REG_ARRAY_SIZE ; agc->mem_size =0x800 ; + agc->reg_ops = &aspeed_gpio_ops; }static void aspeed_gpio_1030_class_init (ObjectClass *klass,void *data)
@@ -1180,6 +1184,7 @@ static void aspeed_gpio_1030_class_init(ObjectClass *klass, void *data) agc->reg_table = aspeed_3_3v_gpios; agc->reg_table_count =GPIO_3_3V_REG_ARRAY_SIZE ; agc->mem_size =0x1000 ; + agc->reg_ops = &aspeed_gpio_ops; }static const TypeInfo aspeed_gpio_info = {
include/hw/gpio/aspeed_gpio.h +1 -0
@@ -77,6 +77,7 @@ struct AspeedGPIOClass {const AspeedGPIOReg *reg_table;unsigned reg_table_count;uint64_t mem_size; +const MemoryRegionOps *reg_ops; };struct AspeedGPIOState {
Signature · 1 line
2.34.1
Andrew Jeffery
maintainerRe: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
In reply to Jamin Lin viaHi Jamin,
Quoted 70 lines · Jamin Lin
AST2700 integrates two set of Parallel GPIO Controller with maximum 212 control pins, which are 27 groups. (H, exclude pin: H7 H6 H5 H4)
In the previous design of ASPEED SOCs,
one register is used for setting one function for one set which are 32 pins and 4 groups.
ex: GPIO000 is used for setting data value for GPIO A, B, C and D in AST2600.
ex: GPIO004 is used for setting direction for GPIO A, B, C and D in AST2600.However, the register set have a significant change since AST2700.
Each GPIO pin has their own individual control register. In other words, users are able to set one GPIO pin’s direction, interrupt enable, input mask and so on
in the same one register.Currently, aspeed_gpio_read/aspeed_gpio_write callback functions are not compatible AST2700.
Introduce new aspeed_gpio_2700_read/aspeed_gpio_2700_write callback functions andaspeed_gpio_2700_opsmemory region operation for AST2700. Introduce a new ast2700 class to support AST2700.Signed-off-by Jamin Lin <[email protected]>--- hw/gpio/aspeed_gpio.c | 373 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+)hw/gpio/aspeed_gpio.c +32
-0@@ -227,6 +227,38 @@ REG32(GPIO_INDEX_REG, 0x2AC) FIELD(GPIO_INDEX_REG, COMMAND_SRC_1, 21, 1)FIELD (GPIO_INDEX_REG ,INPUT_MASK ,20 ,1 ) +/* AST2700 GPIO Register Address Offsets */ +REG32(GPIO_2700_DEBOUNCE_TIME_1, 0x000) +REG32(GPIO_2700_DEBOUNCE_TIME_2, 0x004) +REG32(GPIO_2700_DEBOUNCE_TIME_3, 0x008) +REG32(GPIO_2700_INT_STATUS_1, 0x100) +REG32(GPIO_2700_INT_STATUS_2, 0x104) +REG32(GPIO_2700_INT_STATUS_3, 0x108) +REG32(GPIO_2700_INT_STATUS_4, 0x10C) +REG32(GPIO_2700_INT_STATUS_5, 0x110) +REG32(GPIO_2700_INT_STATUS_6, 0x114) +REG32 (GPIO_2700_INT_STATUS_7 ,0x118 ) +/* GPIOA0 - GPIOAA7 Control Register*/ +REG32(GPIO_A0_CONTROL, 0x180) + SHARED_FIELD(GPIO_CONTROL_OUT_DATA, 0, 1) + SHARED_FIELD(GPIO_CONTROL_DIRECTION, 1, 1) + SHARED_FIELD(GPIO_CONTROL_INT_ENABLE, 2, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_0, 3, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_1, 4, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_2, 5, 1) + SHARED_FIELD(GPIO_CONTROL_RESET_TOLERANCE, 6, 1) + SHARED_FIELD(GPIO_CONTROL_DEBOUNCE_1, 7, 1) + SHARED_FIELD(GPIO_CONTROL_DEBOUNCE_2, 8, 1) + SHARED_FIELD(GPIO_CONTROL_INPUT_MASK, 9, 1) + SHARED_FIELD(GPIO_CONTROL_BLINK_COUNTER_1, 10, 1) + SHARED_FIELD(GPIO_CONTROL_BLINK_COUNTER_2, 11, 1) + SHARED_FIELD(GPIO_CONTROL_INT_STATUS, 12, 1) + SHARED_FIELD(GPIO_CONTROL_IN_DATA, 13, 1) + SHARED_FIELD(GPIO_CONTROL_RESERVED, 14, 18) +REG32(GPIO_AA7_CONTROL, 0x4DC) +#define GPIO_2700_MEM_SIZE 0x4E0 +#define GPIO_2700_REG_ARRAY_SIZE (GPIO_2700_MEM_SIZE >> 2) +static int aspeed_evaluate_irq (GPIOSets *regs,int gpio_prev_high,int gpio) {uint32_t falling_edge =0 , rising_edge =0 ;
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 999
Quoted 4 lines
hw/gpio/aspeed_gpio.c +1
-0@@ -964,6 +996,309 @@ static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,aspeed_gpio_set_pin_level (s, set_idx, pin, level); } +static uint64_t aspeed_gpio_read_control_reg (AspeedGPIOState *s,uint32_t pin)
This function is specific to the AST2700 and I think the name should reflect that.
Quoted 35 lines
hw/gpio/aspeed_gpio.c +35
-0+{ +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +GPIOSets *set; +uint64_t value =0 ; +uint32_t set_idx; +uint32_t pin_idx; + + set_idx = pin /ASPEED_GPIOS_PER_SET ; + pin_idx = pin %ASPEED_GPIOS_PER_SET ; + +if (set_idx >= agc->nr_gpio_sets) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: set index: %d, out of bounds\n" , + __func__, set_idx); +return 0 ; + } + + set = &s->sets[set_idx]; + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_OUT_DATA , +extract32 (set->data_read, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_DIRECTION , +extract32 (set->direction, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_ENABLE , +extract32 (set->int_enable, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_SENS_0 , +extract32 (set->int_sens_0, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_SENS_1 , +extract32 (set->int_sens_1, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_SENS_2 , +extract32 (set->int_sens_2, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_RESET_TOLERANCE , +extract32 (set->reset_tol, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_DEBOUNCE_1 , +extract32 (set->debounce_1, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_DEBOUNCE_2 , +extract32 (set->debounce_2, pin_idx,1 ));
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1044
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+ value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INPUT_MASK , +extract32 (set->input_mask, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_STATUS , +extract32 (set->int_status, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_IN_DATA , +extract32 (set->data_value, pin_idx,1 )); +return value; +} + +static void aspeed_gpio_write_control_reg(AspeedGPIOState *s,
Also should reflect it's specific to the AST2700?
Quoted 109 lines
hw/gpio/aspeed_gpio.c +109
-0+ uint32_t pin, uint32_t type, uint64_t data) +{ + AspeedGPIOClass *agc = ASPEED_GPIO_GET_CLASS(s); +const GPIOSetProperties *props; +GPIOSets *set; +uint32_t cleared; +uint32_t set_idx; +uint32_t pin_idx; +uint32_t group_value =0 ; + + set_idx = pin /ASPEED_GPIOS_PER_SET ; + pin_idx = pin %ASPEED_GPIOS_PER_SET ; + +if (set_idx >= agc->nr_gpio_sets) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: set index: %d, out of bounds\n" , + __func__, set_idx); +return ; + } + + set = &s->sets[set_idx]; + props = &agc->props[set_idx]; + +/* direction */ + group_value = set->direction; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_DIRECTION )); +/* +* where data is the value attempted to be written to the pin: +* pin type | input mask | output mask | expected value +* ------------------------------------------------------------ +* bidirectional | 1 | 1 | data +* input only | 1 | 0 | 0 +* output only | 0 | 1 | 1 +* no pin | 0 | 0 | 0 +* +* which is captured by: +* data = ( data | ~input) & output; +*/ + group_value = (group_value | ~props->input) & props->output; + set->direction =update_value_control_source (set, set->direction, + group_value); + +/* out data */ + group_value = set->data_read; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_OUT_DATA )); + group_value &= props->output; + group_value =update_value_control_source (set, set->data_read, + group_value); + set->data_read = group_value; + +/* interrupt enable */ + group_value = set->int_enable; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_ENABLE )); + set->int_enable =update_value_control_source (set, set->int_enable, + group_value); + +/* interrupt sensitivity type 0 */ + group_value = set->int_sens_0; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_SENS_0 )); + set->int_sens_0 =update_value_control_source (set, set->int_sens_0, + group_value); + +/* interrupt sensitivity type 1 */ + group_value = set->int_sens_1; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_SENS_1 )); + set->int_sens_1 =update_value_control_source (set, set->int_sens_1, + group_value); + +/* interrupt sensitivity type 2 */ + group_value = set->int_sens_2; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_SENS_2 )); + set->int_sens_2 =update_value_control_source (set, set->int_sens_2, + group_value); + +/* reset tolerance enable */ + group_value = set->reset_tol; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_RESET_TOLERANCE )); + set->reset_tol =update_value_control_source (set, set->reset_tol, + group_value); + +/* debounce 1 */ + group_value = set->debounce_1; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_DEBOUNCE_1 )); + set->debounce_1 =update_value_control_source (set, set->debounce_1, + group_value); + +/* debounce 2 */ + group_value = set->debounce_2; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_DEBOUNCE_2 )); + set->debounce_2 =update_value_control_source (set, set->debounce_2, + group_value); + +/* input mask */ + group_value = set->input_mask; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INPUT_MASK )); +/* +* feeds into interrupt generation +* 0: read from data value reg will be updated +* 1: read from data value reg will not be updated +*/
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1163
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+ set->input_mask = group_value & props->input; + +/* blink counter 1 */ +/* blink counter 2 */ +/* unimplement */ + +/* interrupt status */ + group_value = set->int_status; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data,GPIO_CONTROL_INT_STATUS ));
This makes me a bit wary.
The interrupt status field is W1C, where a set bit on read indicates an interrupt is pending. If the bit extracted from data is set it should clear the corresponding bit in group_value. However, if the extracted bit is clear then the value of the corresponding bit in group_value should be unchanged.
SHARED_FIELD_EX32() extracts the interrupt status bit from the write (data). group_value is set to the set's interrupt status, which means that for any pin with an interrupt pending, the corresponding bit is set. The deposit32() call updates the bit at pin_idx in the group, using the value extracted from the write (data).
However, the result is that if the interrupt was pending and the write was acknowledging it, then the update has no effect. Alternatively, if the interrupt was pending but the write was acknowledging it, then the update will mark the interrupt as pending. Or, if the interrupt was pending but the write was _not_ acknowledging it, then the interrupt will _no longer_ be marked pending. If this is intentional it feels a bit hard to follow.
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1164
Quoted 1 line
hw/gpio/aspeed_gpio.c +1
-0+ cleared =ctpop32 (group_value & set->int_status);
Can this rather be expressed as
``` cleared = SHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS); ```
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1167
Quoted 3 lines
hw/gpio/aspeed_gpio.c +3
-0+if (s->pending && cleared) { +assert (s->pending >= cleared); + s->pending -= cleared;
We're only ever going to be subtracting 1, as each GPIO has its own register. This feels overly abstract.
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1169
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ } + set->int_status &= ~group_value;
This feels like it misbehaves in the face of multiple pending interrupts.
For example, say we have an interrupt pending for GPIOA0, where the following statements are true:
set->int_status == 0b01
s->pending == 1
Before it is acknowledged, an interrupt becomes pending for GPIOA1:
set->int_status == 0b11
s->pending == 2
A write is issued to acknowledge the interrupt for GPIOA0. This causes the following sequence:
group_value == 0b11
cleared == 2
s->pending = 0
set->int_status == 0b00
It seems the pending interrupt for GPIOA1 is lost?
Quoted 123 lines
hw/gpio/aspeed_gpio.c +123
-0+ +aspeed_gpio_update (s, set, set->data_value,UINT32_MAX ); +return ; +} + +static uint64_t aspeed_gpio_2700_read (void *opaque,hwaddr offset, +uint32_t size) +{ +AspeedGPIOState *s =ASPEED_GPIO (opaque); +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +GPIOSets *set; +uint64_t value; +uint64_t reg; +uint32_t pin; +uint32_t idx; + + reg = offset >>2 ; + +if (reg >= agc->reg_table_count) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: offset 0x%" PRIx64" out of bounds\n" , + __func__, offset); +return 0 ; + } + +switch (reg) { + case R_GPIO_2700_DEBOUNCE_TIME_1 ... R_GPIO_2700_DEBOUNCE_TIME_3: + idx = reg -R_GPIO_2700_DEBOUNCE_TIME_1 ; + +if (idx >=ASPEED_GPIO_NR_DEBOUNCE_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: debounce index: %d, out of bounds\n" , + __func__, idx); +return 0 ; + } + + value = (uint64_t ) s->debounce_regs[idx]; +break ; + case R_GPIO_2700_INT_STATUS_1 ... R_GPIO_2700_INT_STATUS_7: + idx = reg -R_GPIO_2700_INT_STATUS_1 ; + +if (idx >= agc->nr_gpio_sets) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: interrupt status index: %d, out of bounds\n" , + __func__, idx); +return 0 ; + } + + set = &s->sets[idx]; + value = (uint64_t ) set->int_status; +break ; + case R_GPIO_A0_CONTROL ... R_GPIO_AA7_CONTROL: + pin = reg -R_GPIO_A0_CONTROL ; + +if (pin >= agc->nr_gpio_pins) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid pin number: %d\n" , + __func__, pin); +return 0 ; + } + + value =aspeed_gpio_read_control_reg (s, pin); +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: no getter for offset 0x%" + PRIx64"\n" , __func__, offset); +return 0 ; + } + +trace_aspeed_gpio_read (offset, value); +return value; +} + +static void aspeed_gpio_2700_write (void *opaque,hwaddr offset, +uint64_t data,uint32_t size) +{ +AspeedGPIOState *s =ASPEED_GPIO (opaque); +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +uint64_t reg; +uint32_t pin; +uint32_t type; +uint32_t idx; + +trace_aspeed_gpio_write (offset, data); + + reg = offset >>2 ; + +if (reg >= agc->reg_table_count) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: offset 0x%" PRIx64" out of bounds\n" , + __func__, offset); +return ; + } + +switch (reg) { + case R_GPIO_2700_DEBOUNCE_TIME_1 ... R_GPIO_2700_DEBOUNCE_TIME_3: + idx = reg -R_GPIO_2700_DEBOUNCE_TIME_1 ; + +if (idx >=ASPEED_GPIO_NR_DEBOUNCE_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: debounce index: %d out of bounds\n" , + __func__, idx); +return ; + } + + s->debounce_regs[idx] = (uint32_t ) data; +break ; + case R_GPIO_A0_CONTROL ... R_GPIO_AA7_CONTROL: + pin = reg -R_GPIO_A0_CONTROL ; + +if (pin >= agc->nr_gpio_pins) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid pin number: %d\n" , + __func__, pin); +return ; + } + +if (SHARED_FIELD_EX32 (data,GPIO_CONTROL_RESERVED )) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid reserved data: 0x%" + PRIx64"\n" , __func__, data); +return ; + } + +aspeed_gpio_write_control_reg (s, pin, type, data); +break ;
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1302
Quoted 10 lines
hw/gpio/aspeed_gpio.c +9
-0+default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: no setter for offset 0x%" + PRIx64"\n" , __func__, offset); +break ; + } + +return ; +} +/****************** Setup functions ******************/
Bit of a nitpick, but I'm not personally a fan of banner comments like this.
Andrew
RE: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Andrew,
Quoted 77 lines
Subject: Re: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Jamin,
Quoted 31 lines · Jamin Lin
AST2700 integrates two set of Parallel GPIO Controller with maximum 212 control pins, which are 27 groups.
(H, exclude pin: H7 H6 H5 H4)In the previous design of ASPEED SOCs, one register is used for setting one function for one set which are 32 pins and 4 groups.
ex: GPIO000 is used for setting data value for GPIO A, B, C and D in AST2600.
ex: GPIO004 is used for setting direction for GPIO A, B, C and D in AST2600.However, the register set have a significant change since AST2700. Each GPIO pin has their own individual control register. In other words, users are able to set one GPIO pin’s direction, interrupt enable, input mask and so on in the same one register.
Currently, aspeed_gpio_read/aspeed_gpio_write callback functions are not compatible AST2700.
Introduce new aspeed_gpio_2700_read/aspeed_gpio_2700_write callback functions andaspeed_gpio_2700_opsmemory region operation for AST2700. Introduce a new ast2700 class to support AST2700.Signed-off-by Jamin Lin <[email protected]>--- hw/gpio/aspeed_gpio.c | 373 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+)hw/gpio/aspeed_gpio.c index renamed from hw/gpio/aspeed_gpio.c +0
-0
f23ffae34d..e3d5556dc1100644hw/gpio/aspeed_gpio.c REG32(GPIO_INDEX_REG, 0x2AC) · line 233
Quoted 7 lines
hw/gpio/aspeed_gpio.c +4
-0@@ -227,6 +227,38 @@ REG32(GPIO_INDEX_REG, 0x2AC) FIELD(GPIO_INDEX_REG, COMMAND_SRC_1, 21, 1)FIELD (GPIO_INDEX_REG ,INPUT_MASK ,20 ,1 ) +/* AST2700 GPIO Register Address Offsets */ +REG32(GPIO_2700_DEBOUNCE_TIME_1, 0x000) +REG32(GPIO_2700_DEBOUNCE_TIME_2, 0x004) +REG32 (GPIO_2700_DEBOUNCE_TIME_3 ,0x008 )REG32(GPIO_2700_INT_STATUS_1,
hw/gpio/aspeed_gpio.c REG32(GPIO_INDEX_REG, 0x2AC) · line 235
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+0x100) REG32(GPIO_2700_INT_STATUS_2, 0x104) +REG32 (GPIO_2700_INT_STATUS_3 ,0x108 )REG32(GPIO_2700_INT_STATUS_4,
hw/gpio/aspeed_gpio.c REG32(GPIO_INDEX_REG, 0x2AC) · line 237
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+0x10C) REG32(GPIO_2700_INT_STATUS_5, 0x110) +REG32 (GPIO_2700_INT_STATUS_6 ,0x114 )REG32(GPIO_2700_INT_STATUS_7,
hw/gpio/aspeed_gpio.c REG32(GPIO_INDEX_REG, 0x2AC) · line 239
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+0x118) +/* GPIOA0 - GPIOAA7 Control Register*/ REG32(GPIO_A0_CONTROL,
0x180)Quoted 24 lines
hw/gpio/aspeed_gpio.c +18
-0+ SHARED_FIELD(GPIO_CONTROL_OUT_DATA, 0, 1) + SHARED_FIELD(GPIO_CONTROL_DIRECTION, 1, 1) + SHARED_FIELD(GPIO_CONTROL_INT_ENABLE, 2, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_0, 3, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_1, 4, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_2, 5, 1) + SHARED_FIELD(GPIO_CONTROL_RESET_TOLERANCE, 6, 1) + SHARED_FIELD(GPIO_CONTROL_DEBOUNCE_1, 7, 1) + SHARED_FIELD(GPIO_CONTROL_DEBOUNCE_2, 8, 1) + SHARED_FIELD(GPIO_CONTROL_INPUT_MASK, 9, 1) + SHARED_FIELD(GPIO_CONTROL_BLINK_COUNTER_1, 10, 1) + SHARED_FIELD(GPIO_CONTROL_BLINK_COUNTER_2, 11, 1) + SHARED_FIELD(GPIO_CONTROL_INT_STATUS, 12, 1) + SHARED_FIELD(GPIO_CONTROL_IN_DATA, 13, 1) + SHARED_FIELD(GPIO_CONTROL_RESERVED, 14, 18) +REG32(GPIO_AA7_CONTROL, 0x4DC) #define GPIO_2700_MEM_SIZE 0x4E0 +#define GPIO_2700_REG_ARRAY_SIZE (GPIO_2700_MEM_SIZE >> 2) +static int aspeed_evaluate_irq (GPIOSets *regs,int gpio_prev_high,int gpio) { uint32_t falling_edge = 0, rising_edge = 0; @@ -964,6 +996,309 @@static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
aspeed_gpio_set_pin_level(s, set_idx, pin, level); }
Quoted 6 lines
hw/gpio/aspeed_gpio.c
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+static uint64_t aspeed_gpio_read_control_reg (AspeedGPIOState *s, +uint32_t pin)This function is specific to the AST2700 and I think the name should reflect that.
Will rename it.
Quoted 46 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 12 lines
hw/gpio/aspeed_gpio.c +12
-0+{ +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +GPIOSets *set; +uint64_t value =0 ; +uint32_t set_idx; +uint32_t pin_idx; + + set_idx = pin /ASPEED_GPIOS_PER_SET ; + pin_idx = pin %ASPEED_GPIOS_PER_SET ; + +if (set_idx >= agc->nr_gpio_sets) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: set index: %d, out ofbounds\n",
Quoted 8 lines
hw/gpio/aspeed_gpio.c +8
-0+ __func__, set_idx); +return 0 ; + } + + set = &s->sets[set_idx]; + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_OUT_DATA , +extract32 (set->data_read, pin_idx,1 )); + value = SHARED_FIELD_DP32(value, GPIO_CONTROL_DIRECTION,hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+ extract32(set->direction, pin_idx, 1)); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_ENABLE , +extract32 (set->int_enable, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_SENS_0 , +extract32 (set->int_sens_0, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_SENS_1 , +extract32 (set->int_sens_1, pin_idx,1 )); + value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_SENS_2 , +extract32 (set->int_sens_2, pin_idx,1 )); + value = SHARED_FIELD_DP32(value,
GPIO_CONTROL_RESET_TOLERANCE,hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 3 lines
hw/gpio/aspeed_gpio.c +3
-0+ extract32(set->reset_tol, pin_idx, 1)); + value = SHARED_FIELD_DP32(value, GPIO_CONTROL_DEBOUNCE_1, + extract32(set->debounce_1, pin_idx,1));
hw/gpio/aspeed_gpio.c
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ value = SHARED_FIELD_DP32(value, GPIO_CONTROL_DEBOUNCE_2, + extract32(set->debounce_2, pin_idx,1));
hw/gpio/aspeed_gpio.c
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ value = SHARED_FIELD_DP32(value, GPIO_CONTROL_INPUT_MASK, + extract32(set->input_mask, pin_idx,1));
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 4 lines
hw/gpio/aspeed_gpio.c +4
-0+ value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_INT_STATUS , +extract32 (set->int_status, pin_idx,1 )); + value = SHARED_FIELD_DP32(value, GPIO_CONTROL_IN_DATA, + extract32(set->data_value, pin_idx,
Quoted 8 lines
1));
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1044
Quoted 4 lines
hw/gpio/aspeed_gpio.c +4
-0+return value; +} + +static void aspeed_gpio_write_control_reg(AspeedGPIOState *s,Also should reflect it's specific to the AST2700?
Will rename it.
Quoted 186 lines
Quoted 4 lines
hw/gpio/aspeed_gpio.c +4
-0+ uint32_t pin, uint32_t type, uint64_t data) { + AspeedGPIOClass *agc = ASPEED_GPIO_GET_CLASS(s); +const GPIOSetProperties *props; +GPIOSets *set;hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+uint32_t cleared; +uint32_t set_idx; +uint32_t pin_idx; +uint32_t group_value =0 ; + + set_idx = pin /ASPEED_GPIOS_PER_SET ; + pin_idx = pin %ASPEED_GPIOS_PER_SET ; + +if (set_idx >= agc->nr_gpio_sets) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: set index: %d, out ofbounds\n",
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 11 lines
hw/gpio/aspeed_gpio.c +11
-0+ __func__, set_idx); +return ; + } + + set = &s->sets[set_idx]; + props = &agc->props[set_idx]; + +/* direction */ + group_value = set->direction; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_DIRECTION));Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+/* +* where data is the value attempted to be written to the pin: +* pin type | input mask | output mask | expected value +* ------------------------------------------------------------ +* bidirectional | 1 | 1 | data +* input only | 1 | 0 | 0 +* output only | 0 | 1 | 1 +* no pin | 0 | 0 | 0 +* +* which is captured by: hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+* data = ( data | ~input) & output; +*/ + group_value = (group_value | ~props->input) & props->output; + set->direction =update_value_control_source (set, set->direction, + group_value); + +/* out data */ + group_value = set->data_read; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_OUT_DATA));hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 9 lines
hw/gpio/aspeed_gpio.c +9
-0+ group_value &= props->output; + group_value =update_value_control_source (set, set->data_read, + group_value); + set->data_read = group_value; + +/* interrupt enable */ + group_value = set->int_enable; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INT_ENABLE));hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+ set->int_enable =update_value_control_source (set, set->int_enable, + group_value); + +/* interrupt sensitivity type 0 */ + group_value = set->int_sens_0; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INT_SENS_0));hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+ set->int_sens_0 =update_value_control_source (set, set->int_sens_0, + group_value); + +/* interrupt sensitivity type 1 */ + group_value = set->int_sens_1; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INT_SENS_1));hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+ set->int_sens_1 =update_value_control_source (set, set->int_sens_1, + group_value); + +/* interrupt sensitivity type 2 */ + group_value = set->int_sens_2; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INT_SENS_2));hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+ set->int_sens_2 =update_value_control_source (set, set->int_sens_2, + group_value); + +/* reset tolerance enable */ + group_value = set->reset_tol; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_RESET_TOLERANCE));hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+ set->reset_tol =update_value_control_source (set, set->reset_tol, + group_value); + +/* debounce 1 */ + group_value = set->debounce_1; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_DEBOUNCE_1));Quoted 1 line
+
set->debounce_1= update_value_control_source(set,
set->debounce_1,hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 6 lines
hw/gpio/aspeed_gpio.c +6
-0+ group_value); + +/* debounce 2 */ + group_value = set->debounce_2; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_DEBOUNCE_2));Quoted 1 line
+
set->debounce_2= update_value_control_source(set,
set->debounce_2,hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 6 lines
hw/gpio/aspeed_gpio.c +6
-0+ group_value); + +/* input mask */ + group_value = set->input_mask; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INPUT_MASK));Quoted 6 lines
hw/gpio/aspeed_gpio.c +6
-0+/* +* feeds into interrupt generation +* 0: read from data value reg will be updated +* 1: read from data value reg will not be updated +*/ + set->input_mask = group_value & props->input;hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+ +/* blink counter 1 */ +/* blink counter 2 */ +/* unimplement */ + +/* interrupt status */ + group_value = set->int_status; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data, +GPIO_CONTROL_INT_STATUS ));This makes me a bit wary.
The interrupt status field is W1C, where a set bit on read indicates an interrupt is pending. If the bit extracted from data is set it should clear the corresponding bit in
group_value. However, if the extracted bit is clear then the value of the corresponding bit ingroup_valueshould be unchanged.
SHARED_FIELD_EX32()extracts the interrupt status bit from the write (data).group_valueis set to the set's interrupt status, which means that for any pin with an interrupt pending, the corresponding bit is set. Thedeposit32()call updates the bit atpin_idxin the group, using the value extracted from the write (data).However, the result is that if the interrupt was pending and the write was acknowledging it, then the update has no effect. Alternatively, if the interrupt was pending but the write was acknowledging it, then the update will mark the interrupt as pending. Or, if the interrupt was pending but the write was _not_ acknowledging it, then the interrupt will
_nolonger_be marked pending. If this is intentional it feels a bit hard to follow.Quoted 1 line
+ cleared =
ctpop32(group_value & set->int_status);Can this rather be expressed as
```
cleared =SHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS); ```hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1167
Quoted 3 lines
hw/gpio/aspeed_gpio.c +3
-0+if (s->pending && cleared) { +assert (s->pending >= cleared); + s->pending -= cleared;We're only ever going to be subtracting 1, as each GPIO has its own register. This feels overly abstract.
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1169
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ } + set->int_status &= ~group_value;This feels like it misbehaves in the face of multiple pending interrupts.
For example, say we have an interrupt pending for GPIOA0, where the following statements are true:
set->int_status == 0b01 s->pending == 1Before it is acknowledged, an interrupt becomes pending for GPIOA1:
set->int_status == 0b11 s->pending == 2A write is issued to acknowledge the interrupt for GPIOA0. This causes the following sequence:
Quoted 7 lines
group_value == 0b11 cleared == 2 s->pending = 0 set->int_status == 0b00It seems the pending interrupt for GPIOA1 is lost?
Thanks for review and input.
I should check "int_status" bit of write data in write callback function. If 1 clear status flag(group value), else should not change group value. I am checking and testing this issue and will update to you or directly resend the new patch series.
Quoted 131 lines
Quoted 16 lines
hw/gpio/aspeed_gpio.c +16
-0+ +aspeed_gpio_update (s, set, set->data_value,UINT32_MAX ); +return ; +} + +static uint64_t aspeed_gpio_2700_read (void *opaque,hwaddr offset, +uint32_t size) { +AspeedGPIOState *s =ASPEED_GPIO (opaque); +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +GPIOSets *set; +uint64_t value; +uint64_t reg; +uint32_t pin; +uint32_t idx; + + reg = offset >>2 ;hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+ +if (reg >= agc->reg_table_count) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: offset 0x%" PRIx64" out of bounds\n" , + __func__, offset); +return 0 ; + } + + switch (reg) { + case R_GPIO_2700_DEBOUNCE_TIME_1 ...
R_GPIO_2700_DEBOUNCE_TIME_3:Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+ idx = reg -R_GPIO_2700_DEBOUNCE_TIME_1 ; + +if (idx >=ASPEED_GPIO_NR_DEBOUNCE_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: debounce index: %d, out of bounds\n" , + __func__, idx); +return 0 ;hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+ } + + value = (uint64_t ) s->debounce_regs[idx]; +break ; + case R_GPIO_2700_INT_STATUS_1 ... R_GPIO_2700_INT_STATUS_7: + idx = reg -R_GPIO_2700_INT_STATUS_1 ; + +if (idx >= agc->nr_gpio_sets) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: interrupt status index: %d, out ofbounds\n",
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 12 lines
hw/gpio/aspeed_gpio.c +12
-0+ __func__, idx); +return 0 ; + } + + set = &s->sets[idx]; + value = (uint64_t ) set->int_status; +break ; + case R_GPIO_A0_CONTROL ... R_GPIO_AA7_CONTROL: + pin = reg -R_GPIO_A0_CONTROL ; + +if (pin >= agc->nr_gpio_pins) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid pinnumber: %d\n",
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 8 lines
hw/gpio/aspeed_gpio.c +8
-0+ __func__, pin); +return 0 ; + } + + value =aspeed_gpio_read_control_reg (s, pin); +break ; +default : + qemu_log_mask(LOG_GUEST_ERROR, "%s: no getter for offset0x%"
Quoted 20 lines
hw/gpio/aspeed_gpio.c +20
-0+ PRIx64"\n", __func__, offset); +return 0 ; + } + +trace_aspeed_gpio_read (offset, value); +return value; +} + +static void aspeed_gpio_2700_write (void *opaque,hwaddr offset, +uint64_t data,uint32_t size) { +AspeedGPIOState *s =ASPEED_GPIO (opaque); +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +uint64_t reg; +uint32_t pin; +uint32_t type; +uint32_t idx; + +trace_aspeed_gpio_write (offset, data); + + reg = offset >>2 ;hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+ +if (reg >= agc->reg_table_count) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: offset 0x%" PRIx64" out of bounds\n" , + __func__, offset); +return ; + } + + switch (reg) { + case R_GPIO_2700_DEBOUNCE_TIME_1 ...
R_GPIO_2700_DEBOUNCE_TIME_3:Quoted 6 lines
hw/gpio/aspeed_gpio.c +6
-0+ idx = reg -R_GPIO_2700_DEBOUNCE_TIME_1 ; + +if (idx >=ASPEED_GPIO_NR_DEBOUNCE_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: debounce index: %d out of bounds\n" , + __func__, idx);hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+return ; + } + + s->debounce_regs[idx] = (uint32_t ) data; +break ; + case R_GPIO_A0_CONTROL ... R_GPIO_AA7_CONTROL: + pin = reg -R_GPIO_A0_CONTROL ; + +if (pin >= agc->nr_gpio_pins) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid pinnumber: %d\n",
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 6 lines
hw/gpio/aspeed_gpio.c +6
-0+ __func__, pin); +return ; + } + +if (SHARED_FIELD_EX32 (data,GPIO_CONTROL_RESERVED )) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid reserveddata: 0x%"
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 8 lines
hw/gpio/aspeed_gpio.c +8
-0+ PRIx64"\n", __func__, data); +return ; + } + +aspeed_gpio_write_control_reg (s, pin, type, data); +break ; +default : + qemu_log_mask(LOG_GUEST_ERROR, "%s: no setter for offset0x%"
Quoted 11 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1302
Quoted 8 lines
hw/gpio/aspeed_gpio.c +7
-0+ PRIx64"\n", __func__, offset); +break ; + } + +return ; +} +/****************** Setup functions ******************/ Bit of a nitpick, but I'm not personally a fan of banner comments like this.
Did you mean change as following?
A.
/************ Setup functions *****************/
1. /* Setup functions */
2. /*
* Setup functions
*/
Thanks-Jamin
Quoted 1 line
Andrew
RE: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Andrew,
Quoted 354 lines
Subject: RE: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Andrew,
Quoted 12 lines
Subject: Re: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Jamin,
Quoted 7 lines · Jamin Lin
AST2700 integrates two set of Parallel GPIO Controller with maximum 212 control pins, which are 27 groups.
(H, exclude pin: H7 H6 H5 H4)In the previous design of ASPEED SOCs, one register is used for setting one function for one set which are 32 pins and 4 groups.
ex: GPIO000 is used for setting data value for GPIO A, B, C and D inAST2600.
Quoted 11 lines
Quoted 11 lines
ex: GPIO004 is used for setting direction for GPIO A, B, C and D in AST2600.
However, the register set have a significant change since AST2700. Each GPIO pin has their own individual control register. In other words, users are able to set one GPIO pin’s direction, interrupt enable, input mask and so on in the same one register.
Currently, aspeed_gpio_read/aspeed_gpio_write callback functions are not compatible AST2700.
Introduce new aspeed_gpio_2700_read/aspeed_gpio_2700_write callback functions andaspeed_gpio_2700_opsmemory region operation forAST2700.
Quoted 23 lines
Quoted 13 lines
Introduce a new ast2700 class to support AST2700.
Signed-off-by Jamin Lin <[email protected]>--- hw/gpio/aspeed_gpio.c | 373 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+)hw/gpio/aspeed_gpio.c index renamed from hw/gpio/aspeed_gpio.c +0
-0
f23ffae34d..e3d5556dc1100644hw/gpio/aspeed_gpio.c REG32(GPIO_INDEX_REG, 0x2AC) · line 233
Quoted 7 lines
hw/gpio/aspeed_gpio.c +4
-0@@ -227,6 +227,38 @@ REG32(GPIO_INDEX_REG, 0x2AC) FIELD(GPIO_INDEX_REG, COMMAND_SRC_1, 21, 1)FIELD (GPIO_INDEX_REG ,INPUT_MASK ,20 ,1 ) +/* AST2700 GPIO Register Address Offsets */ +REG32(GPIO_2700_DEBOUNCE_TIME_1, 0x000) +REG32(GPIO_2700_DEBOUNCE_TIME_2, 0x004) +REG32 (GPIO_2700_DEBOUNCE_TIME_3 ,0x008 )REG32(GPIO_2700_INT_STATUS_1,
hw/gpio/aspeed_gpio.c REG32(GPIO_INDEX_REG, 0x2AC) · line 235
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+0x100) REG32(GPIO_2700_INT_STATUS_2, 0x104) +REG32 (GPIO_2700_INT_STATUS_3 ,0x108 )Quoted 23 lines
REG32(GPIO_2700_INT_STATUS_4,
hw/gpio/aspeed_gpio.c REG32(GPIO_INDEX_REG, 0x2AC) · line 237
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+0x10C) REG32(GPIO_2700_INT_STATUS_5, 0x110) +REG32 (GPIO_2700_INT_STATUS_6 ,0x114 )REG32(GPIO_2700_INT_STATUS_7,
hw/gpio/aspeed_gpio.c REG32(GPIO_INDEX_REG, 0x2AC) · line 239
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+0x118) +/* GPIOA0 - GPIOAA7 Control Register*/ REG32(GPIO_A0_CONTROL,
0x180)Quoted 16 lines
hw/gpio/aspeed_gpio.c +16
-0+ SHARED_FIELD(GPIO_CONTROL_OUT_DATA, 0, 1) + SHARED_FIELD(GPIO_CONTROL_DIRECTION, 1, 1) + SHARED_FIELD(GPIO_CONTROL_INT_ENABLE, 2, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_0, 3, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_1, 4, 1) + SHARED_FIELD(GPIO_CONTROL_INT_SENS_2, 5, 1) + SHARED_FIELD(GPIO_CONTROL_RESET_TOLERANCE, 6, 1) + SHARED_FIELD(GPIO_CONTROL_DEBOUNCE_1, 7, 1) + SHARED_FIELD(GPIO_CONTROL_DEBOUNCE_2, 8, 1) + SHARED_FIELD(GPIO_CONTROL_INPUT_MASK, 9, 1) + SHARED_FIELD(GPIO_CONTROL_BLINK_COUNTER_1, 10, 1) + SHARED_FIELD(GPIO_CONTROL_BLINK_COUNTER_2, 11, 1) + SHARED_FIELD(GPIO_CONTROL_INT_STATUS, 12, 1) + SHARED_FIELD(GPIO_CONTROL_IN_DATA, 13, 1) + SHARED_FIELD(GPIO_CONTROL_RESERVED, 14, 18) +REG32(GPIO_AA7_CONTROL, 0x4DC) #define GPIO_2700_MEM_SIZE
0x4E0Quoted 6 lines
Quoted 6 lines
hw/gpio/aspeed_gpio.c +2
-0+#define GPIO_2700_REG_ARRAY_SIZE (GPIO_2700_MEM_SIZE >> 2) +static int aspeed_evaluate_irq (GPIOSets *regs,int gpio_prev_high,int gpio) { uint32_t falling_edge = 0, rising_edge = 0; @@ -964,6 +996,309@@ static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char
*name,
Quoted 8 lines
hw/gpio/aspeed_gpio.c
Quoted 4 lines
aspeed_gpio_set_pin_level(s, set_idx, pin, level); }hw/gpio/aspeed_gpio.c +2
-0+static uint64_t aspeed_gpio_read_control_reg (AspeedGPIOState *s, +uint32_t pin)This function is specific to the AST2700 and I think the name should reflect that.
Will rename it.
Quoted 5 lines
Quoted 5 lines
hw/gpio/aspeed_gpio.c +5
-0+{ +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +GPIOSets *set; +uint64_t value =0 ; +uint32_t set_idx;Quoted 15 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+uint32_t pin_idx; + + set_idx = pin /ASPEED_GPIOS_PER_SET ; + pin_idx = pin %ASPEED_GPIOS_PER_SET ; + +if (set_idx >= agc->nr_gpio_sets) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: set index: %d, out ofbounds\n",
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+ __func__, set_idx); +return 0 ; + } + + set = &s->sets[set_idx]; + value = SHARED_FIELD_DP32(value, GPIO_CONTROL_OUT_DATA, + extract32(set->data_read, pin_idx,1));
Quoted 4 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 4 lines
hw/gpio/aspeed_gpio.c +4
-0+ value =SHARED_FIELD_DP32 (value,GPIO_CONTROL_DIRECTION , +extract32 (set->direction, pin_idx,1 )); + value = SHARED_FIELD_DP32(value, GPIO_CONTROL_INT_ENABLE, + extract32(set->int_enable, pin_idx,1));
Quoted 2 lines
hw/gpio/aspeed_gpio.c
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ value = SHARED_FIELD_DP32(value, GPIO_CONTROL_INT_SENS_0, + extract32(set->int_sens_0, pin_idx,1));
Quoted 2 lines
hw/gpio/aspeed_gpio.c
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ value = SHARED_FIELD_DP32(value, GPIO_CONTROL_INT_SENS_1, + extract32(set->int_sens_1, pin_idx,1));
Quoted 2 lines
hw/gpio/aspeed_gpio.c
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ value = SHARED_FIELD_DP32(value, GPIO_CONTROL_INT_SENS_2, + extract32(set->int_sens_2, pin_idx,1));
Quoted 5 lines
Quoted 1 line
+ value = SHARED_FIELD_DP32(value,
GPIO_CONTROL_RESET_TOLERANCE,hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 3 lines
hw/gpio/aspeed_gpio.c +3
-0+ extract32(set->reset_tol, pin_idx, 1)); + value = SHARED_FIELD_DP32(value, GPIO_CONTROL_DEBOUNCE_1, + extract32(set->debounce_1, pin_idx,Quoted 9 lines
1));
hw/gpio/aspeed_gpio.c
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ value = SHARED_FIELD_DP32(value, GPIO_CONTROL_DEBOUNCE_2, + extract32(set->debounce_2, pin_idx,1));
hw/gpio/aspeed_gpio.c
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ value = SHARED_FIELD_DP32(value, GPIO_CONTROL_INPUT_MASK, + extract32(set->input_mask, pin_idx,1));
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ value = SHARED_FIELD_DP32(value, GPIO_CONTROL_INT_STATUS, + extract32(set->int_status, pin_idx,1));
Quoted 10 lines
hw/gpio/aspeed_gpio.c
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ value = SHARED_FIELD_DP32(value, GPIO_CONTROL_IN_DATA, + extract32(set->data_value, pin_idx,1));
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1044
Quoted 4 lines
hw/gpio/aspeed_gpio.c +4
-0+return value; +} + +static void aspeed_gpio_write_control_reg(AspeedGPIOState *s,Also should reflect it's specific to the AST2700?
Will rename it.
Quoted 47 lines
Quoted 4 lines
hw/gpio/aspeed_gpio.c +4
-0+ uint32_t pin, uint32_t type, uint64_t data) { + AspeedGPIOClass *agc = ASPEED_GPIO_GET_CLASS(s); +const GPIOSetProperties *props; +GPIOSets *set;hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+uint32_t cleared; +uint32_t set_idx; +uint32_t pin_idx; +uint32_t group_value =0 ; + + set_idx = pin /ASPEED_GPIOS_PER_SET ; + pin_idx = pin %ASPEED_GPIOS_PER_SET ; + +if (set_idx >= agc->nr_gpio_sets) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: set index: %d, out ofbounds\n",
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 11 lines
hw/gpio/aspeed_gpio.c +11
-0+ __func__, set_idx); +return ; + } + + set = &s->sets[set_idx]; + props = &agc->props[set_idx]; + +/* direction */ + group_value = set->direction; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_DIRECTION));Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+/* +* where data is the value attempted to be written to the pin: +* pin type | input mask | output mask | expected value +* ------------------------------------------------------------ +* bidirectional | 1 | 1 | data +* input only | 1 | 0 | 0 +* output only | 0 | 1 | 1 +* no pin | 0 | 0 | 0 +* +* which is captured by: hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+* data = ( data | ~input) & output; +*/ + group_value = (group_value | ~props->input) & props->output; + set->direction =update_value_control_source (set, set->direction, + group_value); + +/* out data */ + group_value = set->data_read; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,Quoted 4 lines
GPIO_CONTROL_OUT_DATA));Quoted 3 lines
hw/gpio/aspeed_gpio.c +3
-0+ group_value &= props->output; + group_value = update_value_control_source(set, set->data_read, +
group_value);Quoted 9 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 6 lines
hw/gpio/aspeed_gpio.c +6
-0+ set->data_read = group_value; + +/* interrupt enable */ + group_value = set->int_enable; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INT_ENABLE));Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ set->int_enable = update_value_control_source(set, set->int_enable, +
group_value);Quoted 8 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 5 lines
hw/gpio/aspeed_gpio.c +5
-0+ +/* interrupt sensitivity type 0 */ + group_value = set->int_sens_0; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INT_SENS_0));Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ set->int_sens_0 = update_value_control_source(set, set->int_sens_0, +
group_value);Quoted 8 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 5 lines
hw/gpio/aspeed_gpio.c +5
-0+ +/* interrupt sensitivity type 1 */ + group_value = set->int_sens_1; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INT_SENS_1));Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ set->int_sens_1 = update_value_control_source(set, set->int_sens_1, +
group_value);Quoted 8 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 5 lines
hw/gpio/aspeed_gpio.c +5
-0+ +/* interrupt sensitivity type 2 */ + group_value = set->int_sens_2; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INT_SENS_2));Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ set->int_sens_2 = update_value_control_source(set, set->int_sens_2, +
group_value);Quoted 13 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 5 lines
hw/gpio/aspeed_gpio.c +5
-0+ +/* reset tolerance enable */ + group_value = set->reset_tol; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_RESET_TOLERANCE));hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+ set->reset_tol =update_value_control_source (set, set->reset_tol, + group_value); + +/* debounce 1 */ + group_value = set->debounce_1; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,Quoted 4 lines
GPIO_CONTROL_DEBOUNCE_1));Quoted 1 line
+
set->debounce_1= update_value_control_source(set,
set->debounce_1,Quoted 1 line
+
group_value);Quoted 9 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 5 lines
hw/gpio/aspeed_gpio.c +5
-0+ +/* debounce 2 */ + group_value = set->debounce_2; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_DEBOUNCE_2));Quoted 1 line
+
set->debounce_2= update_value_control_source(set,
set->debounce_2,Quoted 1 line
+
group_value);Quoted 25 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 5 lines
hw/gpio/aspeed_gpio.c +5
-0+ +/* input mask */ + group_value = set->input_mask; + group_value = deposit32(group_value, pin_idx, 1, + SHARED_FIELD_EX32(data,
GPIO_CONTROL_INPUT_MASK));Quoted 6 lines
hw/gpio/aspeed_gpio.c +6
-0+/* +* feeds into interrupt generation +* 0: read from data value reg will be updated +* 1: read from data value reg will not be updated +*/ + set->input_mask = group_value & props->input;hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 10 lines
hw/gpio/aspeed_gpio.c +10
-0+ +/* blink counter 1 */ +/* blink counter 2 */ +/* unimplement */ + +/* interrupt status */ + group_value = set->int_status; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data, +GPIO_CONTROL_INT_STATUS ));This makes me a bit wary.
Quoted 4 lines
The interrupt status field is W1C, where a set bit on read indicates an interrupt is pending. If the bit extracted from data is set it should clear the corresponding bit in
group_value. However, if the extracted bit is clear then the value of the corresponding bit ingroup_valueshould be unchanged.
Quoted 7 lines
SHARED_FIELD_EX32()extracts the interrupt status bit from the write (data).group_valueis set to the set's interrupt status, which means that for any pin with an interrupt pending, the corresponding bit is set. Thedeposit32()call updates the bit atpin_idxin the group, using the value extracted from the write (data).Quoted 6 lines
However, the result is that if the interrupt was pending and the write was acknowledging it, then the update has no effect. Alternatively, if the interrupt was pending but the write was acknowledging it, then the update will mark the interrupt as pending. Or, if the interrupt was pending but the write was _not_ acknowledging it, then the interrupt will
_nolonger_be marked pending. If this is intentional it feels a bit hard tofollow.
Quoted 39 lines
Quoted 2 lines
+ cleared =
ctpop32(group_value & set->int_status);Can this rather be expressed as
```
cleared =SHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS); ```hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1167
Quoted 3 lines
hw/gpio/aspeed_gpio.c +3
-0+if (s->pending && cleared) { +assert (s->pending >= cleared); + s->pending -= cleared;We're only ever going to be subtracting 1, as each GPIO has its own register. This feels overly abstract.
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1169
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ } + set->int_status &= ~group_value;This feels like it misbehaves in the face of multiple pending interrupts.
For example, say we have an interrupt pending for GPIOA0, where the following statements are true:
set->int_status == 0b01 s->pending == 1Before it is acknowledged, an interrupt becomes pending for GPIOA1:
set->int_status == 0b11 s->pending == 2A write is issued to acknowledge the interrupt for GPIOA0. This causes the following sequence:
group_value == 0b11 cleared == 2 s->pending = 0 set->int_status == 0b00
Quoted 7 lines
Quoted 2 lines
It seems the pending interrupt for GPIOA1 is lost?
Thanks for review and input.
I should check "int_status" bit of write data in write callback function. If 1 clear status flag(group value), else should not change group value.
I am checking and testing this issue and will update to you or directly resend the new patch series.
I appreciate your review and finding this issue.
My changes as following.
If you agree, I will add them in v2 patch.
Thanks-Jamin
static void aspeed_gpio_2700_write_control_reg(AspeedGPIOState *s,
uint32_t pin, uint32_t type, uint64_t data)
{
---
/* interrupt status */
if (SHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS)) {
cleared = extract32(set->int_status, pin_idx, 1);
if (cleared) {
if (s->pending) {
assert(s->pending >= cleared);
s->pending -= cleared;
}
set->int_status = deposit32(set->int_status, pin_idx, 1, 0);
}
}----
}
By the way, I found the same issue in "aspeed_gpio_write_index_mode" and my changes as following. If you agree this change, I will create a new patch in v2 patch series.
static void aspeed_gpio_write_index_mode(void *opaque, hwaddr offset,
uint64_t data, uint32_t size)
{
---
case gpio_reg_idx_interrupt:
if (FIELD_EX32(data, GPIO_INDEX_REG, INT_STATUS)) {
cleared = extract32(set->int_status, pin_idx, 1);
if (cleared) {
if (s->pending) {
assert(s->pending >= cleared);
s->pending -= cleared;
}
set->int_status = deposit32(set->int_status, pin_idx, 1, 0);
}
}
break;---
}
Thanks-Jamin
Quoted 159 lines
Quoted 19 lines
Quoted 19 lines
hw/gpio/aspeed_gpio.c +19
-0+ +aspeed_gpio_update (s, set, set->data_value,UINT32_MAX ); +return ; +} + +static uint64_t aspeed_gpio_2700_read (void *opaque,hwaddr offset, +uint32_t size) { +AspeedGPIOState *s =ASPEED_GPIO (opaque); +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +GPIOSets *set; +uint64_t value; +uint64_t reg; +uint32_t pin; +uint32_t idx; + + reg = offset >>2 ; + +if (reg >= agc->reg_table_count) { + qemu_log_mask(LOG_GUEST_ERROR,Quoted 13 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+"%s: offset 0x%" PRIx64" out of bounds\n" , + __func__, offset); +return 0 ; + } + + switch (reg) { + case R_GPIO_2700_DEBOUNCE_TIME_1 ...
R_GPIO_2700_DEBOUNCE_TIME_3:Quoted 5 lines
hw/gpio/aspeed_gpio.c +5
-0+ idx = reg -R_GPIO_2700_DEBOUNCE_TIME_1 ; + +if (idx >=ASPEED_GPIO_NR_DEBOUNCE_REGS ) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: debounce index: %d, out ofbounds\n",
Quoted 58 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 12 lines
hw/gpio/aspeed_gpio.c +12
-0+ __func__, idx); +return 0 ; + } + + value = (uint64_t ) s->debounce_regs[idx]; +break ; + case R_GPIO_2700_INT_STATUS_1 ... R_GPIO_2700_INT_STATUS_7: + idx = reg -R_GPIO_2700_INT_STATUS_1 ; + +if (idx >= agc->nr_gpio_sets) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: interrupt status index: %d, out ofbounds\n",
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 12 lines
hw/gpio/aspeed_gpio.c +12
-0+ __func__, idx); +return 0 ; + } + + set = &s->sets[idx]; + value = (uint64_t ) set->int_status; +break ; + case R_GPIO_A0_CONTROL ... R_GPIO_AA7_CONTROL: + pin = reg -R_GPIO_A0_CONTROL ; + +if (pin >= agc->nr_gpio_pins) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid pinnumber: %d\n",
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 8 lines
hw/gpio/aspeed_gpio.c +8
-0+ __func__, pin); +return 0 ; + } + + value =aspeed_gpio_read_control_reg (s, pin); +break ; +default : + qemu_log_mask(LOG_GUEST_ERROR, "%s: no getter for offset0x%"
Quoted 23 lines
hw/gpio/aspeed_gpio.c +23
-0+ PRIx64"\n", __func__, offset); +return 0 ; + } + +trace_aspeed_gpio_read (offset, value); +return value; +} + +static void aspeed_gpio_2700_write (void *opaque,hwaddr offset, +uint64_t data,uint32_t size) { +AspeedGPIOState *s =ASPEED_GPIO (opaque); +AspeedGPIOClass *agc =ASPEED_GPIO_GET_CLASS (s); +uint64_t reg; +uint32_t pin; +uint32_t type; +uint32_t idx; + +trace_aspeed_gpio_write (offset, data); + + reg = offset >>2 ; + +if (reg >= agc->reg_table_count) { + qemu_log_mask(LOG_GUEST_ERROR,Quoted 13 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+"%s: offset 0x%" PRIx64" out of bounds\n" , + __func__, offset); +return ; + } + + switch (reg) { + case R_GPIO_2700_DEBOUNCE_TIME_1 ...
R_GPIO_2700_DEBOUNCE_TIME_3:Quoted 5 lines
hw/gpio/aspeed_gpio.c +5
-0+ idx = reg -R_GPIO_2700_DEBOUNCE_TIME_1 ; + +if (idx >=ASPEED_GPIO_NR_DEBOUNCE_REGS ) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: debounce index: %d out ofbounds\n",
Quoted 4 lines
Quoted 4 lines
hw/gpio/aspeed_gpio.c +4
-0+ __func__, idx); +return ; + } +Quoted 14 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 7 lines
hw/gpio/aspeed_gpio.c +7
-0+ s->debounce_regs[idx] = (uint32_t ) data; +break ; + case R_GPIO_A0_CONTROL ... R_GPIO_AA7_CONTROL: + pin = reg -R_GPIO_A0_CONTROL ; + +if (pin >= agc->nr_gpio_pins) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid pinnumber: %d\n",
Quoted 6 lines
hw/gpio/aspeed_gpio.c +6
-0+ __func__, pin); +return ; + } + +if (SHARED_FIELD_EX32 (data,GPIO_CONTROL_RESERVED )) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalidreserved
Quoted 10 lines
data: 0x%"
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 8 lines
hw/gpio/aspeed_gpio.c +8
-0+ PRIx64"\n", __func__, data); +return ; + } + +aspeed_gpio_write_control_reg (s, pin, type, data); +break ; +default : + qemu_log_mask(LOG_GUEST_ERROR, "%s: no setter for offset0x%"
Quoted 11 lines
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1302
Quoted 8 lines
hw/gpio/aspeed_gpio.c +7
-0+ PRIx64"\n", __func__, offset); +break ; + } + +return ; +} +/****************** Setup functions ******************/ Bit of a nitpick, but I'm not personally a fan of banner comments like this.
Did you mean change as following?
A.
/************ Setup functions *****************/
1. /* Setup functions */
2. /*
* Setup functions
*/Thanks-Jamin
Quoted 1 line
Andrew
Andrew Jeffery
maintainerRe: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
In reply to Jamin LinQuoted 73 lines · Jamin Lin
Hi Andrew,
Quoted 71 lines
Subject: Re: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Jamin,
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 6 lines · Jamin Lin
hw/gpio/aspeed_gpio.c +6
-0+ +/* interrupt status */ + group_value = set->int_status; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data, +GPIO_CONTROL_INT_STATUS ));This makes me a bit wary.
The interrupt status field is W1C, where a set bit on read indicates an interrupt is pending. If the bit extracted from data is set it should clear the corresponding bit in
group_value. However, if the extracted bit is clear then the value of the corresponding bit ingroup_valueshould be unchanged.
SHARED_FIELD_EX32()extracts the interrupt status bit from the write (data).group_valueis set to the set's interrupt status, which means that for any pin with an interrupt pending, the corresponding bit is set. Thedeposit32()call updates the bit atpin_idxin the group, using the value extracted from the write (data).However, the result is that if the interrupt was pending and the write was acknowledging it, then the update has no effect. Alternatively, if the interrupt was pending but the write was acknowledging it, then the update will mark the interrupt as pending. Or, if the interrupt was pending but the write was _not_ acknowledging it, then the interrupt will
_nolonger_be marked pending. If this is intentional it feels a bit hard to follow.Quoted 1 line
+ cleared =
ctpop32(group_value & set->int_status);Can this rather be expressed as
```
cleared =SHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS); ```hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1167
Quoted 3 lines
hw/gpio/aspeed_gpio.c +3
-0+if (s->pending && cleared) { +assert (s->pending >= cleared); + s->pending -= cleared;We're only ever going to be subtracting 1, as each GPIO has its own register. This feels overly abstract.
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1169
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ } + set->int_status &= ~group_value;This feels like it misbehaves in the face of multiple pending interrupts.
For example, say we have an interrupt pending for GPIOA0, where the following statements are true:
set->int_status == 0b01 s->pending == 1Before it is acknowledged, an interrupt becomes pending for GPIOA1:
set->int_status == 0b11 s->pending == 2A write is issued to acknowledge the interrupt for GPIOA0. This causes the following sequence:
group_value == 0b11 cleared == 2 s->pending = 0 set->int_status == 0b00
Quoted 5 lines
Quoted 2 lines
It seems the pending interrupt for GPIOA1 is lost?
Thanks for review and input.
I should check "int_status" bit of write data in write callback function. If 1 clear status flag(group value), else should not change group value. I am checking and testing this issue and will update to you or directly resend the new patch series.
Happy to take a look in a v2 of the series :)
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
+
/****************** Setup functions ******************/Bit of a nitpick, but I'm not personally a fan of banner comments like this.
Did you mean change as following?
Quoted 8 lines
A.
/************ Setup functions *****************/
1. /* Setup functions */
2. /*
* Setup functions
*/
Either is fine, but I prefer 1.
Cheers,
Andrew
Andrew Jeffery
maintainerRe: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
In reply to Jamin LinQuoted 63 lines · Jamin Lin
Hi Andrew,
Quoted 33 lines
Subject: RE: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Andrew,
Quoted 29 lines
Subject: Re: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Jamin,
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1169
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ } + set->int_status &= ~group_value;This feels like it misbehaves in the face of multiple pending interrupts.
For example, say we have an interrupt pending for GPIOA0, where the following statements are true:
set->int_status == 0b01 s->pending == 1Before it is acknowledged, an interrupt becomes pending for GPIOA1:
set->int_status == 0b11 s->pending == 2A write is issued to acknowledge the interrupt for GPIOA0. This causes the following sequence:
group_value == 0b11 cleared == 2 s->pending = 0 set->int_status == 0b00Quoted 7 lines
Quoted 2 lines
It seems the pending interrupt for GPIOA1 is lost?
Thanks for review and input.
I should check "int_status" bit of write data in write callback function. If 1 clear status flag(group value), else should not change group value.
I am checking and testing this issue and will update to you or directly resend the new patch series.I appreciate your review and finding this issue.
My changes as following.
If you agree, I will add them in v2 patch.
Thanks-Jaminstatic void aspeed_gpio_2700_write_control_reg(AspeedGPIOState *s,
uint32_t pin, uint32_t type, uint64_t data) { --- /* interrupt status */ if (SHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS)) { cleared = extract32(set->int_status, pin_idx, 1); if (cleared) { if (s->pending) { assert(s->pending >= cleared); s->pending -= cleared; } set->int_status = deposit32(set->int_status, pin_idx, 1, 0); } }
Quoted 2 lines
----
}
The logic is easier to follow. Not sure about calling the value extracted from set->int_status 'cleared' though, seems confusing on first pass. It would feel more appropriate if it were called 'pending'. I think 'cleared' is derived from SHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS). Anyway, that's just some quibbling over names.
Quoted 20 lines
By the way, I found the same issue in "
aspeed_gpio_write_index_mode" and my changes as following. If you agree this change, I will create a new patch in v2 patch series.static void aspeed_gpio_write_index_mode(void *opaque, hwaddr offset,
uint64_t data, uint32_t size) { --- case gpio_reg_idx_interrupt: if (FIELD_EX32(data, GPIO_INDEX_REG, INT_STATUS)) { cleared = extract32(set->int_status, pin_idx, 1); if (cleared) { if (s->pending) { assert(s->pending >= cleared); s->pending -= cleared; } set->int_status = deposit32(set->int_status, pin_idx, 1, 0); } } break;
Quoted 2 lines
---
}
I'll take a look in v2.
Cheers,
Andrew
RE: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Andrew,
Quoted 70 lines
Subject: Re: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Quoted 40 lines · Jamin Lin
Hi Andrew,
Quoted 38 lines
Subject: RE: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Andrew,
Quoted 24 lines
Subject: Re: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Jamin,
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1169
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ } + set->int_status &= ~group_value;This feels like it misbehaves in the face of multiple pending interrupts.
For example, say we have an interrupt pending for GPIOA0, where the following statements are true:
set->int_status == 0b01 s->pending == 1Before it is acknowledged, an interrupt becomes pending for GPIOA1:
set->int_status == 0b11 s->pending == 2A write is issued to acknowledge the interrupt for GPIOA0. This causes the following sequence:
Quoted 7 lines
group_value == 0b11 cleared == 2 s->pending = 0 set->int_status == 0b00It seems the pending interrupt for GPIOA1 is lost?
Thanks for review and input.
I should check "int_status" bit of write data in write callback function. If 1 clear status flag(group value), else should not change groupvalue.
Quoted 23 lines
Quoted 2 lines
I am checking and testing this issue and will update to you or directly resend the new patch series.
I appreciate your review and finding this issue.
My changes as following.
If you agree, I will add them in v2 patch.
Thanks-Jaminstatic void aspeed_gpio_2700_write_control_reg(AspeedGPIOState *s,
uint32_t pin, uint32_t type, uint64_t data) { --- /* interrupt status */ if (SHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS)) { cleared = extract32(set->int_status, pin_idx, 1); if (cleared) { if (s->pending) { assert(s->pending >= cleared); s->pending -= cleared; } set->int_status = deposit32(set->int_status, pin_idx, 1, 0); } }Quoted 2 lines
----
}
Quoted 6 lines
The logic is easier to follow. Not sure about calling the value extracted from
set->int_status'cleared' though, seems confusing on first pass. It would feel more appropriate if it were called 'pending'.
I think 'cleared' is derived fromSHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS). Anyway, that's just some quibbling over names.
Got it. Will update it.
Thanks for suggestion and review.
Quoted 31 lines
Quoted 3 lines
By the way, I found the same issue in "
aspeed_gpio_write_index_mode" andmy changes as following.
Quoted 15 lines
If you agree this change, I will create a new patch in v2 patch series.
static void aspeed_gpio_write_index_mode(void *opaque, hwaddr offset,
uint64_t data, uint32_t size) { --- case gpio_reg_idx_interrupt: if (FIELD_EX32(data, GPIO_INDEX_REG, INT_STATUS)) { cleared = extract32(set->int_status, pin_idx, 1); if (cleared) { if (s->pending) { assert(s->pending >= cleared); s->pending -= cleared; } set->int_status = deposit32(set->int_status, pin_idx, 1,0);
Quoted 5 lines
} } break;---
}I'll take a look in v2.
Cheers,
Andrew
RE: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
In reply to Andrew JefferyHi Andrew,
Quoted 99 lines
Subject: Re: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Quoted 21 lines · Jamin Lin
Hi Andrew,
Quoted 19 lines
Subject: Re: [PATCH 4/5] hw/gpio/aspeed: Add AST2700 support
Hi Jamin,
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,
Quoted 6 lines · Jamin Lin
hw/gpio/aspeed_gpio.c +6
-0+ +/* interrupt status */ + group_value = set->int_status; + group_value =deposit32 (group_value, pin_idx,1 , +SHARED_FIELD_EX32 (data, +GPIO_CONTROL_INT_STATUS ));This makes me a bit wary.
The interrupt status field is W1C, where a set bit on read indicates an interrupt is pending. If the bit extracted from data is set it should clear the corresponding bit in
group_value. However, if the extracted bit is clear then the value of the corresponding bit ingroup_valueshould be unchanged.
Quoted 2 lines
Quoted 2 lines
SHARED_FIELD_EX32()extracts the interrupt status bit from the write(data).
Quoted 11 lines
Quoted 11 lines
group_valueis set to the set's interrupt status, which means that for any pin with an interrupt pending, the corresponding bit is set. Thedeposit32()call updates the bit atpin_idxin the group, using the value extracted from the write (data).However, the result is that if the interrupt was pending and the write was acknowledging it, then the update has no effect. Alternatively, if the interrupt was pending but the write was acknowledging it, then the update will mark the interrupt as pending. Or, if the interrupt was pending but the write was _not_ acknowledging it, then the interrupt will
_nolonger_be marked pending. Ifthis is intentional it feels a bit hard to follow.
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
+ cleared =
ctpop32(group_value & set->int_status);Can this rather be expressed as
Quoted 8 lines
Quoted 8 lines
```
cleared =SHARED_FIELD_EX32(data, GPIO_CONTROL_INT_STATUS); ```hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1167
Quoted 3 lines
hw/gpio/aspeed_gpio.c +3
-0+if (s->pending && cleared) { +assert (s->pending >= cleared); + s->pending -= cleared;We're only ever going to be subtracting 1, as each GPIO has its own
register.
Quoted 26 lines
Quoted 26 lines
This feels overly abstract.
hw/gpio/aspeed_gpio.c static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name, · line 1169
Quoted 2 lines
hw/gpio/aspeed_gpio.c +2
-0+ } + set->int_status &= ~group_value;This feels like it misbehaves in the face of multiple pending interrupts.
For example, say we have an interrupt pending for GPIOA0, where the following statements are true:
set->int_status == 0b01 s->pending == 1Before it is acknowledged, an interrupt becomes pending for GPIOA1:
set->int_status == 0b11 s->pending == 2A write is issued to acknowledge the interrupt for GPIOA0. This causes the following sequence:
group_value == 0b11 cleared == 2 s->pending = 0 set->int_status == 0b00Quoted 4 lines
Quoted 2 lines
It seems the pending interrupt for GPIOA1 is lost?
Thanks for review and input.
I should check "int_status" bit of write data in write callback function. If 1clear status flag(group value), else should not change group value.
Quoted 1 line
I am checking and testing this issue and will update to you or directly resend
the new patch series.
Happy to take a look in a v2 of the series :)
Quoted 9 lines
Quoted 5 lines
Quoted 2 lines
+
/****************** Setup functions ******************/Bit of a nitpick, but I'm not personally a fan of banner comments like this.
Did you mean change as following?
A.
Quoted 9 lines
Quoted 6 lines
/************ Setup functions *****************/
1. /* Setup functions */
2. /*
* Setup functions
*/Either is fine, but I prefer 1.
Thanks for suggestion.
Will update it in V2
Thanks-Jamin
Quoted 3 lines
Cheers,
Andrew