Received: by 2002:adf:ef42:0:0:0:0:0 with SMTP id c2csp590838wrp; Wed, 18 Sep 2019 23:02:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxzcgCuH/2iNJjqO7hMqm9tcDPbpYR9Hb35wc4EvEcO2Dp65f5OsZMXvU+9KmmgusiiH/wh X-Received: by 2002:a17:906:16cd:: with SMTP id t13mr12743946ejd.153.1568872950384; Wed, 18 Sep 2019 23:02:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568872950; cv=none; d=google.com; s=arc-20160816; b=yjtk6hlT7A13KPrImFz/n68qPhzKXs3V16EMm1eEfCw1euEIHAMO4gTNt2zAkmyywG zJ0ACqsO0xHOAHymau6pSWQfNuP8kptLJj506eUPxeRbDrq/ExyfKq6XT/mRW/0RZKNH L4RZrAwaatQZ+vEBPtTNq/TSugdoijrAd94UPlCqeiUKvkPcP23AYmZYcJSTwY0f3Xbg I5EOIMlfMIgSBYHuu5I2qrcqPRJkHzave3QQqhMMEyJi426MmMfsuyFHbx/nhE8sKNGu za/bX+RSd6Xug/mQfVuDeRpFclvDdGq662rIuiiHQfCdFgKJOkGtuaJy+/bcedqIxfrW MtsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=FHxGs+AAr6Ckwi0TUqFCD6k52ZjVeQzEo1EqhyRuTrc=; b=jTigzmgPYHQ5qjAsyJVtdMBtv/GSFW1G1mNPTTgqGRSaR5GTvM3UzaMG9fSo9LoYx6 OBXbGnj6qX40JWBCkHCu93TVu1aWBXvPGZth3tVTFkfWQpcDX5siSohC4gae5VMjjLqG U0+Q0OLJuCr38LDJD/1MWKNO844FnyaTZIMIkr3qzd9HRaQWEGbQENnLECQ2/01rFvrZ BRWrbNrVyRnMUQqpGiv4llKw4M47RktT472p/d04ic/1P2ZchX3Csdq+RhVxZmPYPf7G ZW0J6ltBazJ1lV06UaGy+vCA+5MT4hqwOSShmU4de5avqinnoGSb7Ye+jsAo9uCpT96Z TeqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jz5si3794086ejb.119.2019.09.18.23.02.30 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Sep 2019 23:02:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:37944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iApWO-0005aX-KD for alex.bennee@linaro.org; Thu, 19 Sep 2019 02:02:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42760) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iApM0-00022z-Bk for qemu-arm@nongnu.org; Thu, 19 Sep 2019 01:51:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iApLy-0008RL-Lg for qemu-arm@nongnu.org; Thu, 19 Sep 2019 01:51:44 -0400 Received: from 1.mo179.mail-out.ovh.net ([178.33.111.220]:41597) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iApLy-0008QQ-BV for qemu-arm@nongnu.org; Thu, 19 Sep 2019 01:51:42 -0400 Received: from player788.ha.ovh.net (unknown [10.108.57.44]) by mo179.mail-out.ovh.net (Postfix) with ESMTP id E4174142BA9 for ; Thu, 19 Sep 2019 07:51:40 +0200 (CEST) Received: from kaod.org (lfbn-1-2240-157.w90-76.abo.wanadoo.fr [90.76.60.157]) (Authenticated sender: clg@kaod.org) by player788.ha.ovh.net (Postfix) with ESMTPSA id 25DFA9F17587; Thu, 19 Sep 2019 05:51:33 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Peter Maydell Date: Thu, 19 Sep 2019 07:49:54 +0200 Message-Id: <20190919055002.6729-14-clg@kaod.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919055002.6729-1-clg@kaod.org> References: <20190919055002.6729-1-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Ovh-Tracer-Id: 1687723960517430033 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrudelgdelhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 178.33.111.220 Subject: [Qemu-arm] [PATCH 13/21] hw/gpio: Add in AST2600 specific implementation X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , qemu-devel@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Rashmica Gupta , Joel Stanley Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: 1ka6lhNeTQUl From: Rashmica Gupta The AST2600 has the same sets of 3.6v gpios as the AST2400 plus an addtional two sets of 1.8V gpios. Signed-off-by: Rashmica Gupta Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: C=C3=A9dric Le Goater --- hw/gpio/aspeed_gpio.c | 142 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 137 insertions(+), 5 deletions(-) diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c index 25fbfec3b84e..196e47c26284 100644 --- a/hw/gpio/aspeed_gpio.c +++ b/hw/gpio/aspeed_gpio.c @@ -169,6 +169,48 @@ #define GPIO_3_6V_MEM_SIZE 0x1F0 #define GPIO_3_6V_REG_ARRAY_SIZE (GPIO_3_6V_MEM_SIZE >> 2) =20 +/* AST2600 only - 1.8V gpios */ +/* + * The AST2600 has same 3.6V gpios as the AST2400 (memory offsets 0x0-0x= 198) + * and addtional 1.8V gpios (memory offsets 0x800-0x9D4). + */ +#define GPIO_1_8V_REG_OFFSET 0x800 +#define GPIO_1_8V_ABCD_DATA_VALUE ((0x800 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_DIRECTION ((0x804 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_INT_ENABLE ((0x808 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_INT_SENS_0 ((0x80C - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_INT_SENS_1 ((0x810 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_INT_SENS_2 ((0x814 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_INT_STATUS ((0x818 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_RESET_TOLERANT ((0x81C - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_DATA_VALUE ((0x820 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_DIRECTION ((0x824 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_INT_ENABLE ((0x828 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_INT_SENS_0 ((0x82C - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_INT_SENS_1 ((0x830 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_INT_SENS_2 ((0x834 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_INT_STATUS ((0x838 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_RESET_TOLERANT ((0x83C - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_DEBOUNCE_1 ((0x840 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_DEBOUNCE_2 ((0x844 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_DEBOUNCE_1 ((0x848 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_DEBOUNCE_2 ((0x84C - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_DEBOUNCE_TIME_1 ((0x850 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_DEBOUNCE_TIME_2 ((0x854 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_DEBOUNCE_TIME_3 ((0x858 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_COMMAND_SRC_0 ((0x860 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_COMMAND_SRC_1 ((0x864 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_COMMAND_SRC_0 ((0x868 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_COMMAND_SRC_1 ((0x86C - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_DATA_READ ((0x8C0 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_DATA_READ ((0x8C4 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_ABCD_INPUT_MASK ((0x9D0 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_E_INPUT_MASK ((0x9D4 - GPIO_1_8V_REG_OFFSET) >>= 2) +#define GPIO_1_8V_MEM_SIZE 0x9D8 +#define GPIO_1_8V_REG_ARRAY_SIZE ((GPIO_1_8V_MEM_SIZE - \ + GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_MAX_MEM_SIZE MAX(GPIO_3_6V_MEM_SIZE, GPIO_1_8V_ME= M_SIZE) + static int aspeed_evaluate_irq(GPIOSets *regs, int gpio_prev_high, int g= pio) { uint32_t falling_edge =3D 0, rising_edge =3D 0; @@ -465,6 +507,39 @@ static const AspeedGPIOReg aspeed_3_6v_gpios[GPIO_3_= 6V_REG_ARRAY_SIZE] =3D { [GPIO_AC_INPUT_MASK] =3D { 7, gpio_reg_input_mask }, }; =20 +static const AspeedGPIOReg aspeed_1_8v_gpios[GPIO_1_8V_REG_ARRAY_SIZE] =3D= { + /* 1.8V Set ABCD */ + [GPIO_1_8V_ABCD_DATA_VALUE] =3D {0, gpio_reg_data_value}, + [GPIO_1_8V_ABCD_DIRECTION] =3D {0, gpio_reg_direction}, + [GPIO_1_8V_ABCD_INT_ENABLE] =3D {0, gpio_reg_int_enable}, + [GPIO_1_8V_ABCD_INT_SENS_0] =3D {0, gpio_reg_int_sens_0}, + [GPIO_1_8V_ABCD_INT_SENS_1] =3D {0, gpio_reg_int_sens_1}, + [GPIO_1_8V_ABCD_INT_SENS_2] =3D {0, gpio_reg_int_sens_2}, + [GPIO_1_8V_ABCD_INT_STATUS] =3D {0, gpio_reg_int_status}, + [GPIO_1_8V_ABCD_RESET_TOLERANT] =3D {0, gpio_reg_reset_tolerant}, + [GPIO_1_8V_ABCD_DEBOUNCE_1] =3D {0, gpio_reg_debounce_1}, + [GPIO_1_8V_ABCD_DEBOUNCE_2] =3D {0, gpio_reg_debounce_2}, + [GPIO_1_8V_ABCD_COMMAND_SRC_0] =3D {0, gpio_reg_cmd_source_0}, + [GPIO_1_8V_ABCD_COMMAND_SRC_1] =3D {0, gpio_reg_cmd_source_1}, + [GPIO_1_8V_ABCD_DATA_READ] =3D {0, gpio_reg_data_read}, + [GPIO_1_8V_ABCD_INPUT_MASK] =3D {0, gpio_reg_input_mask}, + /* 1.8V Set E */ + [GPIO_1_8V_E_DATA_VALUE] =3D {1, gpio_reg_data_value}, + [GPIO_1_8V_E_DIRECTION] =3D {1, gpio_reg_direction}, + [GPIO_1_8V_E_INT_ENABLE] =3D {1, gpio_reg_int_enable}, + [GPIO_1_8V_E_INT_SENS_0] =3D {1, gpio_reg_int_sens_0}, + [GPIO_1_8V_E_INT_SENS_1] =3D {1, gpio_reg_int_sens_1}, + [GPIO_1_8V_E_INT_SENS_2] =3D {1, gpio_reg_int_sens_2}, + [GPIO_1_8V_E_INT_STATUS] =3D {1, gpio_reg_int_status}, + [GPIO_1_8V_E_RESET_TOLERANT] =3D {1, gpio_reg_reset_tolerant}, + [GPIO_1_8V_E_DEBOUNCE_1] =3D {1, gpio_reg_debounce_1}, + [GPIO_1_8V_E_DEBOUNCE_2] =3D {1, gpio_reg_debounce_2}, + [GPIO_1_8V_E_COMMAND_SRC_0] =3D {1, gpio_reg_cmd_source_0}, + [GPIO_1_8V_E_COMMAND_SRC_1] =3D {1, gpio_reg_cmd_source_1}, + [GPIO_1_8V_E_DATA_READ] =3D {1, gpio_reg_data_read}, + [GPIO_1_8V_E_INPUT_MASK] =3D {1, gpio_reg_input_mask}, +}; + static uint64_t aspeed_gpio_read(void *opaque, hwaddr offset, uint32_t s= ize) { AspeedGPIOState *s =3D ASPEED_GPIO(opaque); @@ -663,8 +738,11 @@ static void aspeed_gpio_get_pin(Object *obj, Visitor= *v, const char *name, int set_idx, group_idx =3D 0; =20 if (sscanf(name, "gpio%2[A-Z]%1d", group, &pin) !=3D 2) { - error_setg(errp, "%s: error reading %s", __func__, name); - return; + /* 1.8V gpio */ + if (sscanf(name, "gpio%3s%1d", group, &pin) !=3D 2) { + error_setg(errp, "%s: error reading %s", __func__, name); + return; + } } set_idx =3D get_set_idx(s, group, &group_idx); if (set_idx =3D=3D -1) { @@ -692,8 +770,11 @@ static void aspeed_gpio_set_pin(Object *obj, Visitor= *v, const char *name, return; } if (sscanf(name, "gpio%2[A-Z]%1d", group, &pin) !=3D 2) { - error_setg(errp, "%s: error reading %s", __func__, name); - return; + /* 1.8V gpio */ + if (sscanf(name, "gpio%3s%1d", group, &pin) !=3D 2) { + error_setg(errp, "%s: error reading %s", __func__, name); + return; + } } set_idx =3D get_set_idx(s, group, &group_idx); if (set_idx =3D=3D -1) { @@ -726,6 +807,21 @@ static const GPIOSetProperties ast2500_set_props[] =3D= { [7] =3D {0x000000ff, 0x000000ff, {"AC"} }, }; =20 +static GPIOSetProperties ast2600_3_6v_set_props[] =3D { + [0] =3D {0xffffffff, 0xffffffff, {"A", "B", "C", "D"} }, + [1] =3D {0xffffffff, 0xffffffff, {"E", "F", "G", "H"} }, + [2] =3D {0xffffffff, 0xffffffff, {"I", "J", "K", "L"} }, + [3] =3D {0xffffffff, 0xffffffff, {"M", "N", "O", "P"} }, + [4] =3D {0xffffffff, 0xffffffff, {"Q", "R", "S", "T"} }, + [5] =3D {0xffffffff, 0x0000ffff, {"U", "V", "W", "X"} }, + [6] =3D {0xffff0000, 0x0fff0000, {"Y", "Z", "", ""} }, +}; + +static GPIOSetProperties ast2600_1_8v_set_props[] =3D { + [0] =3D {0xffffffff, 0xffffffff, {"18A", "18B", "18C", "18D"} }, + [1] =3D {0x0000000f, 0x0000000f, {"18E"} }, +}; + static const MemoryRegionOps aspeed_gpio_ops =3D { .read =3D aspeed_gpio_read, .write =3D aspeed_gpio_write, @@ -758,7 +854,7 @@ static void aspeed_gpio_realize(DeviceState *dev, Err= or **errp) } =20 memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_gpio_ops, s, - TYPE_ASPEED_GPIO, GPIO_3_6V_MEM_SIZE); + TYPE_ASPEED_GPIO, GPIO_MAX_MEM_SIZE); =20 sysbus_init_mmio(sbd, &s->iomem); } @@ -851,6 +947,26 @@ static void aspeed_gpio_2500_class_init(ObjectClass = *klass, void *data) agc->reg_table =3D aspeed_3_6v_gpios; } =20 +static void aspeed_gpio_ast2600_3_6v_class_init(ObjectClass *klass, void= *data) +{ + AspeedGPIOClass *agc =3D ASPEED_GPIO_CLASS(klass); + + agc->props =3D ast2600_3_6v_set_props; + agc->nr_gpio_pins =3D 208; + agc->nr_gpio_sets =3D 7; + agc->reg_table =3D aspeed_3_6v_gpios; +} + +static void aspeed_gpio_ast2600_1_8v_class_init(ObjectClass *klass, void= *data) +{ + AspeedGPIOClass *agc =3D ASPEED_GPIO_CLASS(klass); + + agc->props =3D ast2600_1_8v_set_props; + agc->nr_gpio_pins =3D 36; + agc->nr_gpio_sets =3D 2; + agc->reg_table =3D aspeed_1_8v_gpios; +} + static const TypeInfo aspeed_gpio_info =3D { .name =3D TYPE_ASPEED_GPIO, .parent =3D TYPE_SYS_BUS_DEVICE, @@ -874,11 +990,27 @@ static const TypeInfo aspeed_gpio_ast2500_info =3D = { .instance_init =3D aspeed_gpio_init, }; =20 +static const TypeInfo aspeed_gpio_ast2600_3_6v_info =3D { + .name =3D TYPE_ASPEED_GPIO "-ast2600", + .parent =3D TYPE_ASPEED_GPIO, + .class_init =3D aspeed_gpio_ast2600_3_6v_class_init, + .instance_init =3D aspeed_gpio_init, +}; + +static const TypeInfo aspeed_gpio_ast2600_1_8v_info =3D { + .name =3D TYPE_ASPEED_GPIO "-ast2600-1_8v", + .parent =3D TYPE_ASPEED_GPIO, + .class_init =3D aspeed_gpio_ast2600_1_8v_class_init, + .instance_init =3D aspeed_gpio_init, +}; + static void aspeed_gpio_register_types(void) { type_register_static(&aspeed_gpio_info); type_register_static(&aspeed_gpio_ast2400_info); type_register_static(&aspeed_gpio_ast2500_info); + type_register_static(&aspeed_gpio_ast2600_3_6v_info); + type_register_static(&aspeed_gpio_ast2600_1_8v_info); } =20 type_init(aspeed_gpio_register_types); --=20 2.21.0