From patchwork Mon Jul 29 14:56:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Hedde X-Patchwork-Id: 1138451 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=greensocs.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=greensocs.com header.i=@greensocs.com header.b="xiA+Hxsp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45y32P2f5tz9sPd for ; Tue, 30 Jul 2019 01:07:25 +1000 (AEST) Received: from localhost ([::1]:53068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7FD-0000fq-BG for incoming@patchwork.ozlabs.org; Mon, 29 Jul 2019 11:07:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38073) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs77Q-0004HY-Rg for qemu-devel@nongnu.org; Mon, 29 Jul 2019 10:59:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs77L-0004j8-EZ for qemu-devel@nongnu.org; Mon, 29 Jul 2019 10:59:17 -0400 Received: from beetle.greensocs.com ([5.135.226.135]:48108) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hs778-0004UA-K9; Mon, 29 Jul 2019 10:59:03 -0400 Received: from kouign-amann.bar.greensocs.com (unknown [172.16.11.117]) by beetle.greensocs.com (Postfix) with ESMTPS id 3E69896F63; Mon, 29 Jul 2019 14:59:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greensocs.com; s=mail; t=1564412341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=409z6EcDD8PHCk72cCP2wzloU1EO5HsmW5lWXcYVGNs=; b=xiA+HxspsLSBtmQcw+UvJ/wzhyFTaaXQuhIXreXHNWUyJndVIdBS5VTsTzNdkxYvDKIc2N 4c8tuqHWXo5Pg7KmqYndFmLGgi6sLEYUqPevLayStKO6KNvb5J76ilgmDQ3SmqvZ+OA0xi ig6QWdsZp3AbTtbeMWYY/K+OnIJvIgI= From: Damien Hedde To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 16:56:29 +0200 Message-Id: <20190729145654.14644-9-damien.hedde@greensocs.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729145654.14644-1-damien.hedde@greensocs.com> References: <20190729145654.14644-1-damien.hedde@greensocs.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=greensocs.com; s=mail; t=1564412341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=409z6EcDD8PHCk72cCP2wzloU1EO5HsmW5lWXcYVGNs=; b=yrwdTmD8nli09lh4tSL2S4rXSszfTatn7Y1PP+jI/c36hC5bnnX6cOxH3blgc2SqVeOSXK L4uvV5HjM6Ea2x9/gLXdfBhWC/4gxOmR7KXBc7+vBXfvg3KhcQRZ3cMo2q688hE4JKagXT D21NSh9YTv4mdnsrKB9UUw7yCCDQxW4= ARC-Seal: i=1; s=mail; d=greensocs.com; t=1564412341; a=rsa-sha256; cv=none; b=Iw5SF0aymzGYPVa6mybde/cU7+/kf+iKmI9X64k+3GPT2xQroQh2325IyGMVDrNXHzK+TZ ViVIj0y2juaNXZZoOAiDjsLJ/Ghz8vOrIDZ5zBSQ+IREWndsjGvRhLzwgYtZvGahqLS9nG Ve/Bzba2DvH4orgGjVoMvo4bOav83Lc= ARC-Authentication-Results: i=1; beetle.greensocs.com; none X-Spam: Yes X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 5.135.226.135 Subject: [Qemu-devel] [PATCH v3 08/33] Add function to control reset with gpio inputs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, peter.maydell@linaro.org, walling@linux.ibm.com, dmitry.fleytman@gmail.com, mst@redhat.com, mark.cave-ayland@ilande.co.uk, kraxel@redhat.com, edgar.iglesias@xilinx.com, hare@suse.com, qemu-block@nongnu.org, david@redhat.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, marcandre.lureau@redhat.com, rth@twiddle.net, thuth@redhat.com, ehabkost@redhat.com, alistair@alistair23.me, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, clg@kaod.org, jsnow@redhat.com, david@gibson.dropbear.id.au, Damien Hedde , berrange@redhat.com, cohuck@redhat.com, mark.burton@greensocs.com, qemu-ppc@nongnu.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It adds the possibility to add 2 gpios to control the warm and cold reset. With theses ios, the reset can be maintained during some time. Each io is associated with a state to detect level changes. Vmstate subsections are also added to the existsing device_reset subsection. Signed-off-by: Damien Hedde --- hw/core/qdev-vmstate.c | 15 ++++++++++ hw/core/qdev.c | 65 ++++++++++++++++++++++++++++++++++++++++++ include/hw/qdev-core.h | 57 ++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) diff --git a/hw/core/qdev-vmstate.c b/hw/core/qdev-vmstate.c index 24f8465c61..72f84c6cee 100644 --- a/hw/core/qdev-vmstate.c +++ b/hw/core/qdev-vmstate.c @@ -24,10 +24,23 @@ static int device_vmstate_reset_post_load(void *opaque, int version_id) { DeviceState *dev = (DeviceState *) opaque; BusState *bus; + uint32_t io_count = 0; + QLIST_FOREACH(bus, &dev->child_bus, sibling) { bus->resetting = dev->resetting; bus->reset_is_cold = dev->reset_is_cold; } + + if (dev->cold_reset_input.state) { + io_count += 1; + } + if (dev->warm_reset_input.state) { + io_count += 1; + } + /* ensure resetting count is coherent with io states */ + if (dev->resetting < io_count) { + return -1; + } return 0; } @@ -40,6 +53,8 @@ const struct VMStateDescription device_vmstate_reset = { .fields = (VMStateField[]) { VMSTATE_UINT32(resetting, DeviceState), VMSTATE_BOOL(reset_is_cold, DeviceState), + VMSTATE_BOOL(cold_reset_input.state, DeviceState), + VMSTATE_BOOL(warm_reset_input.state, DeviceState), VMSTATE_END_OF_LIST() }, }; diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 88387d3743..11a4de55ea 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -450,6 +450,67 @@ void qdev_init_gpio_in(DeviceState *dev, qemu_irq_handler handler, int n) qdev_init_gpio_in_named(dev, handler, NULL, n); } +static DeviceResetInputState *device_get_reset_input_state(DeviceState *dev, + bool cold) +{ + return cold ? &dev->cold_reset_input : &dev->warm_reset_input; +} + +static void device_reset_handler(DeviceState *dev, bool cold, bool level) +{ + DeviceResetInputState *dris = device_get_reset_input_state(dev, cold); + + if (dris->type == DEVICE_RESET_ACTIVE_LOW) { + level = !level; + } + + if (dris->state == level) { + /* io state has not changed */ + return; + } + + dris->state = level; + + if (level) { + resettable_assert_reset(OBJECT(dev), cold); + } else { + resettable_deassert_reset(OBJECT(dev)); + } +} + +static void device_cold_reset_handler(void *opaque, int n, int level) +{ + device_reset_handler((DeviceState *) opaque, true, level); +} + +static void device_warm_reset_handler(void *opaque, int n, int level) +{ + device_reset_handler((DeviceState *) opaque, false, level); +} + +void qdev_init_reset_gpio_in_named(DeviceState *dev, const char *name, + bool cold, DeviceResetActiveType type) +{ + DeviceResetInputState *dris = device_get_reset_input_state(dev, cold); + qemu_irq_handler handler; + + switch (type) { + case DEVICE_RESET_ACTIVE_LOW: + case DEVICE_RESET_ACTIVE_HIGH: + break; + default: + assert(false); + break; + } + + assert(!dris->exists); + dris->exists = true; + dris->type = type; + + handler = cold ? device_cold_reset_handler : device_warm_reset_handler; + qdev_init_gpio_in_named(dev, handler, name, 1); +} + void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins, const char *name, int n) { @@ -1007,6 +1068,10 @@ static void device_initfn(Object *obj) dev->instance_id_alias = -1; dev->realized = false; dev->resetting = 0; + dev->cold_reset_input.exists = false; + dev->cold_reset_input.state = false; + dev->warm_reset_input.exists = false; + dev->warm_reset_input.state = false; object_property_add_bool(obj, "realized", device_get_realized, device_set_realized, NULL); diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 926d4bbcb1..f724ddc8f4 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -136,6 +136,23 @@ struct NamedGPIOList { QLIST_ENTRY(NamedGPIOList) node; }; +typedef enum DeviceResetActiveType { + DEVICE_RESET_ACTIVE_LOW, + DEVICE_RESET_ACTIVE_HIGH, +} DeviceResetActiveType; + +/** + * DeviceResetInputState: + * @exists: tell if io exists + * @type: tell whether the io active low or high + * @state: true if reset is currently active + */ +typedef struct DeviceResetInputState { + bool exists; + DeviceResetActiveType type; + bool state; +} DeviceResetInputState; + /** * DeviceState: * @realized: Indicates whether the device has been fully constructed. @@ -143,6 +160,8 @@ struct NamedGPIOList { * used to count how many times reset has been initiated on the device. * @reset_is_cold: If the device is under reset, indicates whether it is cold * or warm. + * @cold_reset_input: state data for cold reset io + * @warm_reset_input: state data for warm reset io * * This structure should not be accessed directly. We declare it here * so that it can be embedded in individual device state structures. @@ -167,6 +186,8 @@ struct DeviceState { uint32_t resetting; bool reset_is_cold; bool reset_hold_needed; + DeviceResetInputState cold_reset_input; + DeviceResetInputState warm_reset_input; }; struct DeviceListener { @@ -372,6 +393,42 @@ static inline void qdev_init_gpio_in_named(DeviceState *dev, void qdev_pass_gpios(DeviceState *dev, DeviceState *container, const char *name); +/** + * qdev_init_reset_gpio_in_named: + * Create a gpio controlling the warm or cold reset of the device. + * + * @cold: specify whether it triggers cold or warm reset + * @type: what kind of reset io it is + * + * Note: the io is considered created in its inactive state. No reset + * is started by this function. + */ +void qdev_init_reset_gpio_in_named(DeviceState *dev, const char *name, + bool cold, DeviceResetActiveType type); + +/** + * qdev_init_warm_reset_gpio: + * Create the input to control the device warm reset. + */ +static inline void qdev_init_warm_reset_gpio(DeviceState *dev, + const char *name, + DeviceResetActiveType type) +{ + qdev_init_reset_gpio_in_named(dev, name, false, type); +} + +/** + * qdev_init_cold_reset_gpio: + * Create the input to control the device cold reset. + * It can also be used as a power gate control. + */ +static inline void qdev_init_cold_reset_gpio(DeviceState *dev, + const char *name, + DeviceResetActiveType type) +{ + qdev_init_reset_gpio_in_named(dev, name, true, type); +} + BusState *qdev_get_parent_bus(DeviceState *dev); /*** BUS API. ***/