From nobody Sun May 12 06:53:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=quarantine dis=quarantine) header.from=opensource.wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1661235808359314.30312590849985; Mon, 22 Aug 2022 23:23:28 -0700 (PDT) Received: from localhost ([::1]:48656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQNJu-0005DO-IC for importer@patchew.org; Tue, 23 Aug 2022 02:23:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQN9d-00086T-BV for qemu-devel@nongnu.org; Tue, 23 Aug 2022 02:12:49 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:49381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQN9Z-0000k2-6m for qemu-devel@nongnu.org; Tue, 23 Aug 2022 02:12:48 -0400 Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 23 Aug 2022 14:12:36 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 22 Aug 2022 22:27:54 -0700 Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 22 Aug 2022 23:12:36 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4MBf5w0pF1z1Rwnx for ; Mon, 22 Aug 2022 23:12:36 -0700 (PDT) Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id eT3ljb20g4u6 for ; Mon, 22 Aug 2022 23:12:35 -0700 (PDT) Received: from localhost.localdomain (unknown [10.225.165.40]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4MBf5r48wYz1RtVk; Mon, 22 Aug 2022 23:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1661235165; x=1692771165; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YOQjuP0GwYm+xsEBe9XVUk27tsNs57ziEwBkqS6jfJw=; b=ibuBh+NWuPRezzYLMiXn+EYmUy5PxGQC8oyQxsuxIDheBfk1nozP4TPP VaJAlnwMOmeTh/kVC7h+C4o0fxxSd0PqTuzXKvyi6zTYnSbtbFB9iidHY IepQIuLYWce8jSHHyiU9uoZgQ43h7WLu4UYWvhza1K5yn3v63QJadTZ44 NlyncWE08DDUoFJRmGs7B4FL/QZL3yPyAJRSQV+WcPVd+UWZoZquT4wMC nX5881caZjJidkbdMGwwSuHcSLr8J5YMDxXlKk4+Y0UjN6qiPCg5oJ/cA KTdH3fYu2gvwaM9D7RVlDLEWEBKUn2HixfCO9INrg4rbkKq9cCDzK87jq Q==; X-IronPort-AV: E=Sophos;i="5.93,256,1654531200"; d="scan'208";a="313671693" IronPort-SDR: y9OsYeTu0oi7RVOqDAkiWqsIlD80eBJNn4sLbatIu2DZCEp7obe3qPZ+itnJulV7P7QbREuzsj lL3NyY1WWgT3FxytPkGHkktDNSQfJvTbw8PsZBxS08Pq9ph6joYVsAuRUE9e0o3K6+Sshj6lqG eDjG1wCucug5ritmyMjAapXgFfI1d1HHFcRahvfXG844GyQhedVbR1Y7vKCJLtinDSqhm3jA+m l3IFLNg5pjpqRwD9ttxTypCCyy8YbcHDloYf3AtuWhw/BqQhaU1SUJ6oeLH/4qj/uRMiY5LNFE 00W1QxFaYonp7xpCZD0kIu0J IronPort-SDR: ADcqS/gJK5zUb9m3+uCi8qOZ/0Mg/k6wUiomxzzCeUiGIErOoBJrXiIHI07qEXZ1mZhfpSzFUC XN0iJjhKJq2DUUW5Sm7Gcj64wFnhwaz3W7qxzU43tdgPulYJJBf72ArBxFmudW0jhCM+VA7xep A8WChILdvH4GRZ9mdYAtNITT2bSnNE9rTid1TTAWKkRet64eWv9LH+RZU4eL1TpwPUyi6H0Bqf pZ8bCEacwIgJd44Xt4i5D1pi4qUyLn85ItwrmpBR048JJ2gzg+qbmoaQJY4JXzQjReez1oo2eE rkY= WDCIronportException: Internal Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1661235155; x=1663827156; bh=YOQjuP0GwYm+xsEBe9 XVUk27tsNs57ziEwBkqS6jfJw=; b=WaG6+m9WzzkUdQ+mzsZxecZqk+kldKRSF4 OXFRgzfmEAqy9TqM1hM+ajRMnhSI5t4HAx37ZByS+OYbe6/h7oPmWO1AJr+UI7Hv RHA2g/AegA0VlOLsTpUZcvGAPZeqAOXdkASR5YyecDU/Jj07mX2pxT7CLkZaEtRp 1ABoHy/JX9OokY1Ayvr1gWuGtMyTqP1p32HnmcJThb9On5eG4JS4wm/KlgTdCc+a clSVmD1UhLzUEZZW0PVuJsbsAajzPDf7bwEjkH8Mf1fGxm6ysok1zHDtKAikVgIh mEqbvYmRduG7mNE4A9KyWTomXL4aSr6qqlbb7Yan4u5MFqKRTt4w== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com From: Wilfred Mallawa To: Alistair.Francis@wdc.com, qemu-riscv@nongnu.org Cc: qemu-devel@nongnu.org, Wilfred Mallawa , Alistair Francis , Andrew Jones Subject: [PATCH v4 1/4] hw/ssi: ibex_spi: fixup typos in ibex_spi_host Date: Tue, 23 Aug 2022 16:12:00 +1000 Message-Id: <20220823061201.132342-2-wilfred.mallawa@opensource.wdc.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823061201.132342-1-wilfred.mallawa@opensource.wdc.com> References: <20220823061201.132342-1-wilfred.mallawa@opensource.wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=68.232.143.124; envelope-from=prvs=2270691b0=wilfred.mallawa@opensource.wdc.com; helo=esa2.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1661235810780100001 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa This patch fixes up minor typos in ibex_spi_host Signed-off-by: Wilfred Mallawa Reviewed-by: Alistair Francis Reviewed-by: Andrew Jones --- hw/ssi/ibex_spi_host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index d14580b409..601041d719 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -172,7 +172,7 @@ static void ibex_spi_host_irq(IbexSPIHostState *s) & R_INTR_STATE_SPI_EVENT_MASK; int err_irq =3D 0, event_irq =3D 0; =20 - /* Error IRQ enabled and Error IRQ Cleared*/ + /* Error IRQ enabled and Error IRQ Cleared */ if (error_en && !err_pending) { /* Event enabled, Interrupt Test Error */ if (s->regs[IBEX_SPI_HOST_INTR_TEST] & R_INTR_TEST_ERROR_MASK) { @@ -434,7 +434,7 @@ static void ibex_spi_host_write(void *opaque, hwaddr ad= dr, case IBEX_SPI_HOST_TXDATA: /* * This is a hardware `feature` where - * the first word written TXDATA after init is omitted entirely + * the first word written to TXDATA after init is omitted entirely */ if (s->init_status) { s->init_status =3D false; @@ -487,7 +487,7 @@ static void ibex_spi_host_write(void *opaque, hwaddr ad= dr, break; case IBEX_SPI_HOST_ERROR_STATUS: /* - * Indicates that any errors that have occurred. + * Indicates any errors that have occurred. * When an error occurs, the corresponding bit must be cleared * here before issuing any further commands */ --=20 2.37.2 From nobody Sun May 12 06:53:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=quarantine dis=quarantine) header.from=opensource.wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166123533001520.58687117676436; Mon, 22 Aug 2022 23:15:30 -0700 (PDT) Received: from localhost ([::1]:35106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQNCA-0001W5-UF for importer@patchew.org; Tue, 23 Aug 2022 02:15:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQN9i-0008Dz-M1 for qemu-devel@nongnu.org; Tue, 23 Aug 2022 02:12:55 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:25193) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQN9f-0000l6-SQ for qemu-devel@nongnu.org; Tue, 23 Aug 2022 02:12:54 -0400 Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 23 Aug 2022 14:12:46 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 22 Aug 2022 22:33:28 -0700 Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 22 Aug 2022 23:12:48 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4MBf6812dGz1Rwnx for ; Mon, 22 Aug 2022 23:12:48 -0700 (PDT) Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id HUHfLoXcAgh7 for ; Mon, 22 Aug 2022 23:12:47 -0700 (PDT) Received: from localhost.localdomain (unknown [10.225.165.40]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4MBf634bglz1RtVk; Mon, 22 Aug 2022 23:12:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1661235170; x=1692771170; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tHrgF3pDx8EP5IPUOiRUdhbfaoy370OSxSTzeg5kSWA=; b=DtWrrg94+8BwMiicWBfmUx6MMrrVGi5u2aJNYn7w9uDmyzoPPp1Z0WhL FOZVykNV+G3eLhpxNfXpiWIDiQbTaqvk9fdxJQyvQPrHSgUQPGxlQ2qhD PnbPCS8hbs6Bcp6Jm7Ej42pzXXu6oXJd3Pgn/M1/JQUtzHkImy2TfRPp8 aSyZ0PrOV+vzhWgd6n7fon78kkZ5QlRA1sniB5abcsvAGP3Uy+N6i4GNx HTNzaBgs4eY6g/Muxg8nwFi48y5VBu2QEeyoFNJIDQCXcyeKs4yxpqXmq 4rg49UgcJOa8pz3DVRiQebcxgsrVMRztVOACP2AfQtPF/5STm0uhpewXk g==; X-IronPort-AV: E=Sophos;i="5.93,256,1654531200"; d="scan'208";a="209392992" IronPort-SDR: QCVOdwgy+IfJfHKLNKu1RaySlfGnCTlBaKYNA9VQ1NQ/f0gV62kWt+YpeCWNSmQg8ZxYqqt6wz h9UKS4Mgo66ripeTmyBiSLzTCj5OwEsT2NgJIK8ZctWzQxxAwkRBzZohSkBV4y7TURcOHS/69Z bArc3V0ebFWBR+qat4sjYKvpzU4bsa6lW4VycRASFuZC8CoTweyegYtwGeV8kgGI3vVVtHBZ1A w4wnmh8Ae9HSToTfbR3KmRz6FHbrWAs6HV5TXSIwYt07kzDESvVcGKf29xHJtEzILHFXBSgel0 OqPcJqt/avsu1qCrVi/7GOTj IronPort-SDR: v8MrIRlDdvwA94JwyHBvjmmhX7/6pG9Xob+DkYCt8oqdV4HhmIKvVe1CaQ1iPebkGjPl9qpW7q 8/bAYrA2xi2u78dp1bqZUBXWHoRz1ijyULbd97RnPCGnIrbE6nsbt5Cl03zVb1beOoasLdUooZ YtD1DgBL+1aee2VFwGXeU4nWYAlbUzhpJU7NqPxLFnSPq2+OpjEdChIvcZs60KME68C+QGpDxA uz6leIzyXl7huqp7oy8AErcs1Qlq6GgPc58lDWRzj7CXjWrxdDLi8tcOj7lZbMbnR4UnveC0l3 sbE= WDCIronportException: Internal Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1661235167; x=1663827168; bh=tHrgF3pDx8EP5IPUOi RUdhbfaoy370OSxSTzeg5kSWA=; b=bly3Dx4iTDWunLHW3sLHtLi1V7PY/bOz2N 1bXV+HOurdS6cf5ssSfxZ8MOFSODBC6MSdYGutiVDwJq/4/uWHcEHCTJBBk8cDmg yuU+blc0idEIPyFaJJ+7oasstmQpR5O2j0wuYr9iWW4DpvAfpIpFoOuEckPVfkYi MidhoQfGPk1g5jE1J9InwzOKrx1DNXTFDmgZskhE3FZAE47y/YJrwuw8CNdfJTiD utwBnn5cuFyPX+Wd9yitWOumDbW09/vz3MtrGZNCldlqSDY199U7AG2LThT8WSGf R4+gJyx+hrM3rNeNmsVxjiHWYFsnG5A7HE4BYY2+mOQ0bdXFfqAA== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com From: Wilfred Mallawa To: Alistair.Francis@wdc.com, qemu-riscv@nongnu.org Cc: qemu-devel@nongnu.org, Wilfred Mallawa , Alistair Francis , Andrew Jones Subject: [PATCH v4 2/4] hw/ssi: ibex_spi: fixup coverity issue Date: Tue, 23 Aug 2022 16:12:02 +1000 Message-Id: <20220823061201.132342-3-wilfred.mallawa@opensource.wdc.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823061201.132342-1-wilfred.mallawa@opensource.wdc.com> References: <20220823061201.132342-1-wilfred.mallawa@opensource.wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.71.153.144; envelope-from=prvs=2270691b0=wilfred.mallawa@opensource.wdc.com; helo=esa5.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-ZM-MESSAGEID: 1661235331190100001 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa This patch addresses the coverity issues specified in [1], as suggested, `FIELD_DP32()`/`FIELD_EX32()` macros have been implemented to clean up the code. [1] https://www.mail-archive.com/qemu-devel@nongnu.org/msg887713.html Fixes: Coverity CID 1488107 Signed-off-by: Wilfred Mallawa Reviewed-by: Alistair Francis Reviewed-by: Andrew Jones --- hw/ssi/ibex_spi_host.c | 132 +++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 64 deletions(-) diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index 601041d719..d52b193a1a 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -108,18 +108,22 @@ static inline uint8_t div4_round_up(uint8_t dividend) =20 static void ibex_spi_rxfifo_reset(IbexSPIHostState *s) { + uint32_t data =3D s->regs[IBEX_SPI_HOST_STATUS]; /* Empty the RX FIFO and assert RXEMPTY */ fifo8_reset(&s->rx_fifo); - s->regs[IBEX_SPI_HOST_STATUS] &=3D ~R_STATUS_RXFULL_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |=3D R_STATUS_RXEMPTY_MASK; + data =3D FIELD_DP32(data, STATUS, RXFULL, 0); + data =3D FIELD_DP32(data, STATUS, RXEMPTY, 1); + s->regs[IBEX_SPI_HOST_STATUS] =3D data; } =20 static void ibex_spi_txfifo_reset(IbexSPIHostState *s) { + uint32_t data =3D s->regs[IBEX_SPI_HOST_STATUS]; /* Empty the TX FIFO and assert TXEMPTY */ fifo8_reset(&s->tx_fifo); - s->regs[IBEX_SPI_HOST_STATUS] &=3D ~R_STATUS_TXFULL_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |=3D R_STATUS_TXEMPTY_MASK; + data =3D FIELD_DP32(data, STATUS, TXFULL, 0); + data =3D FIELD_DP32(data, STATUS, TXEMPTY, 1); + s->regs[IBEX_SPI_HOST_STATUS] =3D data; } =20 static void ibex_spi_host_reset(DeviceState *dev) @@ -162,37 +166,38 @@ static void ibex_spi_host_reset(DeviceState *dev) */ static void ibex_spi_host_irq(IbexSPIHostState *s) { - bool error_en =3D s->regs[IBEX_SPI_HOST_INTR_ENABLE] - & R_INTR_ENABLE_ERROR_MASK; - bool event_en =3D s->regs[IBEX_SPI_HOST_INTR_ENABLE] - & R_INTR_ENABLE_SPI_EVENT_MASK; - bool err_pending =3D s->regs[IBEX_SPI_HOST_INTR_STATE] - & R_INTR_STATE_ERROR_MASK; - bool status_pending =3D s->regs[IBEX_SPI_HOST_INTR_STATE] - & R_INTR_STATE_SPI_EVENT_MASK; + uint32_t intr_test_reg =3D s->regs[IBEX_SPI_HOST_INTR_TEST]; + uint32_t intr_en_reg =3D s->regs[IBEX_SPI_HOST_INTR_ENABLE]; + uint32_t intr_state_reg =3D s->regs[IBEX_SPI_HOST_INTR_STATE]; + + uint32_t err_en_reg =3D s->regs[IBEX_SPI_HOST_ERROR_ENABLE]; + uint32_t event_en_reg =3D s->regs[IBEX_SPI_HOST_EVENT_ENABLE]; + uint32_t err_status_reg =3D s->regs[IBEX_SPI_HOST_ERROR_STATUS]; + uint32_t status_reg =3D s->regs[IBEX_SPI_HOST_STATUS]; + + + bool error_en =3D FIELD_EX32(intr_en_reg, INTR_ENABLE, ERROR); + bool event_en =3D FIELD_EX32(intr_en_reg, INTR_ENABLE, SPI_EVENT); + bool err_pending =3D FIELD_EX32(intr_state_reg, INTR_STATE, ERROR); + bool status_pending =3D FIELD_EX32(intr_state_reg, INTR_STATE, SPI_EVE= NT); + int err_irq =3D 0, event_irq =3D 0; =20 /* Error IRQ enabled and Error IRQ Cleared */ if (error_en && !err_pending) { /* Event enabled, Interrupt Test Error */ - if (s->regs[IBEX_SPI_HOST_INTR_TEST] & R_INTR_TEST_ERROR_MASK) { + if (FIELD_EX32(intr_test_reg, INTR_TEST, ERROR)) { err_irq =3D 1; - } else if ((s->regs[IBEX_SPI_HOST_ERROR_ENABLE] - & R_ERROR_ENABLE_CMDBUSY_MASK) && - s->regs[IBEX_SPI_HOST_ERROR_STATUS] - & R_ERROR_STATUS_CMDBUSY_MASK) { + } else if (FIELD_EX32(err_en_reg, ERROR_ENABLE, CMDBUSY) && + FIELD_EX32(err_status_reg, ERROR_STATUS, CMDBUSY)) { /* Wrote to COMMAND when not READY */ err_irq =3D 1; - } else if ((s->regs[IBEX_SPI_HOST_ERROR_ENABLE] - & R_ERROR_ENABLE_CMDINVAL_MASK) && - s->regs[IBEX_SPI_HOST_ERROR_STATUS] - & R_ERROR_STATUS_CMDINVAL_MASK) { + } else if (FIELD_EX32(err_en_reg, ERROR_ENABLE, CMDINVAL) && + FIELD_EX32(err_status_reg, ERROR_STATUS, CMDINVAL)) { /* Invalid command segment */ err_irq =3D 1; - } else if ((s->regs[IBEX_SPI_HOST_ERROR_ENABLE] - & R_ERROR_ENABLE_CSIDINVAL_MASK) && - s->regs[IBEX_SPI_HOST_ERROR_STATUS] - & R_ERROR_STATUS_CSIDINVAL_MASK) { + } else if (FIELD_EX32(err_en_reg, ERROR_ENABLE, CSIDINVAL) && + FIELD_EX32(err_status_reg, ERROR_STATUS, CSIDINVAL)) { /* Invalid value for CSID */ err_irq =3D 1; } @@ -204,22 +209,19 @@ static void ibex_spi_host_irq(IbexSPIHostState *s) =20 /* Event IRQ Enabled and Event IRQ Cleared */ if (event_en && !status_pending) { - if (s->regs[IBEX_SPI_HOST_INTR_TEST] & R_INTR_TEST_SPI_EVENT_MASK)= { + if (FIELD_EX32(intr_test_reg, INTR_STATE, SPI_EVENT)) { /* Event enabled, Interrupt Test Event */ event_irq =3D 1; - } else if ((s->regs[IBEX_SPI_HOST_EVENT_ENABLE] - & R_EVENT_ENABLE_READY_MASK) && - (s->regs[IBEX_SPI_HOST_STATUS] & R_STATUS_READY_MASK))= { + } else if (FIELD_EX32(event_en_reg, EVENT_ENABLE, READY) && + FIELD_EX32(status_reg, STATUS, READY)) { /* SPI Host ready for next command */ event_irq =3D 1; - } else if ((s->regs[IBEX_SPI_HOST_EVENT_ENABLE] - & R_EVENT_ENABLE_TXEMPTY_MASK) && - (s->regs[IBEX_SPI_HOST_STATUS] & R_STATUS_TXEMPTY_MASK= )) { + } else if (FIELD_EX32(event_en_reg, EVENT_ENABLE, TXEMPTY) && + FIELD_EX32(status_reg, STATUS, TXEMPTY)) { /* SPI TXEMPTY, TXFIFO drained */ event_irq =3D 1; - } else if ((s->regs[IBEX_SPI_HOST_EVENT_ENABLE] - & R_EVENT_ENABLE_RXFULL_MASK) && - (s->regs[IBEX_SPI_HOST_STATUS] & R_STATUS_RXFULL_MASK)= ) { + } else if (FIELD_EX32(event_en_reg, EVENT_ENABLE, RXFULL) && + FIELD_EX32(status_reg, STATUS, RXFULL)) { /* SPI RXFULL, RXFIFO full */ event_irq =3D 1; } @@ -232,10 +234,11 @@ static void ibex_spi_host_irq(IbexSPIHostState *s) =20 static void ibex_spi_host_transfer(IbexSPIHostState *s) { - uint32_t rx, tx; + uint32_t rx, tx, data; /* Get num of one byte transfers */ - uint8_t segment_len =3D ((s->regs[IBEX_SPI_HOST_COMMAND] & R_COMMAND_L= EN_MASK) - >> R_COMMAND_LEN_SHIFT); + uint8_t segment_len =3D FIELD_EX32(s->regs[IBEX_SPI_HOST_COMMAND], + COMMAND, LEN); + while (segment_len > 0) { if (fifo8_is_empty(&s->tx_fifo)) { /* Assert Stall */ @@ -262,22 +265,21 @@ static void ibex_spi_host_transfer(IbexSPIHostState *= s) --segment_len; } =20 + data =3D s->regs[IBEX_SPI_HOST_STATUS]; /* Assert Ready */ - s->regs[IBEX_SPI_HOST_STATUS] |=3D R_STATUS_READY_MASK; + data =3D FIELD_DP32(data, STATUS, READY, 1); /* Set RXQD */ - s->regs[IBEX_SPI_HOST_STATUS] &=3D ~R_STATUS_RXQD_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |=3D (R_STATUS_RXQD_MASK - & div4_round_up(segment_len)); + data =3D FIELD_DP32(data, STATUS, RXQD, div4_round_up(segment_len)); /* Set TXQD */ - s->regs[IBEX_SPI_HOST_STATUS] &=3D ~R_STATUS_TXQD_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |=3D (fifo8_num_used(&s->tx_fifo) / 4) - & R_STATUS_TXQD_MASK; + data =3D FIELD_DP32(data, STATUS, TXQD, fifo8_num_used(&s->tx_fifo) / = 4); /* Clear TXFULL */ - s->regs[IBEX_SPI_HOST_STATUS] &=3D ~R_STATUS_TXFULL_MASK; - /* Assert TXEMPTY and drop remaining bytes that exceed segment_len */ - ibex_spi_txfifo_reset(s); + data =3D FIELD_DP32(data, STATUS, TXFULL, 0); /* Reset RXEMPTY */ - s->regs[IBEX_SPI_HOST_STATUS] &=3D ~R_STATUS_RXEMPTY_MASK; + data =3D FIELD_DP32(data, STATUS, RXEMPTY, 0); + /* Update register status */ + s->regs[IBEX_SPI_HOST_STATUS] =3D data; + /* Drop remaining bytes that exceed segment_len */ + ibex_spi_txfifo_reset(s); =20 ibex_spi_host_irq(s); } @@ -340,7 +342,7 @@ static void ibex_spi_host_write(void *opaque, hwaddr ad= dr, { IbexSPIHostState *s =3D opaque; uint32_t val32 =3D val64; - uint32_t shift_mask =3D 0xff; + uint32_t shift_mask =3D 0xff, data =3D 0, status =3D 0; uint8_t txqd_len; =20 trace_ibex_spi_host_write(addr, size, val64); @@ -397,22 +399,24 @@ static void ibex_spi_host_write(void *opaque, hwaddr = addr, s->regs[addr] =3D val32; =20 /* STALL, IP not enabled */ - if (!(s->regs[IBEX_SPI_HOST_CONTROL] & R_CONTROL_SPIEN_MASK)) { + if (!(FIELD_EX32(s->regs[IBEX_SPI_HOST_CONTROL], + CONTROL, SPIEN))) { return; } =20 /* SPI not ready, IRQ Error */ - if (!(s->regs[IBEX_SPI_HOST_STATUS] & R_STATUS_READY_MASK)) { + if (!(FIELD_EX32(s->regs[IBEX_SPI_HOST_STATUS], + STATUS, READY))) { s->regs[IBEX_SPI_HOST_ERROR_STATUS] |=3D R_ERROR_STATUS_CMDBUS= Y_MASK; ibex_spi_host_irq(s); return; } + /* Assert Not Ready */ s->regs[IBEX_SPI_HOST_STATUS] &=3D ~R_STATUS_READY_MASK; =20 - if (((val32 & R_COMMAND_DIRECTION_MASK) >> R_COMMAND_DIRECTION_SHI= FT) - !=3D BIDIRECTIONAL_TRANSFER) { - qemu_log_mask(LOG_UNIMP, + if (FIELD_EX32(val32, COMMAND, DIRECTION) !=3D BIDIRECTIONAL_TRANS= FER) { + qemu_log_mask(LOG_UNIMP, "%s: Rx Only/Tx Only are not supported\n", __fun= c__); } =20 @@ -452,8 +456,8 @@ static void ibex_spi_host_write(void *opaque, hwaddr ad= dr, return; } /* Byte ordering is set by the IP */ - if ((s->regs[IBEX_SPI_HOST_STATUS] & - R_STATUS_BYTEORDER_MASK) =3D=3D 0) { + status =3D s->regs[IBEX_SPI_HOST_STATUS]; + if (FIELD_EX32(status, STATUS, BYTEORDER) =3D=3D 0) { /* LE: LSB transmitted first (default for ibex processor) = */ shift_mask =3D 0xff << (i * 8); } else { @@ -464,18 +468,18 @@ static void ibex_spi_host_write(void *opaque, hwaddr = addr, =20 fifo8_push(&s->tx_fifo, (val32 & shift_mask) >> (i * 8)); } - + status =3D s->regs[IBEX_SPI_HOST_STATUS]; /* Reset TXEMPTY */ - s->regs[IBEX_SPI_HOST_STATUS] &=3D ~R_STATUS_TXEMPTY_MASK; + status =3D FIELD_DP32(status, STATUS, TXEMPTY, 0); /* Update TXQD */ - txqd_len =3D (s->regs[IBEX_SPI_HOST_STATUS] & - R_STATUS_TXQD_MASK) >> R_STATUS_TXQD_SHIFT; + txqd_len =3D FIELD_EX32(status, STATUS, TXQD); /* Partial bytes (size < 4) are padded, in words. */ txqd_len +=3D 1; - s->regs[IBEX_SPI_HOST_STATUS] &=3D ~R_STATUS_TXQD_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |=3D txqd_len; + status =3D FIELD_DP32(status, STATUS, TXQD, txqd_len); /* Assert Ready */ - s->regs[IBEX_SPI_HOST_STATUS] |=3D R_STATUS_READY_MASK; + status =3D FIELD_DP32(status, STATUS, READY, 1); + /* Update register status */ + s->regs[IBEX_SPI_HOST_STATUS] =3D status; break; case IBEX_SPI_HOST_ERROR_ENABLE: s->regs[addr] =3D val32; --=20 2.37.2 From nobody Sun May 12 06:53:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=quarantine dis=quarantine) header.from=opensource.wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1661235829333564.9839024164966; Mon, 22 Aug 2022 23:23:49 -0700 (PDT) Received: from localhost ([::1]:59882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQNKG-0005Tk-4D for importer@patchew.org; Tue, 23 Aug 2022 02:23:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQN9p-0008HH-1P for qemu-devel@nongnu.org; Tue, 23 Aug 2022 02:13:01 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:25202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQN9m-0000ls-7C for qemu-devel@nongnu.org; Tue, 23 Aug 2022 02:13:00 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 23 Aug 2022 14:12:52 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 22 Aug 2022 22:28:11 -0700 Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 22 Aug 2022 23:12:53 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4MBf6F3k3dz1Rwnx for ; Mon, 22 Aug 2022 23:12:53 -0700 (PDT) Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 6Ozz7wtfKzFT for ; Mon, 22 Aug 2022 23:12:52 -0700 (PDT) Received: from localhost.localdomain (unknown [10.225.165.40]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4MBf6B27RDz1RtVk; Mon, 22 Aug 2022 23:12:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1661235176; x=1692771176; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KqLG8xfKmm5DZaru5NgSj5bTY6JbfBZFtjvQZh2l7wE=; b=DMrnNnUXqCI08haJALmbk7P2mWa13LeF6ttLoUJor53agm3KX16kUCw9 6hHzg99t5r/Tvbm7H/y1kQsoScwSPD+I2O49A7BmEzXWCyz3PSuT/sK8f f9MPEy3qqZ2FFekizzjtDG5bvZdDINkUJsW9Oqd7QlLOEFOztLFsRu28y FNeuACm3OCvcix0TCpc6qiAbe2a3cDtPakWz1ulqafiJnfkpjMcBIcT25 rMm8OObJuucsHrrNcBQlHC2WXyLog1WOHOIcIt+x53CSzYiSsXTfZkiJb vllAsTKVVTBpxZQUI/YVUfVFr5Es1tf0OhHvwsFrZBpjIHrI8RopSfU7x Q==; X-IronPort-AV: E=Sophos;i="5.93,256,1654531200"; d="scan'208";a="209393007" IronPort-SDR: 3XRbYXdwNhP3kro9awgNoh+E58rLXbqrE+3OLP/kE/lpVy8gB4b3kArKe4jdck4I1UP6dKaiKX 6OEoWqIhj142TfsIuJYzGBx5XHaXJaad+RDdJV59nYvDtR+TGxFCzZEI1BoGu4PhZvrJbE2To0 XhlnZR7HUNBqQ3ORm7+uS9fFD8sAOifPxkyjIcGCcYlNjbVAxzo6NSah81LC96A1xDut79uIpI kCZewk/kPsfY9JgkLOpHY2VWoP3ebZKeNqqctUrCuzYjBOaKXXIYI5KZI3OpzCHuALO1V5MWmF cA8OmpqE7pvrxfXG33juCTOq IronPort-SDR: +aG6n/BbxQJerpihFj760HHTZxInJW6rO2BK6u85BI6d9N4nUQdI2gwQhAQZE//N6p7f8yJSRZ d+T0Q3LvxSobPSKol965jqDrprT6LhEHodYoq4bNWLzSOexcVCDtl6FfuTOcwLGR9ts+ZUIFgq UAqsHMBoyvLZLI/G1OL0xTRfNtCZkkXAU77pEP0qGXBsA25tvFfs5RAfXZweQbRctb2Lh1Fh0g k05ibU71WSNavwbr5qYpJnbUwvvdPeZWPOPlpUcSZ5Gzqu/xbydLT/EsLCHnNg+IvYkgG/r9CI aIk= WDCIronportException: Internal Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1661235172; x=1663827173; bh=KqLG8xfKmm5DZaru5N gSj5bTY6JbfBZFtjvQZh2l7wE=; b=pcdWOVVPmDmWzX/1vn5uYopeErsx4TWERJ F8q5s6IajqhN068lEWqEmMht9CDCwro6tiXH0YFuiYPkTcgnbnZl+QIyiUrxZ4GL ZptUG5lXYcfi4/ajT86ZoNKR8NGUaraO8le8/MYPU01T82OBBSWLWqf+gwYtAkNu Gvoz5Rfu5c43tyJT3qRrWEUvoAC7dmTA3cvc7JVGt4gWXN01VgTjIjzKQidxXH9f V3mg0jdWK4ip32P/glbH5rW7C2AG1yAuW4J3hZc8JxdhJdBYbGz82CRfbWwXT+wB qxUYJBxVWa/tv1n/U4uqCG+tLi4s6ijU83/CpIz8rlh6Q/vUmCng== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com From: Wilfred Mallawa To: Alistair.Francis@wdc.com, qemu-riscv@nongnu.org Cc: qemu-devel@nongnu.org, Wilfred Mallawa , Alistair Francis Subject: [PATCH v4 3/4] hw/ssi: ibex_spi: fixup/add rw1c functionality Date: Tue, 23 Aug 2022 16:12:03 +1000 Message-Id: <20220823061201.132342-4-wilfred.mallawa@opensource.wdc.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823061201.132342-1-wilfred.mallawa@opensource.wdc.com> References: <20220823061201.132342-1-wilfred.mallawa@opensource.wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.71.153.144; envelope-from=prvs=2270691b0=wilfred.mallawa@opensource.wdc.com; helo=esa5.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1661235830568100001 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa This patch adds the `rw1c` functionality to the respective registers. The status fields are cleared when the respective field is set. Signed-off-by: Wilfred Mallawa Reviewed-by: Alistair Francis --- hw/ssi/ibex_spi_host.c | 34 ++++++++++++++++++++++++++++++++-- include/hw/ssi/ibex_spi_host.h | 4 ++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index d52b193a1a..40d401ad47 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -352,7 +352,17 @@ static void ibex_spi_host_write(void *opaque, hwaddr a= ddr, =20 switch (addr) { /* Skipping any R/O registers */ - case IBEX_SPI_HOST_INTR_STATE...IBEX_SPI_HOST_INTR_ENABLE: + case IBEX_SPI_HOST_INTR_STATE: + /* rw1c status register */ + if (FIELD_EX32(val32, INTR_STATE, ERROR)) { + data =3D FIELD_DP32(data, INTR_STATE, ERROR, 0); + } + if (FIELD_EX32(val32, INTR_STATE, SPI_EVENT)) { + data =3D FIELD_DP32(data, INTR_STATE, SPI_EVENT, 0); + } + s->regs[addr] =3D data; + break; + case IBEX_SPI_HOST_INTR_ENABLE: s->regs[addr] =3D val32; break; case IBEX_SPI_HOST_INTR_TEST: @@ -495,7 +505,27 @@ static void ibex_spi_host_write(void *opaque, hwaddr a= ddr, * When an error occurs, the corresponding bit must be cleared * here before issuing any further commands */ - s->regs[addr] =3D val32; + status =3D s->regs[addr]; + /* rw1c status register */ + if (FIELD_EX32(val32, ERROR_STATUS, CMDBUSY)) { + status =3D FIELD_DP32(status, ERROR_STATUS, CMDBUSY, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, OVERFLOW)) { + status =3D FIELD_DP32(status, ERROR_STATUS, OVERFLOW, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, UNDERFLOW)) { + status =3D FIELD_DP32(status, ERROR_STATUS, UNDERFLOW, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, CMDINVAL)) { + status =3D FIELD_DP32(status, ERROR_STATUS, CMDINVAL, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, CSIDINVAL)) { + status =3D FIELD_DP32(status, ERROR_STATUS, CSIDINVAL, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, ACCESSINVAL)) { + status =3D FIELD_DP32(status, ERROR_STATUS, ACCESSINVAL, 0); + } + s->regs[addr] =3D status; break; case IBEX_SPI_HOST_EVENT_ENABLE: /* Controls which classes of SPI events raise an interrupt. */ diff --git a/include/hw/ssi/ibex_spi_host.h b/include/hw/ssi/ibex_spi_host.h index 3fedcb6805..1f6d077766 100644 --- a/include/hw/ssi/ibex_spi_host.h +++ b/include/hw/ssi/ibex_spi_host.h @@ -40,7 +40,7 @@ OBJECT_CHECK(IbexSPIHostState, (obj), TYPE_IBEX_SPI_HOST) =20 /* SPI Registers */ -#define IBEX_SPI_HOST_INTR_STATE (0x00 / 4) /* rw */ +#define IBEX_SPI_HOST_INTR_STATE (0x00 / 4) /* rw1c */ #define IBEX_SPI_HOST_INTR_ENABLE (0x04 / 4) /* rw */ #define IBEX_SPI_HOST_INTR_TEST (0x08 / 4) /* wo */ #define IBEX_SPI_HOST_ALERT_TEST (0x0c / 4) /* wo */ @@ -54,7 +54,7 @@ #define IBEX_SPI_HOST_TXDATA (0x28 / 4) =20 #define IBEX_SPI_HOST_ERROR_ENABLE (0x2c / 4) /* rw */ -#define IBEX_SPI_HOST_ERROR_STATUS (0x30 / 4) /* rw */ +#define IBEX_SPI_HOST_ERROR_STATUS (0x30 / 4) /* rw1c */ #define IBEX_SPI_HOST_EVENT_ENABLE (0x34 / 4) /* rw */ =20 /* FIFO Len in Bytes */ --=20 2.37.2 From nobody Sun May 12 06:53:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=quarantine dis=quarantine) header.from=opensource.wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1661236164425135.62634792318886; Mon, 22 Aug 2022 23:29:24 -0700 (PDT) Received: from localhost ([::1]:42696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQNPe-0000RZ-NP for importer@patchew.org; Tue, 23 Aug 2022 02:29:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQN9p-0008HQ-7k for qemu-devel@nongnu.org; Tue, 23 Aug 2022 02:13:01 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:25193) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQN9n-0000l6-55 for qemu-devel@nongnu.org; Tue, 23 Aug 2022 02:13:00 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 23 Aug 2022 14:12:56 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 22 Aug 2022 22:28:16 -0700 Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 22 Aug 2022 23:12:58 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4MBf6L1D8Jz1Rwnl for ; Mon, 22 Aug 2022 23:12:58 -0700 (PDT) Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id q-bewjKMSstS for ; Mon, 22 Aug 2022 23:12:57 -0700 (PDT) Received: from localhost.localdomain (unknown [10.225.165.40]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4MBf6G6Sbmz1RtVk; Mon, 22 Aug 2022 23:12:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1661235177; x=1692771177; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pKcENyi+KrJBbejZ9NVBAhqC+/2XPVYWc3tv7k6K+3A=; b=DsxsAv+3LkGB6Wow0S/iA3EP1YlWpn3WcJCZjVUpWolae2S8/7nBjDca WPhwKLZwDeItZN6lFN4QYmbZEcvx6RfuxhoBByjdEpIs5feurA6Co2RKG GI5MnoFK9pVU9MBCSOFnyinxcgpFWrNi1DO5h52fjIOZtDcUszhKR0GEB 5FV62EMDZ2V/l6futtQkoqOArMnCo1wMDBGrgBhm/ZXGQ1NA8UV81Hc/5 4yOaGR8jn0V/ZW3u+U+1EZ8MLYIdS9tgN609tfskBlyTd0yLxAvX7/if9 alOCvkuL2wtfD+nBEoaHjVwxj9eOO5M3Kz5+DMddhGluFs2bsQj0CRwQY Q==; X-IronPort-AV: E=Sophos;i="5.93,256,1654531200"; d="scan'208";a="209393018" IronPort-SDR: 16FLQRxsGwyKDsNH8vEdCiS4gBv+hI+niDUmwZIFoWqBo3nKq3fQjK48+F5ie0WR5ej1u2DE4n lC8Jv6fjGeiUeacUVBaNcXOahfH90L/lr5apn41OkLdHOylCT/PlEINzxL64zppmUp5sKctDNp qCxlXhvRCYAwb3zHdLfqF4oczAJioEhQqhDXEQmmGZ/ekrQZFN8WD75jYmI1h3/RpwYNwk9Aty HyCeC/LDP0DxhyzRhY2uGI2Lg0JbdnKdqR9tQaVjWYDbla8zifrhLvVtD3VCT+OhfXP+H0Rw8B jYXaQVj5Uo1rRJ/uAVwQasYw IronPort-SDR: gcxr2jss61xNPLDLsD1egfvy73J8wcSHP1EWrsHUJOD2tkslrBbRtjHGubbHZpi7fRhU6u0IZk 7EAnWnMi6t2LVMQ5WVtX5Fi9s79GVoiI2Wt31ni4KJT2wyhoBK8/BMn+LxkMePZ5yDxBiYO2C2 2eVtBjkelWcMB99cLpwLl1WFrIbWyksvtDf4XavSdGuLDgpteyrNC4TuJUyML8FW2rsxBwqOPt OzHATWTRQjFzcBfLJe7h0M+Btkkjrfb1Z4jYq+bN1H9+ynioGmnBaQV+n2RysvmCzvxJPJhjyN abI= WDCIronportException: Internal Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1661235177; x=1663827178; bh=pKcENyi+KrJBbejZ9N VBAhqC+/2XPVYWc3tv7k6K+3A=; b=rLs2zzoxjxkjAC+8893rCg9un0JdCNaeAx sR464uerRsnDaRxZbqF+80P/ZJBWU4m94IBijB6RlZxxQh9NUIqNN98K90cKvvtJ AR4mcYdvN6AM/gqCmGn+q+vx7e46w7MB9P4KZ10e6tiffyTXQdhGKVCAtEXSEcdt Q4/mBFCCPzlifdiFFRoqGLdcOVKyceBNM5VDGYEu1KZLJ6R2moIuSqnPfcgA0fdJ e54eASS4oDs5oUDVlv5c8zUoOHvfBJOexsaMhY6N/DNzwGC8Lapc+WpzfLCWUnT7 Kri3yO8eOphhpKySuSdoIii0b0BEMEz6giWfzQIoUAbI9oyV4j4Q== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com From: Wilfred Mallawa To: Alistair.Francis@wdc.com, qemu-riscv@nongnu.org Cc: qemu-devel@nongnu.org, Wilfred Mallawa , Alistair Francis Subject: [PATCH v4 4/4] hw/ssi: ibex_spi: update reg addr Date: Tue, 23 Aug 2022 16:12:04 +1000 Message-Id: <20220823061201.132342-5-wilfred.mallawa@opensource.wdc.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823061201.132342-1-wilfred.mallawa@opensource.wdc.com> References: <20220823061201.132342-1-wilfred.mallawa@opensource.wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.71.153.144; envelope-from=prvs=2270691b0=wilfred.mallawa@opensource.wdc.com; helo=esa5.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-ZM-MESSAGEID: 1661236165528100001 Content-Type: text/plain; charset="utf-8" From: Wilfred Mallawa Updates the `EVENT_ENABLE` register to offset `0x34` as per OpenTitan spec [1]. [1] https://docs.opentitan.org/hw/ip/spi_host/doc/#Reg_event_enable Signed-off-by: Wilfred Mallawa Reviewed-by: Alistair Francis --- hw/ssi/ibex_spi_host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index 40d401ad47..0becad34e0 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -93,7 +93,7 @@ REG32(ERROR_STATUS, 0x30) FIELD(ERROR_STATUS, CMDINVAL, 3, 1) FIELD(ERROR_STATUS, CSIDINVAL, 4, 1) FIELD(ERROR_STATUS, ACCESSINVAL, 5, 1) -REG32(EVENT_ENABLE, 0x30) +REG32(EVENT_ENABLE, 0x34) FIELD(EVENT_ENABLE, RXFULL, 0, 1) FIELD(EVENT_ENABLE, TXEMPTY, 1, 1) FIELD(EVENT_ENABLE, RXWM, 2, 1) --=20 2.37.2