From patchwork Tue Mar 8 21:07:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 594348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42D9F1402C9 for ; Wed, 9 Mar 2016 08:19:01 +1100 (AEDT) Received: from localhost ([::1]:37492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adP1v-0002nE-AQ for incoming@patchwork.ozlabs.org; Tue, 08 Mar 2016 16:18:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adOtQ-0006KF-UW for qemu-devel@nongnu.org; Tue, 08 Mar 2016 16:10:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adOtL-00033d-Pk for qemu-devel@nongnu.org; Tue, 08 Mar 2016 16:10:12 -0500 Received: from mail-cys01nam02on0088.outbound.protection.outlook.com ([104.47.37.88]:34466 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adOtL-00032o-Ho for qemu-devel@nongnu.org; Tue, 08 Mar 2016 16:10:07 -0500 Received: from SN1NAM02FT001.eop-nam02.prod.protection.outlook.com (10.152.72.58) by SN1NAM02HT014.eop-nam02.prod.protection.outlook.com (10.152.73.0) with Microsoft SMTP Server (TLS) id 15.1.427.7; Tue, 8 Mar 2016 21:10:05 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; linaro.org; dkim=none (message not signed) header.d=none; linaro.org; dmarc=none action=none header.from=xilinx.com; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by SN1NAM02FT001.mail.protection.outlook.com (10.152.72.158) with Microsoft SMTP Server (TLS) id 15.1.434.11 via Frontend Transport; Tue, 8 Mar 2016 21:10:02 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:47590 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1adOtF-0006Cu-Qm; Tue, 08 Mar 2016 13:10:01 -0800 Received: from [127.0.0.1] (port=48535 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1adOtF-0000fZ-N2; Tue, 08 Mar 2016 13:10:01 -0800 Received: from xsj-tvapsmtp02 (smtptest.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id u28L4BTo021924; Tue, 8 Mar 2016 13:04:11 -0800 Received: from [172.19.74.182] (port=56672 helo=xsjalistai50.xlnx.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1adOtE-0000fV-SI; Tue, 08 Mar 2016 13:10:00 -0800 From: Alistair Francis To: , Date: Tue, 8 Mar 2016 13:07:00 -0800 Message-ID: <176bf8fa3d0220b1dd70a05c2734fce92d3a4732.1457470980.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-22178.005 X-TM-AS-Result: No--14.143-7.0-31-10 X-imss-scan-details: No--14.143-7.0-31-10 X-TMASE-MatchedRID: gjHmqQ7feJaLwgJA7qJvFMnUT+eskUQPeFyzQYzPQ+TwkZ5FhgEMOvRm 0kmqtH+D32/yo9IXlhROMEQFWdYpZNnIY5r2VYXxWnQHHkRrIIUXig/OPxxJLp+QxLD3BYlHIE6 KlxNg++sPadgPEb7YTdU65J3foW7bEuYl3YX/IW7d+fuf9kcapoMP4a7bu9zrol3uZzZ1GLdmKV VGR/lKLvUtOBUnmrZfndQ6nUJWlG0tlu2PjaXfURl7FdaNVULczbQL1Pyxipk2/UwdvFG5ImCzO eIofg8foWr4Xyi5hiTKBf/S53KIpHgDHLz5aaMp/4ToWehCRQVTm6UYlo7la5soi2XrUn/Jn6Kd MrRsL14qtq5d3cxkNTNpc4k18MbtP7JT4rxKrPEN76Yl5G57K5fnvjCmY7cGkB+1xW4qSCo= X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(6806005)(85426001)(5008740100001)(87936001)(86362001)(48376002)(47776003)(81166005)(76176999)(189998001)(92566002)(50466002)(11100500001)(50986999)(33646002)(5001770100001)(1096002)(64026002)(5003940100001)(4326007)(77096005)(105606002)(2906002)(106466001)(36756003)(2950100001)(118296001)(5890100001)(5003600100002)(71366001)(229853001)(586003)(50226001)(19580405001)(19580395003)(1220700001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1NAM02HT014; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 9fbc7e2b-d2cd-4640-80b9-08d347960596 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1NAM02HT014; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(13024025)(13023025)(13015025)(13018025)(8121501046)(5005006)(3002001)(10201501046); SRVR:SN1NAM02HT014; BCL:0; PCL:0; RULEID:; SRVR:SN1NAM02HT014; X-Forefront-PRVS: 08756AC3C8 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2016 21:10:02.7380 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM02HT014 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.88 Cc: edgar.iglesias@xilinx.com, alistair.francis@xilinx.com, crosthwaitepeter@gmail.com, edgar.iglesias@gmail.com, alex.bennee@linaro.org, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v5 13/15] register: Add GPIO API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add GPIO functionality to the register API. This allows association and automatic connection of GPIOs to bits in registers. GPIO inputs will attach to handlers that automatically set read-only bits in registers. GPIO outputs will be updated to reflect their field value when their respective registers are written (or reset). Supports active low GPIOs. This is particularly effective for implementing system level controllers, where heterogenous collections of control signals are placed is a SoC specific peripheral then propagated all over the system. Signed-off-by: Peter Crosthwaite [ EI Changes: * register: Add a polarity field to GPIO connections Makes it possible to directly connect active low signals to generic interrupt pins. ] Signed-off-by: Edgar E. Iglesias Signed-off-by: Alistair Francis --- V5 - Remove RegisterAccessError struct hw/core/register.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/register.h | 26 ++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/hw/core/register.c b/hw/core/register.c index 5db8f62..4201373 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -100,6 +100,7 @@ void register_write(RegisterInfo *reg, uint64_t val, uint64_t we) } register_write_val(reg, new_val); + register_refresh_gpios(reg, old_val); if (ac->post_write) { ac->post_write(reg, new_val); @@ -139,23 +140,117 @@ uint64_t register_read(RegisterInfo *reg) void register_reset(RegisterInfo *reg) { g_assert(reg); + uint64_t old_val; if (!reg->data || !reg->access) { return; } + old_val = register_read_val(reg); + register_write_val(reg, reg->access->reset); + register_refresh_gpios(reg, old_val); +} + +void register_refresh_gpios(RegisterInfo *reg, uint64_t old_value) +{ + const RegisterAccessInfo *ac; + const RegisterGPIOMapping *gpio; + + ac = reg->access; + for (gpio = ac->gpios; gpio && gpio->name; gpio++) { + int i; + + if (gpio->input) { + continue; + } + + for (i = 0; i < gpio->num; ++i) { + uint64_t gpio_value, gpio_value_old; + + qemu_irq gpo = qdev_get_gpio_out_named(DEVICE(reg), gpio->name, i); + gpio_value_old = extract64(old_value, + gpio->bit_pos + i * gpio->width, + gpio->width) ^ gpio->polarity; + gpio_value = extract64(register_read_val(reg), + gpio->bit_pos + i * gpio->width, + gpio->width) ^ gpio->polarity; + if (!(gpio_value_old ^ gpio_value)) { + continue; + } + if (reg->debug && gpo) { + qemu_log("refreshing gpio out %s to %" PRIx64 "\n", + gpio->name, gpio_value); + } + qemu_set_irq(gpo, gpio_value); + } + } +} + +typedef struct DeviceNamedGPIOHandlerOpaque { + DeviceState *dev; + const char *name; +} DeviceNamedGPIOHandlerOpaque; + +static void register_gpio_handler(void *opaque, int n, int level) +{ + DeviceNamedGPIOHandlerOpaque *gho = opaque; + RegisterInfo *reg = REGISTER(gho->dev); + + const RegisterAccessInfo *ac; + const RegisterGPIOMapping *gpio; + + ac = reg->access; + for (gpio = ac->gpios; gpio && gpio->name; gpio++) { + if (gpio->input && !strcmp(gho->name, gpio->name)) { + register_write_val(reg, deposit64(register_read_val(reg), + gpio->bit_pos + n * gpio->width, + gpio->width, + level ^ gpio->polarity)); + return; + } + } + + abort(); } void register_init(RegisterInfo *reg) { assert(reg); + const RegisterAccessInfo *ac; + const RegisterGPIOMapping *gpio; if (!reg->data || !reg->access) { return; } object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER); + + ac = reg->access; + for (gpio = ac->gpios; gpio && gpio->name; gpio++) { + if (!gpio->num) { + ((RegisterGPIOMapping *)gpio)->num = 1; + } + if (!gpio->width) { + ((RegisterGPIOMapping *)gpio)->width = 1; + } + if (gpio->input) { + DeviceNamedGPIOHandlerOpaque gho = { + .name = gpio->name, + .dev = DEVICE(reg), + }; + qemu_irq irq; + + qdev_init_gpio_in_named(DEVICE(reg), register_gpio_handler, + gpio->name, gpio->num); + irq = qdev_get_gpio_in_named(DEVICE(reg), gpio->name, gpio->num); + qemu_irq_set_opaque(irq, g_memdup(&gho, sizeof(gho))); + } else { + qemu_irq *gpos = g_new0(qemu_irq, gpio->num); + + qdev_init_gpio_out_named(DEVICE(reg), gpos, gpio->name, gpio->num); + } + } } static inline void register_write_memory(void *opaque, hwaddr addr, @@ -253,6 +348,7 @@ void register_init_block32(DeviceState *owner, const RegisterAccessInfo *rae, .opaque = owner, }; register_init(r); + qdev_pass_all_gpios(DEVICE(r), owner); r_array->r[r_array->num_elements] = r; r_array->num_elements++; diff --git a/include/hw/register.h b/include/hw/register.h index 00df7d5..bf852db 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -13,11 +13,24 @@ #include "hw/qdev-core.h" #include "exec/memory.h" +#include "hw/irq.h" typedef struct RegisterInfo RegisterInfo; typedef struct RegisterAccessInfo RegisterAccessInfo; typedef struct RegisterInfoArray RegisterInfoArray; +#define REG_GPIO_POL_HIGH 0 +#define REG_GPIO_POL_LOW 1 + +typedef struct RegisterGPIOMapping { + const char *name; + uint8_t bit_pos; + bool input; + bool polarity; + uint8_t num; + uint8_t width; +} RegisterGPIOMapping; + /** * Access description for a register that is part of guest accessible device * state. @@ -59,6 +72,8 @@ struct RegisterAccessInfo { uint64_t (*post_read)(RegisterInfo *reg, uint64_t val); + const RegisterGPIOMapping *gpios; + struct { hwaddr addr; } decode; @@ -151,6 +166,17 @@ void register_reset(RegisterInfo *reg); void register_init(RegisterInfo *reg); /** + * Refresh GPIO outputs based on diff between old value register current value. + * GPIOs are refreshed for fields where the old value differs to the current + * value. + * + * @reg: Register to refresh GPIO outs + * @old_value: previous value of register + */ + +void register_refresh_gpios(RegisterInfo *reg, uint64_t old_value); + +/** * Memory API MMIO write handler that will write to a Register API register. * _be for big endian variant and _le for little endian. * @opaque: RegisterInfo to write to