From patchwork Wed Jul 29 20:24:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 501823 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 BCDE81402B9 for ; Thu, 30 Jul 2015 06:27:41 +1000 (AEST) Received: from localhost ([::1]:36928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKXwx-0000p9-UK for incoming@patchwork.ozlabs.org; Wed, 29 Jul 2015 16:27:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKXuK-0004Wg-HM for qemu-devel@nongnu.org; Wed, 29 Jul 2015 16:24:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZKXuE-0002Xe-LW for qemu-devel@nongnu.org; Wed, 29 Jul 2015 16:24:56 -0400 Received: from mail-by2on0079.outbound.protection.outlook.com ([207.46.100.79]:27957 helo=na01-by2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKXuE-0002XC-BR for qemu-devel@nongnu.org; Wed, 29 Jul 2015 16:24:50 -0400 Received: from BY2FFO11FD049.protection.gbl (10.1.14.33) by BY2FFO11HUB044.protection.gbl (10.1.15.225) with Microsoft SMTP Server (TLS) id 15.1.231.11; Wed, 29 Jul 2015 20:24:48 +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; 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 BY2FFO11FD049.mail.protection.outlook.com (10.1.15.186) with Microsoft SMTP Server (TLS) id 15.1.231.11 via Frontend Transport; Wed, 29 Jul 2015 20:24:48 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:49663 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZKXuC-0003a0-90; Wed, 29 Jul 2015 13:24:48 -0700 Received: from [127.0.0.1] (port=39068 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZKXuC-0004Se-20; Wed, 29 Jul 2015 13:24:48 -0700 Received: from xsj-tvapsmtp02 (xsj-tvapsmtp02.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id t6TKKB5V010146; Wed, 29 Jul 2015 13:20:11 -0700 Received: from [172.19.5.153] (port=49423 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZKXuA-0004Sb-JV; Wed, 29 Jul 2015 13:24:46 -0700 From: Alistair Francis To: Date: Wed, 29 Jul 2015 13:24:46 -0700 Message-ID: <9167397faef776d1537136d7a09bfa6a101a4ac1.1438200827.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.1.1 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-21710.005 X-TM-AS-Result: No--9.315-7.0-31-10 X-imss-scan-details: No--9.315-7.0-31-10 X-TMASE-MatchedRID: MpG/zcNZUvH/uyguzMmOKBWCVBr+Ay98Ebs7d+z9c8uneP2LcHykgd/9 N6lK9KH6rLrdQysupgx7XrDFT6+EKZnghuhFDtTnS3OTftLNfg2K6IJmwLQESBwKSCi0KXuEBIi ptXNoj0apu/oWb7PXsbEsjT+pHjpBoLWVTedAnK+WLCkl1lq7B5IP/SO+XIBSCqIJhrrDy28wKY tIU69m3W3YRZ7DR5nXT9MrIRh3fANJTgdj9RkPpEhwlOfYeSqxGbJMFqqIm9xQR7Hmcp1pNaPFj JEFr+olwXCBO/GKkVqOhzOa6g8KrZmHI21oOUl3TU0yanFqf40lV5vP01+CMVr7KYpMTec/h3Qi svj0WNY= X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD049; 1:VdjhCiPio1DtRKssbZKRjdntI6q0yV15wQpZhGVijJ1xoymkQzbxkKyZ5XsYqRtjG6LqsOBKzconbwq3OIDkF1+g/H/TquCr7Qle+o8h6trvKgRQYmycj6VXykLMbhYPV9Dc8GPR34TRfUBO+vcLQVmyyrLY8arAihFHS/ejNaE/8+Q/p0pJWjzYO9URKd2I1OJx10m/rOBXv7v8sgO+7w19KDwAbLeS1dVc9gc3tIoTpOaPLLsz73kD7Aw0ZUPtvnCASRF9YeL0cqFKZgT3tjpqZBbHRBi8ow9yfiu/nISI/ZaPgrWh3blAb08/G6bo X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(189002)(199003)(77156002)(92566002)(6806004)(71366001)(106466001)(87936001)(19580395003)(64026002)(47776003)(110136002)(5001960100002)(33646002)(2351001)(62966003)(77096005)(46102003)(105606002)(19580405001)(50986999)(5003940100001)(50226001)(229853001)(118296001)(85426001)(86362001)(36756003)(5003600100002)(2950100001)(50466002)(48376002)(76176999)(189998001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2FFO11HUB044; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:nov; MX:1; A:1; PTR:unknown-60-96.xilinx.com; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB044; 2:KMgKlmiKDX3ORJDO/bd5dr5YJmkWVZMeNOgLKG8AUNvI4fsOmrpRssPGbFw6Z33LN+SuGVAYbODZ3ahMNHOHpxhb0CNvp05//RBKOnEQ1C2ORNrin1OPJwMvknMoJ3jxmN4wX+TLOqPeIR5WIGY0zaoYhshgRRR5FFDikvvSXU8=; 3:rFzkLlNGQByFJsVrAyKJqJCZnBXFI49qNBb57fgmSqSy9M9vygf6KIVWBZztKsl9pTBxoW+zYcUgQxS0BI34OvflcfZPBtNd0s+o9dclzDuF38ulNp+73d4tav1uCHFS0dMv8tUDiajPFVwLXCjmfZdAaZ/as6HvHLIl+0hPSpmE4Q4BT6PLxcVflBA7JYCeCPGuAWUW54tuAgz5+pOa17DgjJ5sKhx53osqS9ouwYc=; 25:9kTjhdVurJdnOY9q2UfkdXDcgAa+t+gN66kT84i4anXZVJVUmZC7dQl6gkNCCwXZ1u8WB3YVikdRm7uze1gnQ16yt2UeCaiqXY3oD3QbaYdzp839pwWlTTiZp4NyvSUBZ46dEXMsxNBZAMqVo/d5eWGC+XUoPoW5ZZUqi5Nt7A81TaPSPEe9OPzYOXovjRRXAlcvR6oOC4mIb/iTbXaZH5c5rwNRNeVnNutUQmp78j8dq4pj+fzG2c7wrAccm2V+Ux0scsFLg/5NZsmj4SR6BA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2FFO11HUB044; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB044; 20:CyiSFdalptPi3kr3tyijNXtCdQbvdxYQyez0cTLOc28PviFXsci0Xm791O1RuWsIUIWQxR9B9A3enfmXDcYIqdXXxYaUpiW2VravpEIS8ewljsgxrDH7I8JfT7Hb6TFaMmhVzvagTPYUj340x5qN0hq06TX7F1mL82EWJAdTlJXnaDpUVd+G+FffiLqADuTTfkihsCiYfKTNpriwAtrMGhUr5uy5fmmMVJew32yPa/0KVhRdN68Xb/HRi0qf0gsmzdZXxyPjzvHuKt049dB5+62epyjNY8hT8UafIZtWNT/pGHNE1HA4e5zChamBiIHUrWld/iAqi6U6gDaLaLdgggeBHUfBU0gZTUMRbwcVxpDr0V9Bbzbc+oFbt05GLj3H09RQmcwi0+sqBxHcQVy5qjSD2mZ9bjHqNGAGYL+5tOBlFzeA6Xo6WBWd7R4WljKBFyHl4lgaXF76d+ykByuQOtpcpZFgXNke7tnutFz+Mc7+yklOlXp87EwDgVHqm1wx; 4:C/vgRBw/Xq6T9ln9mJeHiEmf0ke438kNffxeIQRHedDqF53RWc21h21ngDgqKpg2AFYSL8+4qukXebCn2bSoKloeR0E8I9iVmsM1DkEbE9S4A9FEpATsXPXPuRocn0bzPjtm7QRsnvvIIW+M1lqWpNhYey9C+fsjLw+zt0vKXsuG0AYT4x5c2q+pX6LoLVn/qaoHHl++farAygv24TVyvet4gXqsho9KXUGdwCHQAzEiLSyRdJ/EYY5ovIiTc6P6kSYSvUQAMGKEP32jY50K0kLI23FmKu5Aa/cu6qfojf4= BY2FFO11HUB044: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY2FFO11HUB044; BCL:0; PCL:0; RULEID:; SRVR:BY2FFO11HUB044; X-Forefront-PRVS: 0652EA5565 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2FFO11HUB044; 23:HXjb2YFRpeIxBi6jwN9U7EooogdFvYsYz7T80CIU?= =?us-ascii?Q?f0BavStV7pXWlxVaAhqxNnEPUFrGNWS3oARVUVgWxZuCPBTdzpEd5ytfRFR8?= =?us-ascii?Q?GLp/DkpqPkyrMfzTqfZB13PmxgTgzUQ5Ka7hFE82MeUGZMa7pb61CeWEjtOY?= =?us-ascii?Q?nKBfuh+HC41pZkpt2MeLcug5wVBETFGd/MRqf8SIevcWHgblSMGA3hGdnaWU?= =?us-ascii?Q?S02YwfbGrJWQS5qTiFt02QXtoVzfyxVWu/qJ2pF22bZYil1Brt/Qgb+xuteU?= =?us-ascii?Q?B5gw1NO1HDKCylK4/zmfyllj6M5iwvA1thuTz0BGDinTmVEwh041+yWnFpw+?= =?us-ascii?Q?idpHrADMHioUOgCAfv4OP9DfE+KY51XeXeqP7TJTCVQSnM/Lwu4YsG9nub8L?= =?us-ascii?Q?KtkomvX4cSsMLZxjK28RpyIIByBVGBPaWAzL4HcsZ/j+zDlp/UaDrReUBEp+?= =?us-ascii?Q?8itCmR6U+zIdsU3n7/VQUuKsmGHtskSPH4+8nTnGTPOrEKWua+PodkyuJRro?= =?us-ascii?Q?Onrv2QWaasN2E8XE0yoZAnjwuFNXDE2pDBsx/kNnF1wp6VdbU4SrSJqWOcXN?= =?us-ascii?Q?KoUtHSS8Rb/ol+UfuV0g7x58OylqmPMhveuXn0j9V2z5lFlMLMgUhy7xKRWK?= =?us-ascii?Q?4NahT13fjWXjbauGdcHIZGrHM+Icm87laRQIVLYfWt/iZapS9/65QvRPaPAX?= =?us-ascii?Q?jYk+6/oLohYo7cd1LUcPNUdgMNdRXBb6jPKcBN+bN1h9XVvJWvSPfoYyJTWK?= =?us-ascii?Q?tciBwV1x31xxhchcoaG5TtEhLT0bC99oHYMkZL/R47sJw4vo/pjJCud/Ehsu?= =?us-ascii?Q?U+RTgXw2e3MBkierGMkgvEyT4jd1xX/vgt+rLpkCmK+zgjVkxGQxOK0i87JH?= =?us-ascii?Q?/tcBPJ9lWiEqxVHxWpAaV0H93iGOHVF0zRHK3bwg7ASNRyaaDHyID7Dk0jOb?= =?us-ascii?Q?ktV8Tb4tq/veKeoHCrXuqOSeYpFdrFpfQWtUpb6t1dofsPgj4a+Q0gGXAhE9?= =?us-ascii?Q?k/JOGMlRYZSAPHp+f0c4b/gAdiW/YaXMgCbGaGoDFwenUQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB044; 5:BOwvK0s8qPegKLpzMB54HZMI1xVZLV9qjjkxZ9rYDpUhOREoPWZUMZnoMkwU01fXBSsuPVF+ue01NQD6w4lFj2n2Vqq1QjuERmZTGzjaRMxe1FnEqtjG2XHABiORsOgqh6uPsBQXhVlPb37JLqp0YQ==; 24:6TfxwqvOvfEFtvFLdG8176RZuhp85LlZ6iBxLVkMAfwcTHsAB0n+xy/LQt390GhwZGSD5wo9YVBqmngmU3lkkkP0DB/MRFiy4xJ9KQAk1qw= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2015 20:24:48.4423 (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: BY2FFO11HUB044 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 207.46.100.79 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 v1 05/15] register: QOMify 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 From: Peter Crosthwaite QOMify registers as a child of TYPE_DEVICE. This allows registers to define GPIOs. Define an init helper that will do QOM initialisation as well as setup the r/w fast paths. Signed-off-by: Peter Crosthwaite --- hw/core/register.c | 34 ++++++++++++++++++++++++++++++++++ include/hw/register.h | 17 +++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/hw/core/register.c b/hw/core/register.c index ca10cff..000b87f 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -185,6 +185,28 @@ void register_reset(RegisterInfo *reg) register_write_val(reg, reg->access->reset); } +void register_init(RegisterInfo *reg) +{ + assert(reg); + const RegisterAccessInfo *ac; + + if (!reg->data || !reg->access) { + return; + } + + object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER); + + ac = reg->access; + + /* if there are no debug msgs and no RMW requirement, mark for fast write */ + reg->write_lite = reg->debug || ac->ro || ac->w1c || ac->pre_write || + ((ac->ge0 || ac->ge1) && qemu_loglevel_mask(LOG_GUEST_ERROR)) || + ((ac->ui0 || ac->ui1) && qemu_loglevel_mask(LOG_UNIMP)) + ? false : true; + /* no debug and no clear-on-read is a fast read */ + reg->read_lite = reg->debug || ac->cor ? false : true; +} + static inline void register_write_memory(void *opaque, hwaddr addr, uint64_t value, unsigned size, bool be) { @@ -232,3 +254,15 @@ uint64_t register_read_memory_le(void *opaque, hwaddr addr, unsigned size) { return register_read_memory(opaque, addr, size, false); } + +static const TypeInfo register_info = { + .name = TYPE_REGISTER, + .parent = TYPE_DEVICE, +}; + +static void register_register_types(void) +{ + type_register_static(®ister_info); +} + +type_init(register_register_types) diff --git a/include/hw/register.h b/include/hw/register.h index 0c6f03d..6677dee 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -11,6 +11,7 @@ #ifndef REGISTER_H #define REGISTER_H +#include "hw/qdev-core.h" #include "exec/memory.h" typedef struct RegisterInfo RegisterInfo; @@ -101,6 +102,11 @@ struct RegisterAccessInfo { */ struct RegisterInfo { + /*< private >*/ + DeviceState parent_obj; + + /*< public >*/ + void *data; int data_size; @@ -119,6 +125,9 @@ struct RegisterInfo { MemoryRegion mem; }; +#define TYPE_REGISTER "qemu,register" +#define REGISTER(obj) OBJECT_CHECK(RegisterInfo, (obj), TYPE_REGISTER) + /** * write a value to a register, subject to its restrictions * @reg: register to write to @@ -144,6 +153,14 @@ uint64_t register_read(RegisterInfo *reg); void register_reset(RegisterInfo *reg); /** + * Initialize a register. GPIO's are setup as IOs to the specified device. + * Fast paths for eligible registers are enabled. + * @reg: Register to initialize + */ + +void register_init(RegisterInfo *reg); + +/** * 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