From nobody Fri Dec 19 04:27:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580401289872436.0370559839363; Thu, 30 Jan 2020 08:21:29 -0800 (PST) Received: from localhost ([::1]:35308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixCZM-0005XV-Np for importer@patchew.org; Thu, 30 Jan 2020 11:21:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43078) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixCTq-0005Ms-Hv for qemu-devel@nongnu.org; Thu, 30 Jan 2020 11:15:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixCTp-0002tC-3H for qemu-devel@nongnu.org; Thu, 30 Jan 2020 11:15:46 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:32865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixCTo-0002sS-SW for qemu-devel@nongnu.org; Thu, 30 Jan 2020 11:15:45 -0500 Received: by mail-wr1-x443.google.com with SMTP id b6so4846097wrq.0 for ; Thu, 30 Jan 2020 08:15:44 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a22sm6994442wmd.20.2020.01.30.08.15.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jan 2020 08:15:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=CvOZoQCzaXRX99AzHkA3Ml/rAbedFDJt0FwyBDVaLOE=; b=E013q0/qPOgOKyzdgJtZXoHmQCNV4Q4G5NrBIXRfnGNaZ5sxY9kkG4ZUKA4fdqnmNv O6l9JT8UOfbBfYWkq1MJr7rI4EPR9t1j9nHZeFbTfACroz+qUSO1V2gspI63z4wK1yL7 szUCR3QZ+LCrz7kUYWx4OcFvHc8fgPnEqgFI/furrFz8laBa0Dn9jTzQZtwVBwwgcKFL obJjnT8u0j95Aj3qL1F1853YezgbEvmIDw1MCLfqhaIXaLY9NUgQySYOa/IvRBwiXCgK YEk5Sn40z/X1dOelhU4JhoCD1fSn4sRAGElrx5GjmxtZy+4AFTKXxIfwSYwqZZjhk5gW Z2vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CvOZoQCzaXRX99AzHkA3Ml/rAbedFDJt0FwyBDVaLOE=; b=JNrH3J4k1Q3hkUNEuI+6IBXnScSdcF6LWKbREeGK7C6JzJGg/KHsP5+rjRVWr5AiOd 1WQtWow3nHiEMgPFYHIELCdlYRljd3Ux8SOVdWeKj5bs/4H7qcUbpydaCH/cARC5UHrk KXAnqj2uo2UbtBN+C3MFxYBl/cvDcM/GWL/fgkOozyN249hD6A0RwLkRKjIeZrputss0 NE8W7h10+U+RDkGjZosdYpsiPRFN0dbmS1O65ST+aCQ85vehHlwRpF5iFmusKJtQopGo q1GrBhDvAibKXL5xDul4Xns3arKre8bgCqcoEsN3jBMz7zgJ1+9gh9RkwLoXqpB3G1kj QeuA== X-Gm-Message-State: APjAAAWjlmi+/zh/Gs56b4fpmYVxOHfp+BWLQJdbl54TIqJlVXOhpErd cxhU7+840jKtjl5o+OStPcMfGb5c2/lRUw== X-Google-Smtp-Source: APXvYqwwvm5IuGWANVot7LwX/btI7jVH7kMJ5vosTzDlNo7c4qrkGh2p5g8lFxI2k/ODeTieLmWNXA== X-Received: by 2002:a5d:4ed0:: with SMTP id s16mr6621185wrv.144.1580400943720; Thu, 30 Jan 2020 08:15:43 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/26] misc/pca9552: Add qom set and get Date: Thu, 30 Jan 2020 16:15:14 +0000 Message-Id: <20200130161533.8180-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200130161533.8180-1-peter.maydell@linaro.org> References: <20200130161533.8180-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Joel Stanley Following the pattern of the work recently done with the ASPEED GPIO model, this adds support for inspecting and modifying the PCA9552 LEDs from the monitor. (qemu) qom-set /machine/unattached/device[17] led0 on (qemu) qom-set /machine/unattached/device[17] led0 off (qemu) qom-set /machine/unattached/device[17] led0 pwm0 (qemu) qom-set /machine/unattached/device[17] led0 pwm1 Signed-off-by: Joel Stanley Signed-off-by: C=C3=A9dric Le Goater Message-id: 20200114103433.30534-6-clg@kaod.org [clg: - removed the "qom-get" examples from the commit log - merged memory leak fixes from Joel ] Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/misc/pca9552.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/hw/misc/pca9552.c b/hw/misc/pca9552.c index 73be28d9369..efd961e0414 100644 --- a/hw/misc/pca9552.c +++ b/hw/misc/pca9552.c @@ -15,12 +15,16 @@ #include "hw/misc/pca9552.h" #include "hw/misc/pca9552_regs.h" #include "migration/vmstate.h" +#include "qapi/error.h" +#include "qapi/visitor.h" =20 #define PCA9552_LED_ON 0x0 #define PCA9552_LED_OFF 0x1 #define PCA9552_LED_PWM0 0x2 #define PCA9552_LED_PWM1 0x3 =20 +static const char *led_state[] =3D {"on", "off", "pwm0", "pwm1"}; + static uint8_t pca9552_pin_get_config(PCA9552State *s, int pin) { uint8_t reg =3D PCA9552_LS0 + (pin / 4); @@ -169,6 +173,82 @@ static int pca9552_event(I2CSlave *i2c, enum i2c_event= event) return 0; } =20 +static void pca9552_get_led(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + PCA9552State *s =3D PCA9552(obj); + int led, rc, reg; + uint8_t state; + + rc =3D sscanf(name, "led%2d", &led); + if (rc !=3D 1) { + error_setg(errp, "%s: error reading %s", __func__, name); + return; + } + if (led < 0 || led > s->nr_leds) { + error_setg(errp, "%s invalid led %s", __func__, name); + return; + } + /* + * Get the LSx register as the qom interface should expose the device + * state, not the modeled 'input line' behaviour which would come from + * reading the INPUTx reg + */ + reg =3D PCA9552_LS0 + led / 4; + state =3D (pca9552_read(s, reg) >> (led % 8)) & 0x3; + visit_type_str(v, name, (char **)&led_state[state], errp); +} + +/* + * Return an LED selector register value based on an existing one, with + * the appropriate 2-bit state value set for the given LED number (0-3). + */ +static inline uint8_t pca955x_ledsel(uint8_t oldval, int led_num, int stat= e) +{ + return (oldval & (~(0x3 << (led_num << 1)))) | + ((state & 0x3) << (led_num << 1)); +} + +static void pca9552_set_led(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + PCA9552State *s =3D PCA9552(obj); + Error *local_err =3D NULL; + int led, rc, reg, val; + uint8_t state; + char *state_str; + + visit_type_str(v, name, &state_str, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + rc =3D sscanf(name, "led%2d", &led); + if (rc !=3D 1) { + error_setg(errp, "%s: error reading %s", __func__, name); + return; + } + if (led < 0 || led > s->nr_leds) { + error_setg(errp, "%s invalid led %s", __func__, name); + return; + } + + for (state =3D 0; state < ARRAY_SIZE(led_state); state++) { + if (!strcmp(state_str, led_state[state])) { + break; + } + } + if (state >=3D ARRAY_SIZE(led_state)) { + error_setg(errp, "%s invalid led state %s", __func__, state_str); + return; + } + + reg =3D PCA9552_LS0 + led / 4; + val =3D pca9552_read(s, reg); + val =3D pca955x_ledsel(val, led % 4, state); + pca9552_write(s, reg, val); +} + static const VMStateDescription pca9552_vmstate =3D { .name =3D "PCA9552", .version_id =3D 0, @@ -204,6 +284,7 @@ static void pca9552_reset(DeviceState *dev) static void pca9552_initfn(Object *obj) { PCA9552State *s =3D PCA9552(obj); + int led; =20 /* If support for the other PCA955X devices are implemented, these * constant values might be part of class structure describing the @@ -211,6 +292,15 @@ static void pca9552_initfn(Object *obj) */ s->max_reg =3D PCA9552_LS3; s->nr_leds =3D 16; + + for (led =3D 0; led < s->nr_leds; led++) { + char *name; + + name =3D g_strdup_printf("led%d", led); + object_property_add(obj, name, "bool", pca9552_get_led, pca9552_se= t_led, + NULL, NULL, NULL); + g_free(name); + } } =20 static void pca9552_class_init(ObjectClass *klass, void *data) --=20 2.20.1