Received: by 2002:a5d:4850:0:0:0:0:0 with SMTP id n16csp227715wrs; Thu, 15 Aug 2019 18:16:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYIHDSLDr62vm7fy0PDtbxFUnDOBe+zGq4FkMN2FmGygERQRAxO4GaZ2fdvOrmjpZ3CcXA X-Received: by 2002:a17:906:4e0e:: with SMTP id z14mr6877593eju.109.1565918196574; Thu, 15 Aug 2019 18:16:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565918196; cv=none; d=google.com; s=arc-20160816; b=J/7779t8665Dw8+UWZr05LJWFT+R/wJbs1JDXpsy2ySYBjupl87aMBCiXRg0CRxmDj O3wbB72WsiR1Xj3V00/aTHbP+6o/r2qCN7k3yVKbin0Ug8TQwDDoMQ4iPeZLAlnaSFCR zo2AAZcU+oUTWhJA1wHwfGyvnH37rjtkuPwYlYL/ceJNVv0CylNfVtawMkYosUek5Lu9 riKtxemDYkvhC2P//cWhK1Nn8Cvq1T0ecMdYwAH3NoEdQ+hWaVs6ehCWO2qTPUmMUO5W Nf581t3mjLRi7L4phoVAp2hq+BpUGwMSQyS24IBBovJm7YFIh7FNh9FjBSfq/XK1yy3o 2s4w== 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:user-agent:references :in-reply-to:date:to:from:message-id:dkim-signature; bh=G44lGmpWIhp5NRRDjzvhTsMhKROnWAORyvlVRk65qKk=; b=wXk/TGm6T1ewmXE4eargW7KxQ6YYpMwBtlwLArmCtDIQ3S7UEKq/qL8hFXqSHE9Xgg pAIBvJQc+QnwSq+fHIj7R20ldNykrPQuhdYvP4jUX/5zuDlvJgkgb9dhERiDHvX6HCQy VkusP9ON9dmdXS1rnF71KuWNMeEcbB7mndgFvq1j8IFliW7XXuxKgP01Y2Ea+H6KGajS T8B5FURbllbFwnEaozbPAJE7PLpGpyUMp29djWUHXiA/uEB4plPgBS8TC62TYNG6flgD MNgfXVaVjXvGML2IDupHgj9GJxB95gMqDK0wje+fANmBoQzBlakuAsQKWnlLDeAa308p HBBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=P6f9DP0k; 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"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s4si2694635edm.117.2019.08.15.18.16.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Aug 2019 18:16:36 -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; dkim=fail header.i=@gmail.com header.s=20161025 header.b=P6f9DP0k; 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"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1]:48270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyQr5-0000jx-Gk for alex.bennee@linaro.org; Thu, 15 Aug 2019 21:16:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54527) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyQqj-0000ja-2s for qemu-arm@nongnu.org; Thu, 15 Aug 2019 21:16:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyQqh-0006OU-Pz for qemu-arm@nongnu.org; Thu, 15 Aug 2019 21:16:12 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:40008) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hyQqh-0006N5-De; Thu, 15 Aug 2019 21:16:11 -0400 Received: by mail-pg1-x544.google.com with SMTP id w10so2090282pgj.7; Thu, 15 Aug 2019 18:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=G44lGmpWIhp5NRRDjzvhTsMhKROnWAORyvlVRk65qKk=; b=P6f9DP0kjYufEVkdxgzWUZpsJK9rHhmLenjEG9ha/uc0eXbz23SPd1VeGHKLwd5mRM Fw6oJY9zPZl6dOX3SKvBLglTL55doQkGTEWMYTd5W9kP9SMCwCryIa5IgaiX4m6uxRuy PdY1+KCmM88W4IfwmF8Evr9qcSwUlFOGEWtDc2Q6lG+fC+zMaJYpAVuU7+7CUQKtoj39 Zfv0Juxx/+hWvdFt0dTLOtcdxLCDV5wAQzOYzZl/fcwJz33+tyn9NKSLKk0rYyX7MZnc QPufYlN2cwVbostDE3XiocOJmkN4NGwX0rPnhN+qJuXFYSvtrMfz16mc53ni7NsIh1sy B1vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=G44lGmpWIhp5NRRDjzvhTsMhKROnWAORyvlVRk65qKk=; b=eNCQ95yUvHFXPpV6VYxLFNcM5066ge5A9ZcJ9iNh6X1I7C/zdKJQS5YW8b96RU+l2g xWL5ngyKABr8B041fcqEXcm3CGdDz6H6WthB0M/aeQGWWZQ9jJwoduqjviv/GK4A6f6L gb9Me7CUdlc7M2iB1+aL3kaey23ga5cAZWVIRL2FpM+jnGFrg683+StOj9uZ2ZImWA01 /XSuqo9bT8MAI1VtNX9oAGxLpvZMW24nYhTmoODGyImk77XpVuYBTsdZkYg7hzhD+YWp 3mDdezBUEsXvLMQ8J8h6XhJro+2LpdaEsi1w8IBaVcU2Qhqec/iqWJTcOoucYgZ7Gts8 V+zQ== X-Gm-Message-State: APjAAAWk74LT4e6LoGNrvSPx2M+iRFvap0/IqPid/LVQBauZWR3L8xoZ vXMwmJ5C5G81o7k7IoAfOns= X-Received: by 2002:a17:90a:b104:: with SMTP id z4mr4791446pjq.120.1565918169739; Thu, 15 Aug 2019 18:16:09 -0700 (PDT) Received: from rashmica.ozlabs.ibm.com ([122.99.82.10]) by smtp.googlemail.com with ESMTPSA id z24sm4929435pfr.51.2019.08.15.18.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 18:16:09 -0700 (PDT) Message-ID: <186994ccaaaa1c07015426ef2cc84bcefb411b09.camel@gmail.com> From: Rashmica Gupta To: =?ISO-8859-1?Q?C=E9dric?= Le Goater , peter.maydell@linaro.org, qemu-arm@nongnu.org Date: Fri, 16 Aug 2019 11:16:04 +1000 In-Reply-To: <88221198-9699-6ec4-14f7-ee3c375a57e4@kaod.org> References: <20190814071433.22243-1-rashmica.g@gmail.com> <20190814071433.22243-4-rashmica.g@gmail.com> <88221198-9699-6ec4-14f7-ee3c375a57e4@kaod.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.5 (3.30.5-1.fc29) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 Subject: Re: [Qemu-arm] [PATCH v4 3/3] 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@aj.id.au, aik@ozlabs.ru, qemu-devel@nongnu.org, joel@jms.id.au Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: Xpov0uyx5/QR On Wed, 2019-08-14 at 14:37 +0200, Cédric Le Goater wrote: > On 14/08/2019 09:14, Rashmica Gupta wrote: ... > > +static void aspeed_2600_gpio_realize(DeviceState *dev, Error > > **errp) > > +{ > > + AspeedGPIOState *s = ASPEED_GPIO(dev); > > + AspeedGPIOState *s_1_8, *s_3_6; > > + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); > > + AspeedGPIOClass *agc, *agc2; > > + int pin; > > + void *obj; > > + > > + /* Create and setup the 1.8V gpio state/class */ > > + obj = object_new(TYPE_ASPEED_GPIO "-ast2600"); > > + s_1_8 = ASPEED_GPIO(obj); > > + object_property_add_child(OBJECT(dev), TYPE_ASPEED_GPIO "- > > ast2600-1.8v", > > + obj, errp); > > + if (error_abort) { > > + error_propagate(errp, error_abort); > > + } > > This looks wrong. > > Shouldn't we instantiate 2 GPIOs devices under the AST2600 SoC with > different > types ? > We were trying to keep one GPIO device with two states, one state for 3.6V gpios and one for the 1.8V gpios. As you can see I couldn't find a nice way to do that. I'll have a go at just making two seperate devices. > C. > > > > + agc = ASPEED_GPIO_GET_CLASS(s_1_8); > > + agc->ctrl = (void *)&aspeed_gpio_ast2600_1_8v_controller; > > + aspeed_gpio_init(obj); > > + > > + /* Create and setup the 3.6V gpio state/class */ > > + obj = object_new(TYPE_ASPEED_GPIO "-ast2600"); > > + s_3_6 = ASPEED_GPIO(obj); > > + object_property_add_child(OBJECT(dev), TYPE_ASPEED_GPIO "- > > ast2600-3.6v", > > + obj, errp); > > + if (error_abort) { > > + error_propagate(errp, error_abort); > > + } > > + agc2 = ASPEED_GPIO_GET_CLASS(s_3_6); > > + agc2->ctrl = (void *)&aspeed_gpio_ast2600_3_6v_controller; > > + aspeed_gpio_init(obj); > > + > > + for (pin = 0; pin < agc->ctrl->nr_gpio_pins; pin++) { > > + sysbus_init_irq(sbd, &s->gpios[pin]); > > + } > > + > > + memory_region_init_io(&s_3_6->iomem, OBJECT(s_3_6), > > &aspeed_gpio_ops, s_3_6, > > + TYPE_ASPEED_GPIO, GPIO_3_6V_MEM_SIZE + > > GPIO_1_8V_MEM_SIZE); > > + s_3_6->lookup = aspeed_3_6v_gpios; > > + > > + memory_region_init_io(&s_1_8->iomem, OBJECT(s_1_8), > > &aspeed_gpio_ops, s_1_8, > > + TYPE_ASPEED_GPIO, GPIO_1_8V_MEM_SIZE); > > + memory_region_add_subregion(&s_3_6->iomem, > > GPIO_1_8V_REG_OFFSET, > > + &s_1_8->iomem); > > + s_1_8->lookup = aspeed_1_8v_gpios; > > + > > + sysbus_init_mmio(sbd, &s_3_6->iomem); > > + sysbus_init_mmio(sbd, &s_1_8->iomem); > > +} > > + > > static const VMStateDescription vmstate_gpio_regs = { > > .name = TYPE_ASPEED_GPIO"/regs", > > .version_id = 1, > > @@ -830,6 +991,16 @@ static const VMStateDescription > > vmstate_aspeed_gpio = { > > } > > }; > > > > +static void aspeed_gpio_ast2600_class_init(ObjectClass *klass, > > void *data) > > +{ > > + DeviceClass *dc = DEVICE_CLASS(klass); > > + > > + dc->realize = aspeed_2600_gpio_realize; > > + dc->reset = aspeed_gpio_reset; > > + dc->desc = "Aspeed GPIO Controller"; > > + dc->vmsd = &vmstate_aspeed_gpio; > > +} > > + > > static void aspeed_gpio_class_init(ObjectClass *klass, void *data) > > { > > DeviceClass *dc = DEVICE_CLASS(klass); > > @@ -866,11 +1037,18 @@ static const TypeInfo > > aspeed_gpio_ast2500_info = { > > .class_data = (void *)&aspeed_gpio_ast2500_controller, > > }; > > > > +static const TypeInfo aspeed_gpio_ast2600_info = { > > + .name = TYPE_ASPEED_GPIO "-ast2600", > > + .parent = TYPE_ASPEED_GPIO, > > + .class_init = aspeed_gpio_ast2600_class_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_info); > > } > > > > type_init(aspeed_gpio_register_types); > > diff --git a/slirp b/slirp > > index f0da672620..126c04acba 160000 > > --- a/slirp > > +++ b/slirp > > @@ -1 +1 @@ > > -Subproject commit f0da6726207b740f6101028b2992f918477a4b08 > > +Subproject commit 126c04acbabd7ad32c2b018fe10dfac2a3bc1210 > >