From patchwork Tue Jan 19 22:35:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 8065341 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 742379F96D for ; Tue, 19 Jan 2016 22:39:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 880A62045E for ; Tue, 19 Jan 2016 22:39:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE98820456 for ; Tue, 19 Jan 2016 22:39:55 +0000 (UTC) Received: from localhost ([::1]:39481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLewN-0003uf-2k for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Jan 2016 17:39:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLeuH-0000TH-B7 for qemu-devel@nongnu.org; Tue, 19 Jan 2016 17:37:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLeuE-0003qG-3s for qemu-devel@nongnu.org; Tue, 19 Jan 2016 17:37:45 -0500 Received: from mail-cys01nam02on0082.outbound.protection.outlook.com ([104.47.37.82]:46016 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLeuD-0003pv-So for qemu-devel@nongnu.org; Tue, 19 Jan 2016 17:37:42 -0500 Received: from CY1NAM02FT030.eop-nam02.prod.protection.outlook.com (10.152.74.52) by CY1NAM02HT037.eop-nam02.prod.protection.outlook.com (10.152.74.178) with Microsoft SMTP Server (TLS) id 15.1.355.15; Tue, 19 Jan 2016 22:37:40 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; suse.de; dkim=none (message not signed) header.d=none; suse.de; 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 CY1NAM02FT030.mail.protection.outlook.com (10.152.75.163) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Tue, 19 Jan 2016 22:37:39 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:34434 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1aLeuA-0008Qr-JH; Tue, 19 Jan 2016 14:37:38 -0800 Received: from [127.0.0.1] (port=41653 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1aLeuA-0007ga-Dz; Tue, 19 Jan 2016 14:37:38 -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 u0JMW5Ns015237; Tue, 19 Jan 2016 14:32:05 -0800 Received: from [172.19.74.182] (port=39714 helo=xsjalistai50.xlnx.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1aLeu9-0007gX-Jz; Tue, 19 Jan 2016 14:37:37 -0800 From: Alistair Francis To: Date: Tue, 19 Jan 2016 14:35:11 -0800 Message-ID: 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-22054.006 X-TM-AS-Result: No--9.416-7.0-31-10 X-imss-scan-details: No--9.416-7.0-31-10 X-TMASE-MatchedRID: FqqvQu7ZYnb/uyguzMmOKFz+axQLnAVB5kzxLgNhSikKogmGusPLb6vD NbXRWSqPz4sGsPGzdlhzifvOEgqhlxLmJd2F/yFuDB+ErBr0bAP/lBG+uXYJkBnqZmOmN1+Hkk1 UCWc2BMjYrURbE5rx7J+Jh3xpp8VmeAavp+4WHK3k7k9yXJiqqlg3VqSTJ7SofmHrLgoJIlzTk3 9nF8DvzlkiL23zZNAA2A+lYqEusZrVDAMEwzgZ7MRMEkznlVEOfS0Ip2eEHnz3IzXlXlpamPoLR 4+zsDTtX28xNpU0U3NKJD2wWZDeqxsQ17/F6yACC987iHMS+p/7EV6COs0C+A== X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(5003940100001)(86362001)(48376002)(4326007)(64026002)(33646002)(105606002)(36756003)(118296001)(110136002)(586003)(106466001)(19580405001)(87936001)(1220700001)(85426001)(2906002)(5003600100002)(2950100001)(50466002)(47776003)(81156007)(11100500001)(229853001)(1096002)(71366001)(2351001)(76176999)(19580395003)(50986999)(5008740100001)(50226001)(575784001)(6806005)(5001960100002)(77096005)(92566002)(189998001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1NAM02HT037; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 85600885-dc37-46f1-ae5c-08d321212318 X-Exchange-Antispam-Report-Test: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:CY1NAM02HT037; UriScan:(192813158149592); X-Microsoft-Antispam-PRVS: <33ef932003e54b93a9055c15214d0045@CY1NAM02HT037.eop-nam02.prod.protection.outlook.com> X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(13015025)(8121501046)(13018025)(5005006)(520078)(13023025)(13024025)(3002001)(10201501046); SRVR:CY1NAM02HT037; BCL:0; PCL:0; RULEID:; SRVR:CY1NAM02HT037; X-Forefront-PRVS: 0826B2F01B X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2016 22:37:39.2235 (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: CY1NAM02HT037 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.82 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, alistair.francis@xilinx.com, crosthwaitepeter@gmail.com, edgar.iglesias@gmail.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 07/16] register: Add block initialise helper 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Peter Crosthwaite Add a helper that will scan a static RegisterAccessInfo Array and populate a container MemoryRegion with registers as defined. Signed-off-by: Peter Crosthwaite Signed-off-by: Alistair Francis --- V2: - Use memory_region_add_subregion_no_print() hw/core/register.c | 29 +++++++++++++++++++++++++++++ include/hw/register.h | 21 +++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/hw/core/register.c b/hw/core/register.c index 000b87f..116fd0b 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -255,6 +255,35 @@ uint64_t register_read_memory_le(void *opaque, hwaddr addr, unsigned size) return register_read_memory(opaque, addr, size, false); } +void register_init_block32(DeviceState *owner, const RegisterAccessInfo *rae, + int num, RegisterInfo *ri, uint32_t *data, + MemoryRegion *container, const MemoryRegionOps *ops, + bool debug_enabled) +{ + const char *debug_prefix = object_get_typename(OBJECT(owner)); + int i; + + for (i = 0; i < num; i++) { + int index = rae[i].decode.addr / 4; + RegisterInfo *r = &ri[index]; + + *r = (RegisterInfo) { + .data = &data[index], + .data_size = sizeof(uint32_t), + .access = &rae[i], + .debug = debug_enabled, + .prefix = debug_prefix, + .opaque = owner, + }; + register_init(r); + + memory_region_init_io(&r->mem, OBJECT(owner), ops, r, r->access->name, + sizeof(uint32_t)); + memory_region_add_subregion_no_print(container, + r->access->decode.addr, &r->mem); + } +} + static const TypeInfo register_info = { .name = TYPE_REGISTER, .parent = TYPE_DEVICE, diff --git a/include/hw/register.h b/include/hw/register.h index 6677dee..f3e4c2c 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -186,6 +186,27 @@ void register_write_memory_le(void *opaque, hwaddr addr, uint64_t value, uint64_t register_read_memory_be(void *opaque, hwaddr addr, unsigned size); uint64_t register_read_memory_le(void *opaque, hwaddr addr, unsigned size); +/** + * Init a block of consecutive registers into a container MemoryRegion. A + * number of constant register definitions are parsed to create a corresponding + * array of RegisterInfo's. + * + * @owner: device owning the registers + * @rae: Register definitions to init + * @num: number of registers to init (length of @rae) + * @ri: Register array to init + * @data: Array to use for register data + * @container: Memory region to contain new registers + * @ops: Memory region ops to use to access registers. Opaque data of handler + * with be a RegisterInfo * (from @ri) + * @debug enabled: turn on/off verbose debug information + */ + +void register_init_block32(DeviceState *owner, const RegisterAccessInfo *rae, + int num, RegisterInfo *ri, uint32_t *data, + MemoryRegion *container, const MemoryRegionOps *ops, + bool debug_enabled); + /* Define constants for a 32 bit register */ #define REG32(reg, addr) \ enum { A_ ## reg = (addr) }; \