Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2234218/?format=api
{ "id": 2234218, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2234218/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260507120524.111056-4-npiggin@gmail.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.2/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260507120524.111056-4-npiggin@gmail.com>", "list_archive_url": null, "date": "2026-05-07T12:05:21", "name": "[3/4,RFC] hw/i2c/designware_i2c: Switch to QEMU register API", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "de2c4d722fd5d07be380ed5a3529430c474ec819", "submitter": { "id": 69518, "url": "http://patchwork.ozlabs.org/api/1.2/people/69518/?format=api", "name": "Nicholas Piggin", "email": "npiggin@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260507120524.111056-4-npiggin@gmail.com/mbox/", "series": [ { "id": 503171, "url": "http://patchwork.ozlabs.org/api/1.2/series/503171/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=503171", "date": "2026-05-07T12:05:18", "name": "hw/i2c: Add designware i2c controller", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/503171/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2234218/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2234218/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=FB7Ed18Y;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4gB9wx0LR4z1yCg\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 07 May 2026 22:07:29 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wKxUW-00005G-Bx; Thu, 07 May 2026 08:06:08 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <npiggin@gmail.com>) id 1wKxUK-0008UR-Gp\n for qemu-devel@nongnu.org; Thu, 07 May 2026 08:05:56 -0400", "from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <npiggin@gmail.com>) id 1wKxUG-0002Bt-3m\n for qemu-devel@nongnu.org; Thu, 07 May 2026 08:05:56 -0400", "by mail-pj1-x102e.google.com with SMTP id\n 98e67ed59e1d1-356337f058aso438065a91.2\n for <qemu-devel@nongnu.org>; Thu, 07 May 2026 05:05:51 -0700 (PDT)", "from localhost (124.158.97.178.qld.leaptel.network.\n [124.158.97.178])\n by smtp.gmail.com with ESMTPSA id\n 98e67ed59e1d1-365b4c196ecsm5899474a91.6.2026.05.07.05.05.48\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 07 May 2026 05:05:49 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1778155550; x=1778760350; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=uPAB8UEnJQc6fSnOOnptelJUuydCzjN5zql6YY4rLdo=;\n b=FB7Ed18YEyzllJ1ZQSSL152+CNqdmUewS31jT3L0a0hm0x4r2LZ8fhz6S/H6cjFs4J\n DeHkK5viGyqp/fsVCpJ5MZmezg3GqgLA8gTM1K+1qYFDR3n5tq3aSEEAzgULAYgbEUBr\n WsIbXHIiRI6PhL7PEhKt11YNJ/62Y6VSuJ9AFYltJ2IHTmehEirHg9TSh5daJfyhRISq\n P6jL1gGWNBRj+ZmPZP/SI8gKDAsMGVmORXa4meJczpWRvGPXi3Jfj6lMD3OudCQ9pa/H\n OXRNfUuJjbh+MQDPM6KJbyTKAo+dXtOrt3P+iCrH36JAG31JLFWR/JJF5uGAKhbNtc4I\n u9Xw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1778155550; x=1778760350;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=uPAB8UEnJQc6fSnOOnptelJUuydCzjN5zql6YY4rLdo=;\n b=EWK+bNtpEFMqk1wg93vQ0g9bSvcnCsh2qmYbcsVJH7ZJNqDz9j4FGUJCoVjtB5OwDY\n m/MfdbrLix+ZQpLsOp34kfJ/TxOqNkG5j3CDbHt+VqeFN37HvGgxfzy6bZxAgkdKNTSb\n dxzJqBJWlK7hAZ7LWYVUVlvLmKV7Gy2bOG13/WLFs2HNtZVhzuZ09P1YrWEvqCLEFJAv\n g6OBWOLauJPq2Mo/Ucg0vxAcSxWT9lNZr+5CURF2r+V5d22zUiMc7Da1LsyXauBMfE6f\n 8GfURMbvWCJeMPoC7qGkDCC01fYb/AU0X6ESSp049d6HEpfN6MOPL2FuJSPjeQc3VfE9\n yB9w==", "X-Forwarded-Encrypted": "i=1;\n AFNElJ9OXml4IPlNZDcpM/o21Sa88Ixoy1OatGqIvRAw3VS8NpecXPiEHPISKzO98wCt1e82ytsBF2IPUDt4@nongnu.org", "X-Gm-Message-State": "AOJu0YyvCL7BE/iPebCvzJ9gRrB1xU5oxPWiVJ66VygzJJwNKeV+IZoG\n OgveqEX9M8AGPyb/Q9SGddcvxXEN2XdQscVSo6zsXXRPLWkuoJkma92gvX6dHw==", "X-Gm-Gg": "AeBDievYRlXwebY65TppiGvQPI1P2Dl49UHdT8OsjVrhMC9PY/tX/TyJNKOa8frJxaz\n 72sMHEPozkGcoF83HjP04at8pOsJpuoeproGPDEuaiKAh+Ug03zqw/df4wdiGcLIn8cdItTP98U\n wOD7j6bB5iINMMyelhSUepTl6jt0YU9wGkbavljOEn8P0p6GEwsmxA6/fzsrX1ytqvBb6L8CoBj\n JhowS6LgPzr+k+4qxPznMAnzc7BYNy4TVefJ2qtM75xdqpCZvopntrKc9xUwi2Vbpel7H4MgL5w\n YfNW7r3vGV3vnMdrvoud4jcYKO9a2DqNhpsh2fCb7KYCUrFGQp3mZ8CB4fdZ+1c4sRVC3/fExhV\n HwuQQFwsrxH6MUtyT2O29+NvWiAhuXhEfWLgga5uZIrUlhFFW6cursDxmvqMI4YS+8tO7ER3qrE\n 3IKsZFtTk7grvgoBsuViQ8BPezC9ZEFqFRy0xg0w6laf+PdY7yyMneKwBCzUw4cuUWpQ3u02gah\n TPFfify", "X-Received": "by 2002:a17:90a:1081:b0:366:9bd:9ef3 with SMTP id\n 98e67ed59e1d1-36609bd9f2fmr1686490a91.26.1778155550036;\n Thu, 07 May 2026 05:05:50 -0700 (PDT)", "From": "Nicholas Piggin <npiggin@gmail.com>", "To": "Corey Minyard <cminyard@mvista.com>", "Cc": "Nicholas Piggin <npiggin@gmail.com>,\n Alistair Francis <alistair.francis@wdc.com>,\n Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>,\n Chao Liu <chao.liu.zevorn@gmail.com>, Chris Rauer <crauer@google.com>,\n Michael Ellerman <mpe@kernel.org>, Joel Stanley <jms@oss.tenstorrent.com>,\n Anirudh Srinivasan <asrinivasan@oss.tenstorrent.com>,\n Portia Stephens <portias@oss.tenstorrent.com>, qemu-riscv@nongnu.org,\n qemu-devel@nongnu.org, Hao Wu <wuhaotsh@google.com>, =?utf-8?q?Philippe_Mat?=\n\t=?utf-8?q?hieu-Daud=C3=A9?= <philmd@linaro.org>", "Subject": "[PATCH 3/4] [RFC] hw/i2c/designware_i2c: Switch to QEMU register API", "Date": "Thu, 7 May 2026 22:05:21 +1000", "Message-ID": "<20260507120524.111056-4-npiggin@gmail.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260507120524.111056-1-npiggin@gmail.com>", "References": "<20260507120524.111056-1-npiggin@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2607:f8b0:4864:20::102e;\n envelope-from=npiggin@gmail.com; helo=mail-pj1-x102e.google.com", "X-Spam_score_int": "-20", "X-Spam_score": "-2.1", "X-Spam_bar": "--", "X-Spam_report": "(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "Alistair suggested moving to QEMU register API. I haven't used it before\nbut IMO it is an improvement. It is a lot of churn that is not very\nreview-able but unfortunately also changes VMState making it a pain to\ndo incrementally. If we decide to go this way, we should squash the\nconversion patch when we're happy with it.\n\nI tried not to rearrange the code too much, to reduce patch size. I\nprefer putting register implementation all together rather than grouped\nby read and write, which this API promotes. So if others like that style\nthen I will move that.\n\nI didn't change to use all the FIELD APIs to set/clear bits, since\nit worked out a bit easier to script and only a smal win since there is\nlittle/no multibit fields and shifting/masking required.\n\nRegister traces of loading the kernel drivers for the 2 devices added on\nthe Atlantis machine in the series Joel posted earlier look identical\nmodulo RTC data reads (which I guess is due to time differences).\n\nSigned-off-by: Nicholas Piggin <npiggin@gmail.com>\n---\n hw/i2c/Kconfig | 1 +\n hw/i2c/designware_i2c.c | 1022 ++++++++++++++-----------------\n include/hw/i2c/designware_i2c.h | 56 +-\n 3 files changed, 471 insertions(+), 608 deletions(-)", "diff": "diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig\nindex d3f394edeb..0766130b59 100644\n--- a/hw/i2c/Kconfig\n+++ b/hw/i2c/Kconfig\n@@ -20,6 +20,7 @@ config ARM_SBCON_I2C\n \n config DESIGNWARE_I2C\n bool\n+ select REGISTER\n select I2C\n \n config ACPI_SMBUS\ndiff --git a/hw/i2c/designware_i2c.c b/hw/i2c/designware_i2c.c\nindex 83d0968580..b7be4d68c4 100644\n--- a/hw/i2c/designware_i2c.c\n+++ b/hw/i2c/designware_i2c.c\n@@ -16,452 +16,312 @@\n #include \"qemu/units.h\"\n #include \"trace.h\"\n \n-enum DesignWareI2CRegister {\n- DW_IC_CON = 0x00,\n- DW_IC_TAR = 0x04,\n- DW_IC_SAR = 0x08,\n- DW_IC_DATA_CMD = 0x10,\n- DW_IC_SS_SCL_HCNT = 0x14,\n- DW_IC_SS_SCL_LCNT = 0x18,\n- DW_IC_FS_SCL_HCNT = 0x1c,\n- DW_IC_FS_SCL_LCNT = 0x20,\n- DW_IC_INTR_STAT = 0x2c,\n- DW_IC_INTR_MASK = 0x30,\n- DW_IC_RAW_INTR_STAT = 0x34,\n- DW_IC_RX_TL = 0x38,\n- DW_IC_TX_TL = 0x3c,\n- DW_IC_CLR_INTR = 0x40,\n- DW_IC_CLR_RX_UNDER = 0x44,\n- DW_IC_CLR_RX_OVER = 0x48,\n- DW_IC_CLR_TX_OVER = 0x4c,\n- DW_IC_CLR_RD_REQ = 0x50,\n- DW_IC_CLR_TX_ABRT = 0x54,\n- DW_IC_CLR_RX_DONE = 0x58,\n- DW_IC_CLR_ACTIVITY = 0x5c,\n- DW_IC_CLR_STOP_DET = 0x60,\n- DW_IC_CLR_START_DET = 0x64,\n- DW_IC_CLR_GEN_CALL = 0x68,\n- DW_IC_ENABLE = 0x6c,\n- DW_IC_STATUS = 0x70,\n- DW_IC_TXFLR = 0x74,\n- DW_IC_RXFLR = 0x78,\n- DW_IC_SDA_HOLD = 0x7c,\n- DW_IC_TX_ABRT_SOURCE = 0x80,\n- DW_IC_SLV_DATA_NACK_ONLY = 0x84,\n- DW_IC_DMA_CR = 0x88,\n- DW_IC_DMA_TDLR = 0x8c,\n- DW_IC_DMA_RDLR = 0x90,\n- DW_IC_SDA_SETUP = 0x94,\n- DW_IC_ACK_GENERAL_CALL = 0x98,\n- DW_IC_ENABLE_STATUS = 0x9c,\n- DW_IC_FS_SPKLEN = 0xa0,\n- DW_IC_CLR_RESTART_DET = 0xa8,\n- DW_IC_COMP_PARAM_1 = 0xf4,\n- DW_IC_COMP_VERSION = 0xf8,\n- DW_IC_COMP_TYPE = 0xfc,\n-};\n-\n-/* DW_IC_CON fields */\n-#define DW_IC_CON_STOP_DET_IF_MASTER_ACTIV BIT(10)\n-#define DW_IC_CON_RX_FIFO_FULL_HLD_CTRL BIT(9)\n-#define DW_IC_CON_TX_EMPTY_CTRL BIT(8)\n-#define DW_IC_CON_STOP_IF_ADDRESSED BIT(7)\n-#define DW_IC_CON_SLAVE_DISABLE BIT(6)\n-#define DW_IC_CON_IC_RESTART_EN BIT(5)\n-#define DW_IC_CON_10BITADDR_MASTER BIT(4)\n-#define DW_IC_CON_10BITADDR_SLAVE BIT(3)\n-#define DW_IC_CON_SPEED(rv) extract32((rv), 1, 2)\n-#define DW_IC_CON_MASTER_MODE BIT(0)\n-\n-/* DW_IC_TAR fields */\n-#define DW_IC_TAR_IC_10BITADDR_MASTER BIT(12)\n-#define DW_IC_TAR_SPECIAL BIT(11)\n-#define DW_IC_TAR_GC_OR_START BIT(10)\n-#define DW_IC_TAR_ADDRESS(rv) extract32((rv), 0, 10)\n-\n-/* DW_IC_DATA_CMD fields */\n-#define DW_IC_DATA_CMD_RESTART BIT(10)\n-#define DW_IC_DATA_CMD_STOP BIT(9)\n-#define DW_IC_DATA_CMD_CMD BIT(8)\n-#define DW_IC_DATA_CMD_DAT(rv) extract32((rv), 0, 8)\n-\n-/* DW_IC_INTR_STAT/INTR_MASK/RAW_INTR_STAT fields */\n-#define DW_IC_INTR_RESTART_DET BIT(12)\n-#define DW_IC_INTR_GEN_CALL BIT(11)\n-#define DW_IC_INTR_START_DET BIT(10)\n-#define DW_IC_INTR_STOP_DET BIT(9)\n-#define DW_IC_INTR_ACTIVITY BIT(8)\n-#define DW_IC_INTR_RX_DONE BIT(7)\n-#define DW_IC_INTR_TX_ABRT BIT(6)\n-#define DW_IC_INTR_RD_REQ BIT(5)\n-#define DW_IC_INTR_TX_EMPTY BIT(4) /* Hardware clear only. */\n-#define DW_IC_INTR_TX_OVER BIT(3)\n-#define DW_IC_INTR_RX_FULL BIT(2) /* Hardware clear only. */\n-#define DW_IC_INTR_RX_OVER BIT(1)\n-#define DW_IC_INTR_RX_UNDER BIT(0)\n-\n-/* DW_IC_ENABLE fields */\n-#define DW_IC_ENABLE_TX_CMD_BLOCK BIT(2)\n-#define DW_IC_ENABLE_ABORT BIT(1)\n-#define DW_IC_ENABLE_ENABLE BIT(0)\n-\n-/* DW_IC_STATUS fields */\n-#define DW_IC_STATUS_SLV_ACTIVITY BIT(6)\n-#define DW_IC_STATUS_MST_ACTIVITY BIT(5)\n-#define DW_IC_STATUS_RFF BIT(4)\n-#define DW_IC_STATUS_RFNE BIT(3)\n-#define DW_IC_STATUS_TFE BIT(2)\n-#define DW_IC_STATUS_TFNF BIT(1)\n-#define DW_IC_STATUS_ACTIVITY BIT(0)\n-\n-/* DW_IC_TX_ABRT_SOURCE fields */\n-#define DW_IC_TX_TX_FLUSH_CNT extract32((rv), 23, 9)\n-#define DW_IC_TX_ABRT_USER_ABRT BIT(16)\n-#define DW_IC_TX_ABRT_SLVRD_INTX BIT(15)\n-#define DW_IC_TX_ABRT_SLV_ARBLOST BIT(14)\n-#define DW_IC_TX_ABRT_SLVFLUSH_TXFIFO BIT(13)\n-#define DW_IC_TX_ARB_LOST BIT(12)\n-#define DW_IC_TX_ABRT_MASTER_DIS BIT(11)\n-#define DW_IC_TX_ABRT_10B_RD_NORSTRT BIT(10)\n-#define DW_IC_TX_ABRT_SBYTE_NORSTRT BIT(9)\n-#define DW_IC_TX_ABRT_HS_NORSTRT BIT(8)\n-#define DW_IC_TX_ABRT_SBYTE_ACKDET BIT(7)\n-#define DW_IC_TX_ABRT_HS_ACKDET BIT(6)\n-#define DW_IC_TX_ABRT_GCALL_READ BIT(5)\n-#define DW_IC_TX_ABRT_GCALL_NOACK BIT(4)\n-#define DW_IC_TX_ABRT_TXDATA_NOACK BIT(3)\n-#define DW_IC_TX_ABRT_10ADDR2_NOACK BIT(2)\n-#define DW_IC_TX_ABRT_10ADDR1_NOACK BIT(1)\n-#define DW_IC_TX_ABRT_7B_ADDR_NOACK BIT(0)\n-\n-\n-/* IC_ENABLE_STATUS fields */\n-#define DW_IC_ENABLE_STATUS_SLV_RX_DATA_LOST BIT(2)\n-#define DW_IC_ENABLE_STATUS_SLV_DISABLED_WHILE_BUSY BIT(1)\n-#define DW_IC_ENABLE_STATUS_IC_EN BIT(0)\n-\n-/* Masks for writable registers. */\n-#define DW_IC_CON_MASK 0x000003ff\n-#define DW_IC_TAR_MASK 0x00000fff\n-#define DW_IC_SAR_MASK 0x000003ff\n-#define DW_IC_SS_SCL_HCNT_MASK 0x0000ffff\n-#define DW_IC_SS_SCL_LCNT_MASK 0x0000ffff\n-#define DW_IC_FS_SCL_HCNT_MASK 0x0000ffff\n-#define DW_IC_FS_SCL_LCNT_MASK 0x0000ffff\n-#define DW_IC_INTR_MASK_MASK 0x00001fff\n-#define DW_IC_ENABLE_MASK 0x00000007\n-#define DW_IC_SDA_HOLD_MASK 0x00ffffff\n-#define DW_IC_SDA_SETUP_MASK 0x000000ff\n-#define DW_IC_FS_SPKLEN_MASK 0x000000ff\n-\n-/* Reset values */\n-#define DW_IC_CON_INIT_VAL 0x7d\n-#define DW_IC_TAR_INIT_VAL 0x1055\n-#define DW_IC_SAR_INIT_VAL 0x55\n-#define DW_IC_SS_SCL_HCNT_INIT_VAL 0x190\n-#define DW_IC_SS_SCL_LCNT_INIT_VAL 0x1d6\n-#define DW_IC_FS_SCL_HCNT_INIT_VAL 0x3c\n-#define DW_IC_FS_SCL_LCNT_INIT_VAL 0x82\n-#define DW_IC_INTR_MASK_INIT_VAL 0x8ff\n-#define DW_IC_STATUS_INIT_VAL 0x6\n-#define DW_IC_SDA_HOLD_INIT_VAL 0x1\n-#define DW_IC_SDA_SETUP_INIT_VAL 0x64\n-#define DW_IC_FS_SPKLEN_INIT_VAL 0x2\n-\n-#define DW_IC_COMP_PARAM_1_HAS_ENCODED_PARAMS BIT(7)\n-#define DW_IC_COMP_PARAM_1_HAS_DMA 0 /* bit 6 - DMA disabled. */\n-#define DW_IC_COMP_PARAM_1_INTR_IO BIT(5)\n-#define DW_IC_COMP_PARAM_1_HC_COUNT_VAL 0 /* bit 4 - disabled */\n-#define DW_IC_COMP_PARAM_1_HIGH_SPEED_MODE (BIT(2) | BIT(3))\n-#define DW_IC_COMP_PARAM_1_APB_DATA_WIDTH_32 BIT(1) /* bits 0, 1 */\n-#define DW_IC_COMP_PARAM_1_INIT_VAL \\\n- (DW_IC_COMP_PARAM_1_APB_DATA_WIDTH_32 | \\\n- DW_IC_COMP_PARAM_1_HIGH_SPEED_MODE | \\\n- DW_IC_COMP_PARAM_1_HC_COUNT_VAL | \\\n- DW_IC_COMP_PARAM_1_INTR_IO | \\\n- DW_IC_COMP_PARAM_1_HAS_DMA | \\\n- DW_IC_COMP_PARAM_1_HAS_ENCODED_PARAMS | \\\n- ((DESIGNWARE_I2C_RX_FIFO_SIZE - 1) << 8) | \\\n- ((DESIGNWARE_I2C_TX_FIFO_SIZE - 1) << 16))\n-#define DW_IC_COMP_VERSION_INIT_VAL 0x3132302a\n-#define DW_IC_COMP_TYPE_INIT_VAL 0x44570140\n+#ifndef DESIGNWARE_I2C_ERR_DEBUG\n+#define DESIGNWARE_I2C_ERR_DEBUG 0\n+#endif\n+\n+REG32(DW_IC_CON, 0x00) /* I2C control */\n+ FIELD(DW_IC_CON, STOP_DET_IF_MASTER_ACTIV, 10, 1)\n+ FIELD(DW_IC_CON, RX_FIFO_FULL_HLD_CTRL, 9, 1)\n+ FIELD(DW_IC_CON, TX_EMPTY_CTRL, 8, 1)\n+ FIELD(DW_IC_CON, STOP_IF_ADDRESSED, 7, 1)\n+ FIELD(DW_IC_CON, SLAVE_DISABLE, 6, 1)\n+ FIELD(DW_IC_CON, IC_RESTART_EN, 5, 1)\n+ FIELD(DW_IC_CON, 10BITADDR_MASTER, 4, 1)\n+ FIELD(DW_IC_CON, 10BITADDR_SLAVE, 3, 1)\n+ FIELD(DW_IC_CON, SPEED, 1, 2)\n+ FIELD(DW_IC_CON, MASTER_MODE, 0, 1)\n+REG32(DW_IC_TAR, 0x04) /* I2C target address */\n+ FIELD(DW_IC_TAR, IC_10BITADDR_MASTER, 12, 1)\n+ FIELD(DW_IC_TAR, SPECIAL, 11, 1)\n+ FIELD(DW_IC_TAR, GC_OR_START, 10, 1)\n+ FIELD(DW_IC_TAR, ADDRESS, 0, 10)\n+REG32(DW_IC_SAR, 0x08) /* I2C slave address */\n+REG32(DW_IC_DATA_CMD, 0x10)\n+ FIELD(DW_IC_DATA_CMD, RESTART, 10, 1)\n+ FIELD(DW_IC_DATA_CMD, STOP, 9, 1)\n+ FIELD(DW_IC_DATA_CMD, CMD, 8, 1)\n+ FIELD(DW_IC_DATA_CMD, DAT, 0, 8)\n+REG32(DW_IC_SS_SCL_HCNT, 0x14) /* Standard speed i2c clock scl high count */\n+REG32(DW_IC_SS_SCL_LCNT, 0x18) /* Standard speed i2c clock scl low count */\n+REG32(DW_IC_FS_SCL_HCNT, 0x1c) /* Fast or fast plus i2c clock scl high count */\n+REG32(DW_IC_FS_SCL_LCNT, 0x20) /* Fast or fast plus i2c clock scl low count */\n+REG32(DW_IC_INTR_STAT, 0x2c)\n+REG32(DW_IC_INTR_MASK, 0x30) /* I2C Interrupt Mask */\n+REG32(DW_IC_RAW_INTR_STAT, 0x34) /* I2C raw interrupt status */\n+ /* DW_IC_INTR_STAT/INTR_MASK/RAW_INTR_STAT fields */\n+ SHARED_FIELD(DW_IC_INTR_RESTART_DET, 12, 1)\n+ SHARED_FIELD(DW_IC_INTR_GEN_CALL, 11, 1)\n+ SHARED_FIELD(DW_IC_INTR_START_DET, 10, 1)\n+ SHARED_FIELD(DW_IC_INTR_STOP_DET, 9, 1)\n+ SHARED_FIELD(DW_IC_INTR_ACTIVITY, 8, 1)\n+ SHARED_FIELD(DW_IC_INTR_RX_DONE, 7, 1)\n+ SHARED_FIELD(DW_IC_INTR_TX_ABRT, 6, 1)\n+ SHARED_FIELD(DW_IC_INTR_RD_REQ, 5, 1)\n+ SHARED_FIELD(DW_IC_INTR_TX_EMPTY, 4, 1) /* Hardware clear only. */\n+ SHARED_FIELD(DW_IC_INTR_TX_OVER, 3, 1)\n+ SHARED_FIELD(DW_IC_INTR_RX_FULL, 2, 1) /* Hardware clear only. */\n+ SHARED_FIELD(DW_IC_INTR_RX_OVER, 1, 1)\n+ SHARED_FIELD(DW_IC_INTR_RX_UNDER, 0, 1)\n+\n+#define DW_IC_INTR_ANY_MASK \\\n+ (DW_IC_INTR_RESTART_DET_MASK | \\\n+ DW_IC_INTR_GEN_CALL_MASK | \\\n+ DW_IC_INTR_START_DET_MASK | \\\n+ DW_IC_INTR_STOP_DET_MASK | \\\n+ DW_IC_INTR_ACTIVITY_MASK | \\\n+ DW_IC_INTR_RX_DONE_MASK | \\\n+ DW_IC_INTR_TX_ABRT_MASK | \\\n+ DW_IC_INTR_RD_REQ_MASK | \\\n+ DW_IC_INTR_TX_EMPTY_MASK | \\\n+ DW_IC_INTR_TX_OVER_MASK | \\\n+ DW_IC_INTR_RX_FULL_MASK | \\\n+ DW_IC_INTR_RX_OVER_MASK | \\\n+ DW_IC_INTR_RX_UNDER_MASK)\n+\n+#define DW_IC_INTR_ANY_SW_CLEAR_MASK \\\n+ (DW_IC_INTR_ANY_MASK & \\\n+ ~(DW_IC_INTR_TX_EMPTY_MASK | \\\n+ DW_IC_INTR_RX_FULL_MASK))\n+\n+REG32(DW_IC_RX_TL, 0x38) /* I2C receive FIFO threshold */\n+REG32(DW_IC_TX_TL, 0x3c) /* I2C transmit FIFO threshold */\n+REG32(DW_IC_CLR_INTR, 0x40)\n+REG32(DW_IC_CLR_RX_UNDER, 0x44)\n+REG32(DW_IC_CLR_RX_OVER, 0x48)\n+REG32(DW_IC_CLR_TX_OVER, 0x4c)\n+REG32(DW_IC_CLR_RD_REQ, 0x50)\n+REG32(DW_IC_CLR_TX_ABRT, 0x54)\n+REG32(DW_IC_CLR_RX_DONE, 0x58)\n+REG32(DW_IC_CLR_ACTIVITY, 0x5c)\n+REG32(DW_IC_CLR_STOP_DET, 0x60)\n+REG32(DW_IC_CLR_START_DET, 0x64)\n+REG32(DW_IC_CLR_GEN_CALL, 0x68)\n+REG32(DW_IC_ENABLE, 0x6c) /* I2C enable */\n+ FIELD(DW_IC_ENABLE, TX_CMD_BLOCK, 2, 1)\n+ FIELD(DW_IC_ENABLE, ABORT, 1, 1)\n+ FIELD(DW_IC_ENABLE, ENABLE, 0, 1)\n+REG32(DW_IC_STATUS, 0x70) /* I2C status */\n+ FIELD(DW_IC_STATUS, SLV_ACTIVITY, 6, 1)\n+ FIELD(DW_IC_STATUS, MST_ACTIVITY, 5, 1)\n+ FIELD(DW_IC_STATUS, RFF, 4, 1)\n+ FIELD(DW_IC_STATUS, RFNE, 3, 1)\n+ FIELD(DW_IC_STATUS, TFE, 2, 1)\n+ FIELD(DW_IC_STATUS, TFNF, 1, 1)\n+ FIELD(DW_IC_STATUS, ACTIVITY, 0, 1)\n+REG32(DW_IC_TXFLR, 0x74) /* I2C transmit fifo level */\n+REG32(DW_IC_RXFLR, 0x78) /* I2C receive fifo level */\n+REG32(DW_IC_SDA_HOLD, 0x7c) /* I2C SDA hold time length */\n+REG32(DW_IC_TX_ABRT_SOURCE, 0x80) /* The I2C transmit abort source */\n+ FIELD(DW_IC_TX_ABRT_SOURCE, USER_ABRT, 16, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, SLVRD_INTX, 15, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, SLV_ARBLOST, 14, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, SLVFLUSH_TXFIFO, 13, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, ARB_LOST, 12, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, MASTER_DIS, 11, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, 10B_RD_NORSTRT, 10, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, SBYTE_NORSTRT, 9, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, HS_NORSTRT, 8, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, SBYTE_ACKDET, 7, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, HS_ACKDET, 6, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, GCALL_READ, 5, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, GCALL_NOACK, 4, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, TXDATA_NOACK, 3, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, 10ADDR2_NOACK, 2, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, 10ADDR1_NOACK, 1, 1)\n+ FIELD(DW_IC_TX_ABRT_SOURCE, 7B_ADDR_NOACK, 0, 1)\n+REG32(DW_IC_SLV_DATA_NACK_ONLY, 0x84)\n+REG32(DW_IC_DMA_CR, 0x88)\n+REG32(DW_IC_DMA_TDLR, 0x8c)\n+REG32(DW_IC_DMA_RDLR, 0x90)\n+REG32(DW_IC_SDA_SETUP, 0x94) /* I2C SDA setup */\n+REG32(DW_IC_ACK_GENERAL_CALL, 0x98)\n+REG32(DW_IC_ENABLE_STATUS, 0x9c) /* I2C enable status */\n+ FIELD(DW_IC_ENABLE_STATUS, SLV_RX_DATA_LOST, 2, 1)\n+ FIELD(DW_IC_ENABLE_STATUS, SLV_DISABLED_WHILE_BUSY, 1, 1)\n+ FIELD(DW_IC_ENABLE_STATUS, IC_EN, 0, 1)\n+REG32(DW_IC_FS_SPKLEN, 0xa0) /* I2C SS, FS or FM+ spike suppression limit */\n+REG32(DW_IC_CLR_RESTART_DET, 0xa8)\n+REG32(DW_IC_COMP_PARAM_1, 0xf4) /* Component parameter */\n+ FIELD(DW_IC_COMP_PARAM_1, TX_FIFO_SIZE, 16, 8)\n+ FIELD(DW_IC_COMP_PARAM_1, RX_FIFO_SIZE, 8, 8)\n+ FIELD(DW_IC_COMP_PARAM_1, HAS_ENCODED_PARAMS, 7, 1)\n+ FIELD(DW_IC_COMP_PARAM_1, HAS_DMA, 6, 1)\n+ FIELD(DW_IC_COMP_PARAM_1, INTR_IO, 5, 1)\n+ FIELD(DW_IC_COMP_PARAM_1, HC_COUNT_VAL, 4, 1)\n+ FIELD(DW_IC_COMP_PARAM_1, HIGH_SPEED_MODE, 2, 2)\n+ FIELD(DW_IC_COMP_PARAM_1, APB_DATA_WIDTH_32, 0, 2)\n+REG32(DW_IC_COMP_VERSION, 0xf8) /* I2C component version */\n+REG32(DW_IC_COMP_TYPE, 0xfc) /* I2C component type */\n \n static void dw_i2c_update_irq(DesignWareI2CState *s)\n {\n- int level;\n- uint32_t intr = s->ic_raw_intr_stat & s->ic_intr_mask;\n-\n- level = !!((intr & DW_IC_INTR_RX_UNDER) |\n- (intr & DW_IC_INTR_RX_OVER) |\n- (intr & DW_IC_INTR_RX_FULL) |\n- (intr & DW_IC_INTR_TX_OVER) |\n- (intr & DW_IC_INTR_TX_EMPTY) |\n- (intr & DW_IC_INTR_RD_REQ) |\n- (intr & DW_IC_INTR_TX_ABRT) |\n- (intr & DW_IC_INTR_RX_DONE) |\n- (intr & DW_IC_INTR_ACTIVITY) |\n- (intr & DW_IC_INTR_STOP_DET) |\n- (intr & DW_IC_INTR_START_DET) |\n- (intr & DW_IC_INTR_GEN_CALL) |\n- (intr & DW_IC_INTR_RESTART_DET)\n- );\n- qemu_set_irq(s->irq, level);\n+ uint32_t intr = s->regs[R_DW_IC_RAW_INTR_STAT] & s->regs[R_DW_IC_INTR_MASK];\n+\n+ qemu_set_irq(s->irq, !!(intr & DW_IC_INTR_ANY_MASK));\n }\n \n-static uint8_t dw_i2c_read_ic_data_cmd(DesignWareI2CState *s)\n+static uint64_t dw_ic_data_cmd_reg_post_read(RegisterInfo *reg, uint64_t value)\n {\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n+ g_assert(value == 0);\n+\n if (s->status != DW_I2C_STATUS_RECEIVING) {\n qemu_log_mask(LOG_GUEST_ERROR,\n \"%s: Attempted to read from RX fifo when not in receive \"\n \"state.\\n\", DEVICE(s)->canonical_path);\n if (s->status != DW_I2C_STATUS_IDLE) {\n- s->ic_raw_intr_stat |= DW_IC_INTR_RX_UNDER;\n+ SHARED_ARRAY_FIELD_DP32(s->regs, R_DW_IC_RAW_INTR_STAT,\n+ DW_IC_INTR_RX_UNDER, 1);\n dw_i2c_update_irq(s);\n }\n return 0;\n }\n \n- g_assert(s->ic_rxflr == fifo8_num_used(&s->rx_fifo));\n+ g_assert(s->regs[R_DW_IC_RXFLR] == fifo8_num_used(&s->rx_fifo));\n \n if (fifo8_is_empty(&s->rx_fifo)) {\n- s->ic_raw_intr_stat |= DW_IC_INTR_RX_UNDER;\n+ SHARED_ARRAY_FIELD_DP32(s->regs, R_DW_IC_RAW_INTR_STAT, DW_IC_INTR_RX_UNDER, 1);\n dw_i2c_update_irq(s);\n return 0;\n }\n \n- s->ic_rxflr--;\n- if (s->ic_rxflr <= s->ic_rx_tl) {\n- s->ic_raw_intr_stat &= ~DW_IC_INTR_RX_FULL;\n+ s->regs[R_DW_IC_RXFLR]--;\n+ if (s->regs[R_DW_IC_RXFLR] <= s->regs[R_DW_IC_RX_TL]) {\n+ SHARED_ARRAY_FIELD_DP32(s->regs, R_DW_IC_RAW_INTR_STAT, DW_IC_INTR_RX_FULL, 0);\n dw_i2c_update_irq(s);\n }\n \n return fifo8_pop(&s->rx_fifo);\n }\n \n-static uint64_t dw_i2c_read(void *opaque, hwaddr offset, unsigned size)\n+static uint64_t dw_ic_clr_intr_reg_post_read(RegisterInfo *reg, uint64_t value)\n {\n- uint64_t value = 0;\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n \n- DesignWareI2CState *s = opaque;\n+ g_assert(value == 0);\n \n- switch (offset) {\n- case DW_IC_CON:\n- value = s->ic_con;\n+ switch (reg->access->addr) {\n+ case A_DW_IC_CLR_INTR:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_ANY_SW_CLEAR_MASK;\n break;\n- case DW_IC_TAR:\n- value = s->ic_tar;\n+ case A_DW_IC_CLR_RX_UNDER:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_RX_UNDER_MASK;\n break;\n- case DW_IC_SAR:\n- qemu_log_mask(LOG_UNIMP, \"%s: unsupported read - ic_sar\\n\",\n- DEVICE(s)->canonical_path);\n- value = s->ic_sar;\n- break;\n- case DW_IC_DATA_CMD:\n- value = dw_i2c_read_ic_data_cmd(s);\n- break;\n- case DW_IC_SS_SCL_HCNT:\n- value = s->ic_ss_scl_hcnt;\n+ case A_DW_IC_CLR_RX_OVER:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_RX_OVER_MASK;\n break;\n- case DW_IC_SS_SCL_LCNT:\n- value = s->ic_ss_scl_lcnt;\n+ case A_DW_IC_CLR_TX_OVER:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_TX_OVER_MASK;\n break;\n- case DW_IC_FS_SCL_HCNT:\n- value = s->ic_fs_scl_hcnt;\n+ case A_DW_IC_CLR_RD_REQ:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_RD_REQ_MASK;\n break;\n- case DW_IC_FS_SCL_LCNT:\n- value = s->ic_fs_scl_lcnt;\n+ case A_DW_IC_CLR_TX_ABRT:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_TX_ABRT_MASK;\n break;\n- case DW_IC_INTR_STAT:\n- value = s->ic_raw_intr_stat & s->ic_intr_mask;\n+ case A_DW_IC_CLR_RX_DONE:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_RX_DONE_MASK;\n break;\n- case DW_IC_INTR_MASK:\n- value = s->ic_intr_mask;\n+ case A_DW_IC_CLR_ACTIVITY:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_ACTIVITY_MASK;\n break;\n- case DW_IC_RAW_INTR_STAT:\n- value = s->ic_raw_intr_stat;\n+ case A_DW_IC_CLR_STOP_DET:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_STOP_DET_MASK;\n break;\n- case DW_IC_RX_TL:\n- value = s->ic_rx_tl;\n+ case A_DW_IC_CLR_START_DET:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_START_DET_MASK;\n break;\n- case DW_IC_TX_TL:\n- value = s->ic_tx_tl;\n- break;\n- case DW_IC_CLR_INTR:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_GEN_CALL |\n- DW_IC_INTR_RESTART_DET |\n- DW_IC_INTR_START_DET |\n- DW_IC_INTR_STOP_DET |\n- DW_IC_INTR_ACTIVITY |\n- DW_IC_INTR_RX_DONE |\n- DW_IC_INTR_TX_ABRT |\n- DW_IC_INTR_RD_REQ |\n- DW_IC_INTR_TX_OVER |\n- DW_IC_INTR_RX_OVER |\n- DW_IC_INTR_RX_UNDER);\n- s->ic_tx_abrt_source = 0;\n- dw_i2c_update_irq(s);\n+ case A_DW_IC_CLR_GEN_CALL:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_GEN_CALL_MASK;\n break;\n- case DW_IC_CLR_RX_UNDER:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_RX_UNDER);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_CLR_RX_OVER:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_RX_OVER);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_CLR_TX_OVER:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_TX_OVER);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_CLR_RD_REQ:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_RD_REQ);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_CLR_TX_ABRT:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_TX_ABRT);\n- s->ic_tx_abrt_source = 0;\n- dw_i2c_update_irq(s);\n+ case A_DW_IC_CLR_RESTART_DET:\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_RESTART_DET_MASK;\n break;\n- case DW_IC_CLR_RX_DONE:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_RX_DONE);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_CLR_ACTIVITY:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_ACTIVITY);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_CLR_STOP_DET:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_STOP_DET);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_CLR_START_DET:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_START_DET);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_CLR_GEN_CALL:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_GEN_CALL);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_ENABLE:\n- value = s->ic_enable;\n- break;\n- case DW_IC_STATUS:\n- value = s->ic_status;\n- break;\n- case DW_IC_TXFLR:\n- value = s->ic_txflr;\n- break;\n- case DW_IC_RXFLR:\n- value = s->ic_rxflr;\n- break;\n- case DW_IC_SDA_HOLD:\n- value = s->ic_sda_hold;\n- break;\n- case DW_IC_TX_ABRT_SOURCE:\n- value = s->ic_tx_abrt_source;\n- break;\n- case DW_IC_SLV_DATA_NACK_ONLY:\n- qemu_log_mask(LOG_UNIMP,\n- \"%s: unsupported read - ic_slv_data_nack_only\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_DMA_CR:\n- qemu_log_mask(LOG_UNIMP, \"%s: unsupported read - ic_dma_cr\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_DMA_TDLR:\n- qemu_log_mask(LOG_UNIMP, \"%s: unsupported read - ic_dma_tdlr\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_DMA_RDLR:\n- qemu_log_mask(LOG_UNIMP, \"%s: unsupported read - ic_dma_rdlr\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_SDA_SETUP:\n- value = s->ic_sda_setup;\n- break;\n- case DW_IC_ACK_GENERAL_CALL:\n- qemu_log_mask(LOG_UNIMP, \"%s: unsupported read - ic_ack_general_call\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_ENABLE_STATUS:\n- value = s->ic_enable_status;\n- break;\n- case DW_IC_FS_SPKLEN:\n- value = s->ic_fs_spklen;\n- break;\n- case DW_IC_CLR_RESTART_DET:\n- s->ic_raw_intr_stat &= ~(DW_IC_INTR_RESTART_DET);\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_COMP_PARAM_1:\n- value = s->ic_comp_param_1;\n- break;\n- case DW_IC_COMP_VERSION:\n- value = s->ic_comp_version;\n- break;\n- case DW_IC_COMP_TYPE:\n- value = s->ic_comp_type;\n- break;\n-\n- /* This register is invalid at this point. */\n default:\n- qemu_log_mask(LOG_GUEST_ERROR,\n- \"%s: read from invalid offset 0x%\" HWADDR_PRIx \"\\n\",\n- DEVICE(s)->canonical_path, offset);\n- break;\n+ g_assert_not_reached();\n }\n \n- trace_dw_i2c_read(DEVICE(s)->canonical_path, offset, value);\n+ dw_i2c_update_irq(s);\n \n- return value;\n+ return 0;\n }\n \n-static void dw_i2c_write_ic_con(DesignWareI2CState *s, uint32_t value)\n+static uint64_t dw_ic_intr_stat_reg_post_read(RegisterInfo *reg, uint64_t value)\n {\n- if (value & DW_IC_CON_RX_FIFO_FULL_HLD_CTRL) {\n- qemu_log_mask(LOG_UNIMP,\n- \"%s: unsupported ic_con flag - RX_FIFO_FULL_HLD_CTRL\\n\",\n- DEVICE(s)->canonical_path);\n- }\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n \n- if (!(s->ic_enable & DW_IC_ENABLE_ENABLE)) {\n- s->ic_con = value & DW_IC_CON_MASK;\n- } else {\n+ g_assert(value == 0);\n+\n+ return s->regs[R_DW_IC_RAW_INTR_STAT] & s->regs[R_DW_IC_INTR_MASK];\n+}\n+\n+static uint64_t dw_ic_unsupported_reg_post_read(RegisterInfo *reg, uint64_t value)\n+{\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n+ qemu_log_mask(LOG_UNIMP, \"%s: unsupported read - %s\\n\",\n+ DEVICE(s)->canonical_path, reg->access->name);\n+\n+ return 0;\n+}\n+\n+static uint64_t dw_ic_unsupported_reg_pre_write(RegisterInfo *reg, uint64_t value)\n+{\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n+ qemu_log_mask(LOG_UNIMP, \"%s: unsupported write - %s\\n\",\n+ DEVICE(s)->canonical_path, reg->access->name);\n+\n+ return 0;\n+}\n+\n+static uint64_t dw_ic_con_reg_pre_write(RegisterInfo *reg, uint64_t value)\n+{\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n+ if (s->regs[R_DW_IC_ENABLE] & R_DW_IC_ENABLE_ENABLE_MASK) {\n qemu_log_mask(LOG_GUEST_ERROR,\n \"%s: invalid setting to ic_con %d when ic_enable[0]==1\\n\",\n- DEVICE(s)->canonical_path, value);\n+ DEVICE(s)->canonical_path, (int)value);\n+ return s->regs[R_DW_IC_CON]; /* keep old value */\n }\n+\n+ return value;\n }\n \n static void dw_i2c_reset_to_idle(DesignWareI2CState *s)\n {\n- s->ic_enable_status &= ~DW_IC_ENABLE_STATUS_IC_EN;\n- s->ic_raw_intr_stat &= ~DW_IC_INTR_TX_EMPTY;\n- s->ic_raw_intr_stat &= ~DW_IC_INTR_RX_FULL;\n- s->ic_raw_intr_stat &= ~DW_IC_INTR_RX_UNDER;\n- s->ic_raw_intr_stat &= ~DW_IC_INTR_RX_OVER;\n- s->ic_rxflr = 0;\n+ s->regs[R_DW_IC_ENABLE_STATUS] &= ~R_DW_IC_ENABLE_STATUS_IC_EN_MASK;\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_TX_EMPTY_MASK;\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_RX_FULL_MASK;\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_RX_UNDER_MASK;\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_RX_OVER_MASK;\n+ s->regs[R_DW_IC_RXFLR] = 0;\n fifo8_reset(&s->rx_fifo);\n- s->ic_status &= ~DW_IC_STATUS_ACTIVITY;\n+ s->regs[R_DW_IC_STATUS] &= ~R_DW_IC_STATUS_ACTIVITY_MASK;\n s->status = DW_I2C_STATUS_IDLE;\n dw_i2c_update_irq(s);\n }\n \n static void dw_ic_tx_abort(DesignWareI2CState *s, uint32_t src)\n {\n- s->ic_tx_abrt_source |= src;\n- s->ic_raw_intr_stat |= DW_IC_INTR_TX_ABRT;\n+ s->regs[R_DW_IC_TX_ABRT_SOURCE] |= src;\n+ s->regs[R_DW_IC_RAW_INTR_STAT] |= DW_IC_INTR_TX_ABRT_MASK;\n dw_i2c_reset_to_idle(s);\n dw_i2c_update_irq(s);\n }\n \n-static void dw_i2c_write_ic_data_cmd(DesignWareI2CState *s, uint32_t value)\n+static void dw_ic_data_cmd_reg_post_write(RegisterInfo *reg, uint64_t value)\n {\n- int recv = !!(value & DW_IC_DATA_CMD_CMD);\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+ int recv = !!(value & R_DW_IC_DATA_CMD_CMD_MASK);\n+\n+ s->regs[R_DW_IC_DATA_CMD] = 0; /* Register has no storage */\n \n if (s->status == DW_I2C_STATUS_IDLE ||\n- s->ic_raw_intr_stat & DW_IC_INTR_TX_ABRT) {\n+ s->regs[R_DW_IC_RAW_INTR_STAT] & DW_IC_INTR_TX_ABRT_MASK) {\n qemu_log_mask(LOG_GUEST_ERROR,\n \"%s: Attempted to write to TX fifo when it is held in \"\n \"reset.\\n\", DEVICE(s)->canonical_path);\n@@ -470,9 +330,10 @@ static void dw_i2c_write_ic_data_cmd(DesignWareI2CState *s, uint32_t value)\n \n /* Send the address if it hasn't been sent yet. */\n if (s->status == DW_I2C_STATUS_SENDING_ADDRESS) {\n- int rv = i2c_start_transfer(s->bus, DW_IC_TAR_ADDRESS(s->ic_tar), recv);\n+ int rv = i2c_start_transfer(s->bus,\n+ ARRAY_FIELD_EX32(s->regs, DW_IC_TAR, ADDRESS), recv);\n if (rv) {\n- dw_ic_tx_abort(s, DW_IC_TX_ABRT_7B_ADDR_NOACK);\n+ dw_ic_tx_abort(s, R_DW_IC_TX_ABRT_SOURCE_7B_ADDR_NOACK_MASK);\n return;\n }\n s->status = recv ? DW_I2C_STATUS_RECEIVING : DW_I2C_STATUS_SENDING;\n@@ -480,25 +341,27 @@ static void dw_i2c_write_ic_data_cmd(DesignWareI2CState *s, uint32_t value)\n \n /* Send data */\n if (!recv) {\n- int rv = i2c_send(s->bus, DW_IC_DATA_CMD_DAT(value));\n+ int rv = i2c_send(s->bus, FIELD_EX32(value, DW_IC_DATA_CMD, DAT));\n if (rv) {\n i2c_end_transfer(s->bus);\n- dw_ic_tx_abort(s, DW_IC_TX_ABRT_TXDATA_NOACK);\n+ dw_ic_tx_abort(s, R_DW_IC_TX_ABRT_SOURCE_TXDATA_NOACK_MASK);\n return;\n }\n dw_i2c_update_irq(s);\n }\n \n /* Restart command */\n- if (value & DW_IC_DATA_CMD_RESTART && s->ic_con & DW_IC_CON_IC_RESTART_EN) {\n- s->ic_raw_intr_stat |= DW_IC_INTR_RESTART_DET |\n- DW_IC_INTR_START_DET |\n- DW_IC_INTR_ACTIVITY;\n- s->ic_status |= DW_IC_STATUS_ACTIVITY;\n+ if (value & R_DW_IC_DATA_CMD_RESTART_MASK &&\n+ s->regs[R_DW_IC_CON] & R_DW_IC_CON_IC_RESTART_EN_MASK) {\n+ s->regs[R_DW_IC_RAW_INTR_STAT] |= DW_IC_INTR_RESTART_DET_MASK |\n+ DW_IC_INTR_START_DET_MASK |\n+ DW_IC_INTR_ACTIVITY_MASK;\n+ s->regs[R_DW_IC_STATUS] |= R_DW_IC_STATUS_ACTIVITY_MASK;\n dw_i2c_update_irq(s);\n \n- if (i2c_start_transfer(s->bus, DW_IC_TAR_ADDRESS(s->ic_tar), recv)) {\n- dw_ic_tx_abort(s, DW_IC_TX_ABRT_7B_ADDR_NOACK);\n+ if (i2c_start_transfer(s->bus,\n+ ARRAY_FIELD_EX32(s->regs, DW_IC_TAR, ADDRESS), recv)) {\n+ dw_ic_tx_abort(s, R_DW_IC_TX_ABRT_SOURCE_7B_ADDR_NOACK_MASK);\n return;\n }\n \n@@ -507,87 +370,113 @@ static void dw_i2c_write_ic_data_cmd(DesignWareI2CState *s, uint32_t value)\n \n /* Receive data */\n if (recv) {\n- g_assert(s->ic_rxflr == fifo8_num_used(&s->rx_fifo));\n+ g_assert(s->regs[R_DW_IC_RXFLR] == fifo8_num_used(&s->rx_fifo));\n \n if (!fifo8_is_full(&s->rx_fifo)) {\n fifo8_push(&s->rx_fifo, i2c_recv(s->bus));\n- s->ic_rxflr++;\n+ s->regs[R_DW_IC_RXFLR]++;\n } else {\n- s->ic_raw_intr_stat |= DW_IC_INTR_RX_OVER;\n+ s->regs[R_DW_IC_RAW_INTR_STAT] |= DW_IC_INTR_RX_OVER_MASK;\n dw_i2c_update_irq(s);\n }\n \n- if (s->ic_rxflr > s->ic_rx_tl) {\n- s->ic_raw_intr_stat |= DW_IC_INTR_RX_FULL;\n+ if (s->regs[R_DW_IC_RXFLR] > s->regs[R_DW_IC_RX_TL]) {\n+ s->regs[R_DW_IC_RAW_INTR_STAT] |= DW_IC_INTR_RX_FULL_MASK;\n dw_i2c_update_irq(s);\n }\n- if (value & DW_IC_DATA_CMD_STOP) {\n+ if (value & R_DW_IC_DATA_CMD_STOP_MASK) {\n i2c_nack(s->bus);\n }\n }\n \n /* Stop command */\n- if (value & DW_IC_DATA_CMD_STOP) {\n- s->ic_raw_intr_stat |= DW_IC_INTR_STOP_DET;\n- s->ic_status &= ~DW_IC_STATUS_ACTIVITY;\n- s->ic_raw_intr_stat &= ~DW_IC_INTR_TX_EMPTY;\n+ if (value & R_DW_IC_DATA_CMD_STOP_MASK) {\n+ s->regs[R_DW_IC_RAW_INTR_STAT] |= DW_IC_INTR_STOP_DET_MASK;\n+ s->regs[R_DW_IC_STATUS] &= ~R_DW_IC_STATUS_ACTIVITY_MASK;\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_TX_EMPTY_MASK;\n i2c_end_transfer(s->bus);\n dw_i2c_update_irq(s);\n }\n }\n \n-static void dw_i2c_write_ic_enable(DesignWareI2CState *s, uint32_t value)\n+static void dw_ic_intr_mask_reg_post_write(RegisterInfo *reg, uint64_t value)\n+{\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n+ dw_i2c_update_irq(s);\n+}\n+\n+static uint64_t dw_ic_enable_reg_pre_write(RegisterInfo *reg, uint64_t value)\n {\n- if (value & DW_IC_ENABLE_ENABLE && !(s->ic_con & DW_IC_CON_SLAVE_DISABLE)) {\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n+ if (value & R_DW_IC_ENABLE_ENABLE_MASK &&\n+ !(s->regs[R_DW_IC_CON] & R_DW_IC_CON_SLAVE_DISABLE_MASK)) {\n qemu_log_mask(LOG_UNIMP,\n \"%s: Designware I2C slave mode is not supported.\\n\",\n DEVICE(s)->canonical_path);\n- return;\n+ return s->regs[R_DW_IC_ENABLE]; /* keep old value */\n }\n \n- s->ic_enable = value & DW_IC_ENABLE_MASK;\n+ return value;\n+}\n+\n+static void dw_ic_enable_reg_post_write(RegisterInfo *reg, uint64_t value)\n+{\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n+ s->regs[R_DW_IC_ENABLE] = value & R_DW_IC_ENABLE_ENABLE_MASK;\n \n- if (value & DW_IC_ENABLE_ABORT || value & DW_IC_ENABLE_TX_CMD_BLOCK) {\n- dw_ic_tx_abort(s, DW_IC_TX_ABRT_USER_ABRT);\n+ if (value & R_DW_IC_ENABLE_ABORT_MASK || value & R_DW_IC_ENABLE_TX_CMD_BLOCK_MASK) {\n+ dw_ic_tx_abort(s, R_DW_IC_TX_ABRT_SOURCE_USER_ABRT_MASK);\n return;\n }\n \n- if (value & DW_IC_ENABLE_ENABLE) {\n- s->ic_enable_status |= DW_IC_ENABLE_STATUS_IC_EN;\n- s->ic_status |= DW_IC_STATUS_ACTIVITY;\n- s->ic_raw_intr_stat |= DW_IC_INTR_ACTIVITY |\n- DW_IC_INTR_START_DET |\n- DW_IC_INTR_TX_EMPTY;\n+ if (value & R_DW_IC_ENABLE_ENABLE_MASK) {\n+ s->regs[R_DW_IC_ENABLE_STATUS] |= R_DW_IC_ENABLE_STATUS_IC_EN_MASK;\n+ s->regs[R_DW_IC_STATUS] |= R_DW_IC_STATUS_ACTIVITY_MASK;\n+ s->regs[R_DW_IC_RAW_INTR_STAT] |= DW_IC_INTR_ACTIVITY_MASK |\n+ DW_IC_INTR_START_DET_MASK |\n+ DW_IC_INTR_TX_EMPTY_MASK;\n s->status = DW_I2C_STATUS_SENDING_ADDRESS;\n dw_i2c_update_irq(s);\n- } else if ((value & DW_IC_ENABLE_ENABLE) == 0) {\n+ } else if ((value & R_DW_IC_ENABLE_ENABLE_MASK) == 0) {\n dw_i2c_reset_to_idle(s);\n }\n-\n }\n \n-static void dw_i2c_write_ic_rx_tl(DesignWareI2CState *s, uint32_t value)\n+static uint64_t dw_ic_rx_tl_reg_pre_write(RegisterInfo *reg, uint64_t value)\n {\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n /* Note that a value of 0 for ic_rx_tl indicates a threashold of 1. */\n if (value > DESIGNWARE_I2C_RX_FIFO_SIZE - 1) {\n qemu_log_mask(LOG_GUEST_ERROR,\n \"%s: invalid setting to ic_rx_tl %d\\n\",\n- DEVICE(s)->canonical_path, value);\n- s->ic_rx_tl = DESIGNWARE_I2C_RX_FIFO_SIZE - 1;\n- } else {\n- s->ic_rx_tl = value;\n+ DEVICE(s)->canonical_path, (int)value);\n+ return DESIGNWARE_I2C_RX_FIFO_SIZE - 1;\n }\n \n- if (s->ic_rxflr > s->ic_rx_tl && s->ic_enable & DW_IC_ENABLE_ENABLE) {\n- s->ic_raw_intr_stat |= DW_IC_INTR_RX_FULL;\n+ return value;\n+}\n+\n+static void dw_ic_rx_tl_reg_post_write(RegisterInfo *reg, uint64_t value)\n+{\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n+ if (s->regs[R_DW_IC_RXFLR] > s->regs[R_DW_IC_RX_TL] &&\n+ s->regs[R_DW_IC_ENABLE] & R_DW_IC_ENABLE_ENABLE_MASK) {\n+ s->regs[R_DW_IC_RAW_INTR_STAT] |= DW_IC_INTR_RX_FULL_MASK;\n } else {\n- s->ic_raw_intr_stat &= ~DW_IC_INTR_RX_FULL;\n+ s->regs[R_DW_IC_RAW_INTR_STAT] &= ~DW_IC_INTR_RX_FULL_MASK;\n }\n dw_i2c_update_irq(s);\n }\n \n-static void dw_i2c_write_ic_tx_tl(DesignWareI2CState *s, uint32_t value)\n+static uint64_t dw_ic_tx_tl_reg_pre_write(RegisterInfo *reg, uint64_t value)\n {\n+ DesignWareI2CState *s = DESIGNWARE_I2C(reg->opaque);\n+\n /*\n * Note that a value of 0 for ic_tx_tl indicates a threashold of 1.\n * However, the tx threshold is not used in the model because commands are\n@@ -596,106 +485,154 @@ static void dw_i2c_write_ic_tx_tl(DesignWareI2CState *s, uint32_t value)\n if (value > DESIGNWARE_I2C_TX_FIFO_SIZE - 1) {\n qemu_log_mask(LOG_GUEST_ERROR,\n \"%s: invalid setting to ic_tx_tl %d\\n\",\n- DEVICE(s)->canonical_path, value);\n- s->ic_tx_tl = DESIGNWARE_I2C_TX_FIFO_SIZE - 1;\n- } else {\n- s->ic_tx_tl = value;\n+ DEVICE(s)->canonical_path, (int)value);\n+ return DESIGNWARE_I2C_TX_FIFO_SIZE - 1;\n }\n-}\n \n-static void dw_i2c_write(void *opaque, hwaddr offset, uint64_t value,\n- unsigned size)\n-{\n- DesignWareI2CState *s = opaque;\n-\n- trace_dw_i2c_write(DEVICE(s)->canonical_path, offset, value);\n-\n- /* The order of the registers are their order in memory. */\n- switch (offset) {\n- case DW_IC_CON:\n- dw_i2c_write_ic_con(s, value);\n- break;\n- case DW_IC_TAR:\n- s->ic_tar = value & DW_IC_TAR_MASK;\n- break;\n- case DW_IC_SAR:\n- qemu_log_mask(LOG_UNIMP, \"%s: unsupported write - ic_sar\\n\",\n- DEVICE(s)->canonical_path);\n- s->ic_sar = value & DW_IC_SAR_MASK;\n- break;\n- case DW_IC_DATA_CMD:\n- dw_i2c_write_ic_data_cmd(s, value);\n- break;\n- case DW_IC_SS_SCL_HCNT:\n- s->ic_ss_scl_hcnt = value & DW_IC_SS_SCL_HCNT_MASK;\n- break;\n- case DW_IC_SS_SCL_LCNT:\n- s->ic_ss_scl_lcnt = value & DW_IC_SS_SCL_LCNT_MASK;\n- break;\n- case DW_IC_FS_SCL_HCNT:\n- s->ic_fs_scl_hcnt = value & DW_IC_FS_SCL_HCNT_MASK;\n- break;\n- case DW_IC_FS_SCL_LCNT:\n- s->ic_fs_scl_lcnt = value & DW_IC_FS_SCL_LCNT_MASK;\n- break;\n- case DW_IC_INTR_MASK:\n- s->ic_intr_mask = value & DW_IC_INTR_MASK_MASK;\n- dw_i2c_update_irq(s);\n- break;\n- case DW_IC_RX_TL:\n- dw_i2c_write_ic_rx_tl(s, value);\n- break;\n- case DW_IC_TX_TL:\n- dw_i2c_write_ic_tx_tl(s, value);\n- break;\n- case DW_IC_ENABLE:\n- dw_i2c_write_ic_enable(s, value);\n- break;\n- case DW_IC_SDA_HOLD:\n- s->ic_sda_hold = value & DW_IC_SDA_HOLD_MASK;\n- break;\n- case DW_IC_SLV_DATA_NACK_ONLY:\n- qemu_log_mask(LOG_UNIMP,\n- \"%s: unsupported write - ic_slv_data_nack_only\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_DMA_CR:\n- qemu_log_mask(LOG_UNIMP, \"%s: unsupported write - ic_dma_cr\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_DMA_TDLR:\n- qemu_log_mask(LOG_UNIMP, \"%s: unsupported write - ic_dma_tdlr\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_DMA_RDLR:\n- qemu_log_mask(LOG_UNIMP, \"%s: unsupported write - ic_dma_rdlr\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_SDA_SETUP:\n- s->ic_sda_setup = value & DW_IC_SDA_SETUP_MASK;\n- break;\n- case DW_IC_ACK_GENERAL_CALL:\n- qemu_log_mask(LOG_UNIMP,\n- \"%s: unsupported write - ic_ack_general_call\\n\",\n- DEVICE(s)->canonical_path);\n- break;\n- case DW_IC_FS_SPKLEN:\n- s->ic_fs_spklen = value & DW_IC_FS_SPKLEN_MASK;\n- break;\n+ return value;\n+}\n \n- /* This register is invalid at this point. */\n- default:\n- qemu_log_mask(LOG_GUEST_ERROR,\n- \"%s: write to invalid offset or readonly register 0x%\"\n- HWADDR_PRIx \"\\n\",\n- DEVICE(s)->canonical_path, offset);\n- break;\n+static const RegisterAccessInfo designware_i2c_regs_info[] = {\n+ { .name = \"DW_IC_CON\", .addr = A_DW_IC_CON,\n+ .reset = 0x7d,\n+ .unimp = 0xfffffc00,\n+ .unimp = R_DW_IC_CON_RX_FIFO_FULL_HLD_CTRL_MASK,\n+ .pre_write = dw_ic_con_reg_pre_write,\n+ },{ .name = \"DW_IC_TAR\", .addr = A_DW_IC_TAR,\n+ .reset = 0x1055,\n+ .unimp = 0xfffff000,\n+ },{ .name = \"DW_IC_SAR\", .addr = A_DW_IC_SAR,\n+ .reset = 0x55,\n+ .unimp = 0xfffffc00,\n+ .post_read = dw_ic_unsupported_reg_post_read,\n+ .pre_write = dw_ic_unsupported_reg_pre_write,\n+ },{ .name = \"DW_IC_DATA_CMD\", .addr = A_DW_IC_DATA_CMD,\n+ .post_read = dw_ic_data_cmd_reg_post_read,\n+ .post_write = dw_ic_data_cmd_reg_post_write,\n+ },{ .name = \"DW_IC_SS_SCL_HCNT\", .addr = A_DW_IC_SS_SCL_HCNT,\n+ .reset = 0x190,\n+ .unimp = 0xffff0000,\n+ },{ .name = \"DW_IC_SS_SCL_LCNT\", .addr = A_DW_IC_SS_SCL_LCNT,\n+ .reset = 0x1d6,\n+ .unimp = 0xffff0000,\n+ },{ .name = \"DW_IC_FS_SCL_HCNT\", .addr = A_DW_IC_FS_SCL_HCNT,\n+ .reset = 0x3c,\n+ .unimp = 0xffff0000,\n+ },{ .name = \"DW_IC_FS_SCL_LCNT\", .addr = A_DW_IC_FS_SCL_LCNT,\n+ .reset = 0x82,\n+ .unimp = 0xffff0000,\n+ },{ .name = \"DW_IC_INTR_STAT\", .addr = A_DW_IC_INTR_STAT,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_intr_stat_reg_post_read,\n+ },{ .name = \"DW_IC_INTR_MASK\", .addr = A_DW_IC_INTR_MASK,\n+ .reset = 0x8ff,\n+ .unimp = 0xffff8000,\n+ .post_write = dw_ic_intr_mask_reg_post_write,\n+ },{ .name = \"DW_IC_RAW_INTR_STAT\", .addr = A_DW_IC_RAW_INTR_STAT,\n+ .ro = 0xffffffff,\n+ },{ .name = \"DW_IC_RX_TL\", .addr = A_DW_IC_RX_TL,\n+ .pre_write = dw_ic_rx_tl_reg_pre_write,\n+ .post_write = dw_ic_rx_tl_reg_post_write,\n+ },{ .name = \"DW_IC_TX_TL\", .addr = A_DW_IC_TX_TL,\n+ .pre_write = dw_ic_tx_tl_reg_pre_write,\n+ },{ .name = \"DW_IC_CLR_INTR\", .addr = A_DW_IC_CLR_INTR,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_RX_UNDER\", .addr = A_DW_IC_CLR_RX_UNDER,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_RX_OVER\", .addr = A_DW_IC_CLR_RX_OVER,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_TX_OVER\", .addr = A_DW_IC_CLR_TX_OVER,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_RD_REQ\", .addr = A_DW_IC_CLR_RD_REQ,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_TX_ABRT\", .addr = A_DW_IC_CLR_TX_ABRT,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_RX_DONE\", .addr = A_DW_IC_CLR_RX_DONE,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_ACTIVITY\", .addr = A_DW_IC_CLR_ACTIVITY,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_STOP_DET\", .addr = A_DW_IC_CLR_STOP_DET,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_START_DET\", .addr = A_DW_IC_CLR_START_DET,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_CLR_GEN_CALL\", .addr = A_DW_IC_CLR_GEN_CALL,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_ENABLE\", .addr = A_DW_IC_ENABLE,\n+ .unimp = 0xfffffff8,\n+ .pre_write = dw_ic_enable_reg_pre_write,\n+ .post_write = dw_ic_enable_reg_post_write,\n+ },{ .name = \"DW_IC_STATUS\", .addr = A_DW_IC_STATUS,\n+ .reset = 0x6,\n+ .ro = 0xffffffff,\n+ },{ .name = \"DW_IC_TXFLR\", .addr = A_DW_IC_TXFLR,\n+ .ro = 0xffffffff,\n+ },{ .name = \"DW_IC_RXFLR\", .addr = A_DW_IC_RXFLR,\n+ .ro = 0xffffffff,\n+ },{ .name = \"DW_IC_SDA_HOLD\", .addr = A_DW_IC_SDA_HOLD,\n+ .reset = 0x1,\n+ .unimp = 0xff000000,\n+ },{ .name = \"DW_IC_TX_ABRT_SOURCE\", .addr = A_DW_IC_TX_ABRT_SOURCE,\n+ .ro = 0xffffffff,\n+ },{ .name = \"DW_IC_SLV_DATA_NACK_ONLY\", .addr = A_DW_IC_SLV_DATA_NACK_ONLY,\n+ .post_read = dw_ic_unsupported_reg_post_read,\n+ .pre_write = dw_ic_unsupported_reg_pre_write,\n+ },{ .name = \"DW_IC_DMA_CR\", .addr = A_DW_IC_DMA_CR,\n+ .post_read = dw_ic_unsupported_reg_post_read,\n+ .pre_write = dw_ic_unsupported_reg_pre_write,\n+ },{ .name = \"DW_IC_DMA_TDLR\", .addr = A_DW_IC_DMA_TDLR,\n+ .post_read = dw_ic_unsupported_reg_post_read,\n+ .pre_write = dw_ic_unsupported_reg_pre_write,\n+ },{ .name = \"DW_IC_DMA_RDLR\", .addr = A_DW_IC_DMA_RDLR,\n+ .post_read = dw_ic_unsupported_reg_post_read,\n+ .pre_write = dw_ic_unsupported_reg_pre_write,\n+ },{ .name = \"DW_IC_SDA_SETUP\", .addr = A_DW_IC_SDA_SETUP,\n+ .reset = 0x64,\n+ .unimp = 0xffffff00,\n+ },{ .name = \"DW_IC_ACK_GENERAL_CALL\", .addr = A_DW_IC_ACK_GENERAL_CALL,\n+ .post_read = dw_ic_unsupported_reg_post_read,\n+ .pre_write = dw_ic_unsupported_reg_pre_write,\n+ },{ .name = \"DW_IC_ENABLE_STATUS\", .addr = A_DW_IC_ENABLE_STATUS,\n+ .ro = 0xffffffff,\n+ },{ .name = \"DW_IC_FS_SPKLEN\", .addr = A_DW_IC_FS_SPKLEN,\n+ .reset = 0x2,\n+ .ro = 0xffffff00,\n+ },{ .name = \"DW_IC_CLR_RESTART_DET\", .addr = A_DW_IC_CLR_RESTART_DET,\n+ .ro = 0xffffffff,\n+ .post_read = dw_ic_clr_intr_reg_post_read,\n+ },{ .name = \"DW_IC_COMP_PARAM_1\", .addr = A_DW_IC_COMP_PARAM_1,\n+ .reset = /* HAS_DMA and HC_COUNT_VAL are disabled */\n+ ((2 << R_DW_IC_COMP_PARAM_1_APB_DATA_WIDTH_32_SHIFT) |\n+ R_DW_IC_COMP_PARAM_1_HIGH_SPEED_MODE_MASK |\n+ R_DW_IC_COMP_PARAM_1_INTR_IO_MASK |\n+ R_DW_IC_COMP_PARAM_1_HAS_ENCODED_PARAMS_MASK |\n+ ((DESIGNWARE_I2C_RX_FIFO_SIZE - 1)\n+ << R_DW_IC_COMP_PARAM_1_RX_FIFO_SIZE_SHIFT) |\n+ ((DESIGNWARE_I2C_TX_FIFO_SIZE - 1)\n+ << R_DW_IC_COMP_PARAM_1_TX_FIFO_SIZE_SHIFT)),\n+ .ro = 0xffffffff,\n+ },{ .name = \"DW_IC_COMP_VERSION\", .addr = A_DW_IC_COMP_VERSION,\n+ .reset = 0x3132302a,\n+ .ro = 0xffffffff,\n+ },{ .name = \"DW_IC_COMP_TYPE\", .addr = A_DW_IC_COMP_TYPE,\n+ .reset = 0x44570140,\n+ .ro = 0xffffffff,\n }\n-}\n+};\n \n static const MemoryRegionOps designware_i2c_ops = {\n- .read = dw_i2c_read,\n- .write = dw_i2c_write,\n+ .read = register_read_memory,\n+ .write = register_write_memory,\n .endianness = DEVICE_LITTLE_ENDIAN,\n .impl = {\n .min_access_size = 4,\n@@ -711,30 +648,11 @@ static const MemoryRegionOps designware_i2c_ops = {\n static void designware_i2c_enter_reset(Object *obj, ResetType type)\n {\n DesignWareI2CState *s = DESIGNWARE_I2C(obj);\n+ unsigned int i;\n \n- s->ic_con = DW_IC_CON_INIT_VAL;\n- s->ic_tar = DW_IC_TAR_INIT_VAL;\n- s->ic_sar = DW_IC_SAR_INIT_VAL;\n- s->ic_ss_scl_hcnt = DW_IC_SS_SCL_HCNT_INIT_VAL;\n- s->ic_ss_scl_lcnt = DW_IC_SS_SCL_LCNT_INIT_VAL;\n- s->ic_fs_scl_hcnt = DW_IC_FS_SCL_HCNT_INIT_VAL;\n- s->ic_fs_scl_lcnt = DW_IC_FS_SCL_LCNT_INIT_VAL;\n- s->ic_intr_mask = DW_IC_INTR_MASK_INIT_VAL;\n- s->ic_raw_intr_stat = 0;\n- s->ic_rx_tl = 0;\n- s->ic_tx_tl = 0;\n- s->ic_enable = 0;\n- s->ic_status = DW_IC_STATUS_INIT_VAL;\n- s->ic_txflr = 0;\n- s->ic_rxflr = 0;\n- s->ic_sda_hold = DW_IC_SDA_HOLD_INIT_VAL;\n- s->ic_tx_abrt_source = 0;\n- s->ic_sda_setup = DW_IC_SDA_SETUP_INIT_VAL;\n- s->ic_enable_status = 0;\n- s->ic_fs_spklen = DW_IC_FS_SPKLEN_INIT_VAL;\n- s->ic_comp_param_1 = DW_IC_COMP_PARAM_1_INIT_VAL;\n- s->ic_comp_version = DW_IC_COMP_VERSION_INIT_VAL;\n- s->ic_comp_type = DW_IC_COMP_TYPE_INIT_VAL;\n+ for (i = 0; i < ARRAY_SIZE(s->regs); ++i) {\n+ register_reset(&s->regs_info[i]);\n+ }\n \n fifo8_reset(&s->rx_fifo);\n \n@@ -753,29 +671,7 @@ static const VMStateDescription vmstate_designware_i2c = {\n .version_id = 0,\n .minimum_version_id = 0,\n .fields = (const VMStateField[]) {\n- VMSTATE_UINT32(ic_con, DesignWareI2CState),\n- VMSTATE_UINT32(ic_tar, DesignWareI2CState),\n- VMSTATE_UINT32(ic_sar, DesignWareI2CState),\n- VMSTATE_UINT32(ic_ss_scl_hcnt, DesignWareI2CState),\n- VMSTATE_UINT32(ic_ss_scl_lcnt, DesignWareI2CState),\n- VMSTATE_UINT32(ic_fs_scl_hcnt, DesignWareI2CState),\n- VMSTATE_UINT32(ic_fs_scl_lcnt, DesignWareI2CState),\n- VMSTATE_UINT32(ic_intr_mask, DesignWareI2CState),\n- VMSTATE_UINT32(ic_raw_intr_stat, DesignWareI2CState),\n- VMSTATE_UINT32(ic_rx_tl, DesignWareI2CState),\n- VMSTATE_UINT32(ic_tx_tl, DesignWareI2CState),\n- VMSTATE_UINT32(ic_enable, DesignWareI2CState),\n- VMSTATE_UINT32(ic_status, DesignWareI2CState),\n- VMSTATE_UINT32(ic_txflr, DesignWareI2CState),\n- VMSTATE_UINT32(ic_rxflr, DesignWareI2CState),\n- VMSTATE_UINT32(ic_sda_hold, DesignWareI2CState),\n- VMSTATE_UINT32(ic_tx_abrt_source, DesignWareI2CState),\n- VMSTATE_UINT32(ic_sda_setup, DesignWareI2CState),\n- VMSTATE_UINT32(ic_enable_status, DesignWareI2CState),\n- VMSTATE_UINT32(ic_fs_spklen, DesignWareI2CState),\n- VMSTATE_UINT32(ic_comp_param_1, DesignWareI2CState),\n- VMSTATE_UINT32(ic_comp_version, DesignWareI2CState),\n- VMSTATE_UINT32(ic_comp_type, DesignWareI2CState),\n+ VMSTATE_UINT32_ARRAY(regs, DesignWareI2CState, DESIGNWARE_I2C_R_MAX),\n VMSTATE_FIFO8(rx_fifo, DesignWareI2CState),\n VMSTATE_UINT32(status, DesignWareI2CState),\n VMSTATE_END_OF_LIST(),\n@@ -786,6 +682,7 @@ static void designware_i2c_smbus_init(Object *obj)\n {\n DesignWareI2CState *s = DESIGNWARE_I2C(obj);\n SysBusDevice *sbd = SYS_BUS_DEVICE(obj);\n+ RegisterInfoArray *reg_array;\n \n fifo8_create(&s->rx_fifo, DESIGNWARE_I2C_RX_FIFO_SIZE);\n \n@@ -796,6 +693,15 @@ static void designware_i2c_smbus_init(Object *obj)\n sysbus_init_mmio(sbd, &s->iomem);\n \n s->bus = i2c_init_bus(DEVICE(s), \"i2c-bus\");\n+\n+ memory_region_init(&s->iomem, obj, TYPE_DESIGNWARE_I2C, 4 * KiB);\n+ reg_array = register_init_block32(DEVICE(obj), designware_i2c_regs_info,\n+ ARRAY_SIZE(designware_i2c_regs_info),\n+ s->regs_info, s->regs,\n+ &designware_i2c_ops,\n+ DESIGNWARE_I2C_ERR_DEBUG,\n+ DESIGNWARE_I2C_R_MAX * 4);\n+ memory_region_add_subregion(&s->iomem, 0, ®_array->mem);\n }\n \n static void designware_i2c_finalize(Object *obj)\ndiff --git a/include/hw/i2c/designware_i2c.h b/include/hw/i2c/designware_i2c.h\nindex affaf983a2..54112c38e7 100644\n--- a/include/hw/i2c/designware_i2c.h\n+++ b/include/hw/i2c/designware_i2c.h\n@@ -11,9 +11,11 @@\n #include \"qemu/fifo8.h\"\n #include \"hw/i2c/i2c.h\"\n #include \"hw/core/irq.h\"\n+#include \"hw/core/register.h\"\n #include \"hw/core/sysbus.h\"\n \n-/* Size of the FIFO buffers. */\n+#define DESIGNWARE_I2C_R_MAX (0x100 / 4)\n+\n #define DESIGNWARE_I2C_RX_FIFO_SIZE 16\n #define DESIGNWARE_I2C_TX_FIFO_SIZE 16\n \n@@ -28,31 +30,6 @@ typedef enum DesignWareI2CStatus {\n * struct DesignWareI2CState - DesignWare I2C device state.\n * @bus: The underlying I2C Bus\n * @irq: GIC interrupt line to fire on events\n- * @ic_con: : I2C control register\n- * @ic_tar: I2C target address register\n- * @ic_sar: I2C slave address register\n- * @ic_ss_scl_hcnt: Standard speed i2c clock scl high count register\n- * @ic_ss_scl_lcnt: Standard speed i2c clock scl low count register\n- * @ic_fs_scl_hcnt: Fast mode or fast mode plus i2c clock scl high count\n- * register\n- * @ic_fs_scl_lcnt:Fast mode or fast mode plus i2c clock scl low count\n- * register\n- * @ic_intr_mask: I2C Interrupt Mask Register\n- * @ic_raw_intr_stat: I2C raw interrupt status register\n- * @ic_rx_tl: I2C receive FIFO threshold register\n- * @ic_tx_tl: I2C transmit FIFO threshold register\n- * @ic_enable: I2C enable register\n- * @ic_status: I2C status register\n- * @ic_txflr: I2C transmit fifo level register\n- * @ic_rxflr: I2C receive fifo level register\n- * @ic_sda_hold: I2C SDA hold time length register\n- * @ic_tx_abrt_source: The I2C transmit abort source register\n- * @ic_sda_setup: I2C SDA setup register\n- * @ic_enable_status: I2C enable status register\n- * @ic_fs_spklen: I2C SS, FS or FM+ spike suppression limit\n- * @ic_comp_param_1: Component parameter register\n- * @ic_comp_version: I2C component version register\n- * @ic_comp_type: I2C component type register\n * @rx_fifo: The FIFO buffer for receiving in FIFO mode.\n */\n typedef struct DesignWareI2CState {\n@@ -63,31 +40,10 @@ typedef struct DesignWareI2CState {\n I2CBus *bus;\n qemu_irq irq;\n \n- uint32_t ic_con;\n- uint32_t ic_tar;\n- uint32_t ic_sar;\n- uint32_t ic_ss_scl_hcnt;\n- uint32_t ic_ss_scl_lcnt;\n- uint32_t ic_fs_scl_hcnt;\n- uint32_t ic_fs_scl_lcnt;\n- uint32_t ic_intr_mask;\n- uint32_t ic_raw_intr_stat;\n- uint32_t ic_rx_tl;\n- uint32_t ic_tx_tl;\n- uint32_t ic_enable;\n- uint32_t ic_status;\n- uint32_t ic_txflr;\n- uint32_t ic_rxflr;\n- uint32_t ic_sda_hold;\n- uint32_t ic_tx_abrt_source;\n- uint32_t ic_sda_setup;\n- uint32_t ic_enable_status;\n- uint32_t ic_fs_spklen;\n- uint32_t ic_comp_param_1;\n- uint32_t ic_comp_version;\n- uint32_t ic_comp_type;\n+ uint32_t regs[DESIGNWARE_I2C_R_MAX];\n+ RegisterInfo regs_info[DESIGNWARE_I2C_R_MAX];\n \n- /* fifo8_num_used(rx_fifo) should always equal ic_rxflr */\n+ /* fifo8_num_used(rx_fifo) should always equal DW_IC_RXFLR */\n Fifo8 rx_fifo;\n \n DesignWareI2CStatus status;\n", "prefixes": [ "3/4", "RFC" ] }