From patchwork Wed Aug 10 23:01:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilfred Mallawa X-Patchwork-Id: 1665385 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=pw0BOsvv; dkim=pass (2048-bit key; unprotected) header.d=opensource.wdc.com header.i=@opensource.wdc.com header.a=rsa-sha256 header.s=dkim header.b=i/8xA+up; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M37nF6X5Wz9s5W for ; Thu, 11 Aug 2022 11:02:09 +1000 (AEST) Received: from localhost ([::1]:49258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLwaN-0003x9-Ti for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2022 21:02:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLuim-0000aq-MP for qemu-devel@nongnu.org; Wed, 10 Aug 2022 19:02:40 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:32574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLuiZ-0004Qd-G0 for qemu-devel@nongnu.org; Wed, 10 Aug 2022 19:02:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1660172547; x=1691708547; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0vdSw+Rdt9Z/Qr6KlA7e9PvKVitzNyAkTLtTd92Pti8=; b=pw0BOsvvBkPMFQFozs4+v8M1t1lw6+2nLIttyiR8Gm60yVTeoR295lm1 l6qmDwuRSFj/TBBxYHubL07NY6NcOklKsXI435+Ca85F92pCag8b1wpNm t88H0xRZwHWVoay0KKfSb32KNwWybLYrNx1ElR41Ga7NxMxT8lVB1NNk2 zSOdnqh3V9b9yhPlcNfhXbtviiwbVOty3qsByeJOlQ0Bz6zX1FIbE6SOM JzcR47FA8nFnQpbzR8i2waDMToSHGJ/ptwZF7AcImgx3R+gAO3Tw50uld zmkmr+nrbSdArw7A3YBmz7Jmv1lAjBkiLaux8iWCsCeDnXgt1u2qlRAeb g==; X-IronPort-AV: E=Sophos;i="5.93,228,1654531200"; d="scan'208";a="320480951" 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; 11 Aug 2022 07:02:09 +0800 IronPort-SDR: jPziFc8HstvAy76dfIUPTNRiGBXkR6h064H87/Wn1kFAIlHLo2+g+I6wMa9auUyi2/4Wputik3 6ckUCLAuyHvodvapyHhA1I/ZdWWRQukxS+VPfbN15U1aqXkEmOcTEnczfXtg99tfxSCjVRUUJ2 U08/8VFbYUdFiRMdFavodFmUFexDLGVUCkf4K7qZpiaJV7RIMuENsebRzuiCguuktoYWSmprSf Nqhc4QMcFzygSFJ18UKLjL8pGiqX+Fj4euSE78SUdchw3MbjaTcO0Q9eGNUxj7lFG4ZR9JRXTc fjiZXqjobL4Kvq1WJmujfBs+ Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 10 Aug 2022 15:17:44 -0700 IronPort-SDR: SfpCy0MjV19YZcFbF+IwN3j4z6k1nU/klWNWnT8r/lhaDQiSu/fwsOK86PU7vLx0VVTD3C7VNU JhetPJ6MIBU3KnmBoLB215NafqcJlgTs4wt/DUtYlfVBLzldDxxSVRdH4nHZuMgodJybGmXZB9 Er2yEgzjyIEAxkEf7j8SAI2aySOXCPfT3VDm1Tm7iVxvmk0FvEARu9qJ7Z4PhbyM8aIoegihNJ 9j/ndndQDHp02aThIJoDKb2EAAFWtLusUfImu6tYSHnpyKeYNvDOAAPHJFMRU8OenIBuOnedVy AS0= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 10 Aug 2022 16:02:10 -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 4M356n05T2z1Rwnm for ; Wed, 10 Aug 2022 16:02:08 -0700 (PDT) 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 :x-mailer:message-id:date:subject:to:from; s=dkim; t=1660172528; x=1662764529; bh=0vdSw+Rdt9Z/Qr6KlA7e9PvKVitzNyAkTLtTd92Pti8=; b= i/8xA+upysNEOc5sQQUo85qlcTP0xNipSOlaHJox1z2/N+8HSVy6NAknI1x2wKw3 Od/4EDFACkzTM0mB4gEkXO6pko3pl0vrAgDQUTOFKt0gi+CoURih51LZojBBhnfi 7RnVBzX8ktf6HHnXWgm5ZMTEN0zTkjQ/CzZPSMN60w6MhCMcP+1XaqcaJH2wJX3A 0tzjzwtsjIq7pFvm5NQoc5kodG37/whT9kYPxNlqyRnAfPI5JxVv+BaIfDYQEgP7 MZruFIDsrutVHEkflfENn2BhaiZUXP1RkFR387HsY2vqiDO5/kGc15OxAmnNeXSM KuH5Iq/IrvI008mAn+9vBw== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com 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 7QtH_BRG1Rbt for ; Wed, 10 Aug 2022 16:02:08 -0700 (PDT) Received: from fedora.home (unknown [10.225.165.24]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4M356k32lYz1RtVk; Wed, 10 Aug 2022 16:02:05 -0700 (PDT) From: Wilfred Mallawa To: Alistair.Francis@wdc.com, qemu-riscv@nongnu.org Cc: qemu-devel@nongnu.org, Wilfred Mallawa Subject: [PATCH 1/3] hw/ssi: fixup typos in ibex_spi_host Date: Thu, 11 Aug 2022 09:01:58 +1000 Message-Id: <20220810230200.149398-1-wilfred.mallawa@opensource.wdc.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Received-SPF: pass client-ip=68.232.141.245; envelope-from=prvs=2146f6254=wilfred.mallawa@opensource.wdc.com; helo=esa1.hgst.iphmx.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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-Mailman-Approved-At: Wed, 10 Aug 2022 20:58:23 -0400 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 = 0, event_irq = 0; - /* 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 addr, 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 = false; @@ -487,7 +487,7 @@ static void ibex_spi_host_write(void *opaque, hwaddr addr, 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 */ From patchwork Wed Aug 10 23:02:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilfred Mallawa X-Patchwork-Id: 1665384 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=Pqw4dNAl; dkim=pass (2048-bit key; unprotected) header.d=opensource.wdc.com header.i=@opensource.wdc.com header.a=rsa-sha256 header.s=dkim header.b=oKwrqMnz; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M37kr3VsXz9s5W for ; Thu, 11 Aug 2022 11:00:03 +1000 (AEST) Received: from localhost ([::1]:45686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLwYJ-0001Rr-B8 for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2022 20:59:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLuiw-0000dk-Qq for qemu-devel@nongnu.org; Wed, 10 Aug 2022 19:02:50 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:4527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLuit-0004SW-Ac for qemu-devel@nongnu.org; Wed, 10 Aug 2022 19:02:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1660172565; x=1691708565; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bJEhpj9iCpmqZwzHRzxHSu1nlyr9NSdi6/fTLMOczEs=; b=Pqw4dNAldenCOBVjoGWDazpzmpFsQobiZfEOFRTH9D91Ox10aV4I0dPs qJ1t/xqk8v2qnY6Gn42bUwjBVB546M5onAeyZwBVtXB+oTjbOVE/obUki A7fQLzPcvJiYtzEJCpgLk/Tr67KyKAGNrFCKLPeWdJcTVms28wMgamHcK MB/w35E5rt5c1NbxVw2dDiTGOsIneon6I6Fkcyx0yy0j7wtQCA9T/5TRq pzGFT8yQQ49YvH+3hIbbr5VVuaTj6xAYHqeS2dNYBxO/+vhCw4omVIPnq Ds65DnZKLNdfe0iDEy+TDEoNuMNk6lSXjf7ShM98Ks5NgV81npvoQHZ6w A==; X-IronPort-AV: E=Sophos;i="5.93,228,1654531200"; d="scan'208";a="208385269" 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; 11 Aug 2022 07:02:41 +0800 IronPort-SDR: RPWp8w1lp51et9f26WCZkDwVyf4WOYR2WB7u8Ok9WJ1Ec+dFDfO4LHuv0u/R+1Knf8Jfm+xc48 JpzGjlJtmJKusI+c08tdmvTUcqdrm8kgzr3FPI1GaVXXNhBHanBOK7mC1nB0+47Et0hbWK9cmC /aDJKOt9LAGxy+v9FKWA2RD0PL19+VfGcRndzbQYxQyKFd2lUwclLrBBmWjR8YbDpZ1UlnQA1x Tt0QsPxoT2xvo1Vch/kJIpqZikazQoMoZ39qMMyhaBrRMt+wz11q79odp66mWgG5AbcRGIKxLI 1TJ2nxos28iWjd3nqyc4Z85c Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 10 Aug 2022 15:18:17 -0700 IronPort-SDR: SV10BS5ELeUrrEn6znm7czwbv63a20Tf6luqLfy804UUw3rSPZxpxIzbjvmcnyXEDyIj6QsJJ1 JQ14q87qPz72Odx1tkPliof0VLLGVZYgCf0yGLEkqsn33Or6PqCLvkCWiwgPJ9nDqR7AYaDX8S CqEzKah8twiYDhxEQQ7cMNC2hTRY/7+pCg5+AFXdcjap0E7urw9w7g8jK5f4oI5YT2dH0YiAxk tCSdBVZ29nEk/Ynwb31pUbQVoNMV5YTQ3uAvXajtg3W5oJjtBSrSasc/Pt8Dsvou76h7lVTnsE ggo= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 10 Aug 2022 16:02:43 -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 4M357P4z7Fz1Rw4L for ; Wed, 10 Aug 2022 16:02:41 -0700 (PDT) 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=1660172560; x=1662764561; bh=bJEhpj9iCpmqZwzHRz xHSu1nlyr9NSdi6/fTLMOczEs=; b=oKwrqMnz672Tr/SYOfighhiE7zswrSnFqZ OSPBp3fJonMgAplEm26gGdJ3qORa+RTAr1SF+qcuddJkDhyk/dQ0FYsHcC+Auro0 Ffh50TZsulfCLDXwuZ2SNXCbU/ix9OhEU3G27mcTf9Pb64DsmN1H/mZ8lSJDsNP5 lsIVS5aUMasxN1r/zwrqKIMYiJy74KD170kzZcswYJo1AxrAWZGt/LYw3V9bvSgz K47xAZoVD80gXXnUcGp+C2P+hrpfb4t0VFAhjah2Eh+g1O+u+u9/jqt+Zqa9WPft 4u3yQDucjncnyvWIUTEW8xM0QtTa53/K/5GcyZ1Nhex6t9hKtvFA== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com 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 UGZ7tsx0StBC for ; Wed, 10 Aug 2022 16:02:40 -0700 (PDT) Received: from fedora.home (unknown [10.225.165.24]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4M357L5JRNz1RtVk; Wed, 10 Aug 2022 16:02:38 -0700 (PDT) From: Wilfred Mallawa To: Alistair.Francis@wdc.com, qemu-riscv@nongnu.org Cc: qemu-devel@nongnu.org, Wilfred Mallawa Subject: [PATCH 2/3] hw/ssi: fixup coverity issue Date: Thu, 11 Aug 2022 09:02:00 +1000 Message-Id: <20220810230200.149398-2-wilfred.mallawa@opensource.wdc.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220810230200.149398-1-wilfred.mallawa@opensource.wdc.com> References: <20220810230200.149398-1-wilfred.mallawa@opensource.wdc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.153.144; envelope-from=prvs=2146f6254=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, UPPERCASE_50_75=0.008 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 10 Aug 2022 20:58:24 -0400 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. Additionally, the `EVENT_ENABLE` register is correctly updated to addr of `0x34`. [1] https://www.mail-archive.com/qemu-devel@nongnu.org/msg887713.html Fixes: Coverity CID 1488107 Signed-off-by: Wilfred Mallawa --- hw/ssi/ibex_spi_host.c | 141 +++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 63 deletions(-) diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index 601041d719..8c35bfa95f 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) @@ -108,18 +108,20 @@ static inline uint8_t div4_round_up(uint8_t dividend) static void ibex_spi_rxfifo_reset(IbexSPIHostState *s) { + uint32_t data = s->regs[IBEX_SPI_HOST_STATUS]; /* Empty the RX FIFO and assert RXEMPTY */ fifo8_reset(&s->rx_fifo); - s->regs[IBEX_SPI_HOST_STATUS] &= ~R_STATUS_RXFULL_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |= R_STATUS_RXEMPTY_MASK; + data = FIELD_DP32(data, STATUS, RXEMPTY, 1); + s->regs[IBEX_SPI_HOST_STATUS] = data; } static void ibex_spi_txfifo_reset(IbexSPIHostState *s) { + uint32_t data = s->regs[IBEX_SPI_HOST_STATUS]; /* Empty the TX FIFO and assert TXEMPTY */ fifo8_reset(&s->tx_fifo); - s->regs[IBEX_SPI_HOST_STATUS] &= ~R_STATUS_TXFULL_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |= R_STATUS_TXEMPTY_MASK; + data = FIELD_DP32(data, STATUS, TXEMPTY, 1); + s->regs[IBEX_SPI_HOST_STATUS] = data; } static void ibex_spi_host_reset(DeviceState *dev) @@ -162,37 +164,41 @@ static void ibex_spi_host_reset(DeviceState *dev) */ static void ibex_spi_host_irq(IbexSPIHostState *s) { - bool error_en = s->regs[IBEX_SPI_HOST_INTR_ENABLE] - & R_INTR_ENABLE_ERROR_MASK; - bool event_en = s->regs[IBEX_SPI_HOST_INTR_ENABLE] - & R_INTR_ENABLE_SPI_EVENT_MASK; - bool err_pending = s->regs[IBEX_SPI_HOST_INTR_STATE] - & R_INTR_STATE_ERROR_MASK; - bool status_pending = s->regs[IBEX_SPI_HOST_INTR_STATE] - & R_INTR_STATE_SPI_EVENT_MASK; + bool error_en = FIELD_EX32(s->regs[IBEX_SPI_HOST_INTR_ENABLE], + INTR_ENABLE, ERROR); + + bool event_en = FIELD_EX32(s->regs[IBEX_SPI_HOST_INTR_ENABLE], + INTR_ENABLE, SPI_EVENT); + + bool err_pending = FIELD_EX32(s->regs[IBEX_SPI_HOST_INTR_STATE], + INTR_STATE, ERROR); + + bool status_pending = FIELD_EX32(s->regs[IBEX_SPI_HOST_INTR_STATE], + INTR_STATE, SPI_EVENT); + int err_irq = 0, event_irq = 0; /* 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(s->regs[IBEX_SPI_HOST_INTR_TEST], INTR_TEST, ERROR)) { err_irq = 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(s->regs[IBEX_SPI_HOST_ERROR_ENABLE], + ERROR_ENABLE, CMDBUSY) && + FIELD_EX32(s->regs[IBEX_SPI_HOST_ERROR_STATUS], + ERROR_STATUS, CMDBUSY)) { /* Wrote to COMMAND when not READY */ err_irq = 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(s->regs[IBEX_SPI_HOST_ERROR_ENABLE], + ERROR_ENABLE, CMDINVAL) && + FIELD_EX32(s->regs[IBEX_SPI_HOST_ERROR_STATUS], + ERROR_STATUS, CMDINVAL)) { /* Invalid command segment */ err_irq = 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(s->regs[IBEX_SPI_HOST_ERROR_ENABLE], + ERROR_ENABLE, CSIDINVAL) && + FIELD_EX32(s->regs[IBEX_SPI_HOST_ERROR_STATUS], + ERROR_STATUS, CSIDINVAL)) { /* Invalid value for CSID */ err_irq = 1; } @@ -204,22 +210,26 @@ static void ibex_spi_host_irq(IbexSPIHostState *s) /* 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(s->regs[IBEX_SPI_HOST_INTR_TEST], + INTR_STATE, SPI_EVENT)) { /* Event enabled, Interrupt Test Event */ event_irq = 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(s->regs[IBEX_SPI_HOST_EVENT_ENABLE], + EVENT_ENABLE, READY) && + FIELD_EX32(s->regs[IBEX_SPI_HOST_STATUS], + STATUS, READY)) { /* SPI Host ready for next command */ event_irq = 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(s->regs[IBEX_SPI_HOST_EVENT_ENABLE], + EVENT_ENABLE, TXEMPTY) && + FIELD_EX32(s->regs[IBEX_SPI_HOST_STATUS], + STATUS, TXEMPTY)) { /* SPI TXEMPTY, TXFIFO drained */ event_irq = 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(s->regs[IBEX_SPI_HOST_EVENT_ENABLE], + EVENT_ENABLE, RXFULL) && + FIELD_EX32(s->regs[IBEX_SPI_HOST_STATUS], + STATUS, RXFULL)) { /* SPI RXFULL, RXFIFO full */ event_irq = 1; } @@ -232,10 +242,11 @@ static void ibex_spi_host_irq(IbexSPIHostState *s) 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 = ((s->regs[IBEX_SPI_HOST_COMMAND] & R_COMMAND_LEN_MASK) - >> R_COMMAND_LEN_SHIFT); + uint8_t segment_len = 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 +273,23 @@ static void ibex_spi_host_transfer(IbexSPIHostState *s) --segment_len; } + data = s->regs[IBEX_SPI_HOST_STATUS]; /* Assert Ready */ - s->regs[IBEX_SPI_HOST_STATUS] |= R_STATUS_READY_MASK; + data = FIELD_DP32(data, STATUS, READY, 1); /* Set RXQD */ - s->regs[IBEX_SPI_HOST_STATUS] &= ~R_STATUS_RXQD_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |= (R_STATUS_RXQD_MASK - & div4_round_up(segment_len)); + data = FIELD_DP32(data, STATUS, RXQD, div4_round_up(segment_len)); /* Set TXQD */ - s->regs[IBEX_SPI_HOST_STATUS] &= ~R_STATUS_TXQD_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |= (fifo8_num_used(&s->tx_fifo) / 4) - & R_STATUS_TXQD_MASK; + data = FIELD_DP32(data, STATUS, TXQD, fifo8_num_used(&s->tx_fifo) / 4); /* Clear TXFULL */ - s->regs[IBEX_SPI_HOST_STATUS] &= ~R_STATUS_TXFULL_MASK; - /* Assert TXEMPTY and drop remaining bytes that exceed segment_len */ - ibex_spi_txfifo_reset(s); + data = FIELD_DP32(data, STATUS, TXFULL, 0); /* Reset RXEMPTY */ - s->regs[IBEX_SPI_HOST_STATUS] &= ~R_STATUS_RXEMPTY_MASK; + data = FIELD_DP32(data, STATUS, RXEMPTY, 0); + /* Set TXEMPTY */ + data = FIELD_DP32(data, STATUS, TXEMPTY, 1); + /* Drop remaining bytes that exceed segment_len */ + ibex_spi_txfifo_reset(s); + /* Update register status */ + s->regs[IBEX_SPI_HOST_STATUS] = data; ibex_spi_host_irq(s); } @@ -340,7 +352,7 @@ static void ibex_spi_host_write(void *opaque, hwaddr addr, { IbexSPIHostState *s = opaque; uint32_t val32 = val64; - uint32_t shift_mask = 0xff; + uint32_t shift_mask = 0xff, data; uint8_t txqd_len; trace_ibex_spi_host_write(addr, size, val64); @@ -397,21 +409,23 @@ static void ibex_spi_host_write(void *opaque, hwaddr addr, s->regs[addr] = val32; /* 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; } /* 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] |= R_ERROR_STATUS_CMDBUSY_MASK; ibex_spi_host_irq(s); return; } + /* Assert Not Ready */ s->regs[IBEX_SPI_HOST_STATUS] &= ~R_STATUS_READY_MASK; - if (((val32 & R_COMMAND_DIRECTION_MASK) >> R_COMMAND_DIRECTION_SHIFT) - != BIDIRECTIONAL_TRANSFER) { + if (FIELD_EX32(val32, COMMAND, DIRECTION) != BIDIRECTIONAL_TRANSFER) { qemu_log_mask(LOG_UNIMP, "%s: Rx Only/Tx Only are not supported\n", __func__); } @@ -452,8 +466,8 @@ static void ibex_spi_host_write(void *opaque, hwaddr addr, return; } /* Byte ordering is set by the IP */ - if ((s->regs[IBEX_SPI_HOST_STATUS] & - R_STATUS_BYTEORDER_MASK) == 0) { + if (FIELD_EX32(s->regs[IBEX_SPI_HOST_STATUS], STATUS, + BYTEORDER) == 0) { /* LE: LSB transmitted first (default for ibex processor) */ shift_mask = 0xff << (i * 8); } else { @@ -465,17 +479,18 @@ static void ibex_spi_host_write(void *opaque, hwaddr addr, fifo8_push(&s->tx_fifo, (val32 & shift_mask) >> (i * 8)); } + data = s->regs[IBEX_SPI_HOST_STATUS]; /* Reset TXEMPTY */ - s->regs[IBEX_SPI_HOST_STATUS] &= ~R_STATUS_TXEMPTY_MASK; + data = FIELD_DP32(data, STATUS, TXEMPTY, 0); /* Update TXQD */ - txqd_len = (s->regs[IBEX_SPI_HOST_STATUS] & - R_STATUS_TXQD_MASK) >> R_STATUS_TXQD_SHIFT; + txqd_len = FIELD_EX32(s->regs[IBEX_SPI_HOST_STATUS], STATUS, TXQD); /* Partial bytes (size < 4) are padded, in words. */ txqd_len += 1; - s->regs[IBEX_SPI_HOST_STATUS] &= ~R_STATUS_TXQD_MASK; - s->regs[IBEX_SPI_HOST_STATUS] |= txqd_len; + data = FIELD_DP32(data, STATUS, TXQD, txqd_len); /* Assert Ready */ - s->regs[IBEX_SPI_HOST_STATUS] |= R_STATUS_READY_MASK; + data = FIELD_DP32(data, STATUS, READY, 1); + /* Update register status */ + s->regs[IBEX_SPI_HOST_STATUS] = data; break; case IBEX_SPI_HOST_ERROR_ENABLE: s->regs[addr] = val32; From patchwork Wed Aug 10 23:02:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilfred Mallawa X-Patchwork-Id: 1665386 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=H7qC3WYF; dkim=pass (2048-bit key; unprotected) header.d=opensource.wdc.com header.i=@opensource.wdc.com header.a=rsa-sha256 header.s=dkim header.b=FyJ+dL72; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M37v420xrz9s5W for ; Thu, 11 Aug 2022 11:07:10 +1000 (AEST) Received: from localhost ([::1]:54310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLwfD-0007Q1-9t for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2022 21:07:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLujN-0000iZ-4C for qemu-devel@nongnu.org; Wed, 10 Aug 2022 19:03:17 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:57412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLujJ-0004Wb-PM for qemu-devel@nongnu.org; Wed, 10 Aug 2022 19:03:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1660172593; x=1691708593; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=v4byzCh+jC3Z/dV9ZzTitk+VpmQdpEtuAKDzahjmZ+M=; b=H7qC3WYFsG5ihBrM22TV2bDA7OFmZIM5i5cn4fUgFJJnTylH8SIP9iuV dDcE+mCU/JrtOuTZnjumFpSn7RTkkkz8ul1hEy5Vu2IToMC3fmylIbp4Y 1Db17y4aKtlxARYD+mi+F8nYbsyUdb/h9ZnNZMotTqSrpVo9bV0spX3ku DP4X1iy1kv+Zzs7OLo6hKeQFenZsrTec6uDwGcpglGqfiCZodSO2sPorW OSS1S0R6VkXZD+2X6kiFtPNI2BU6gdjsZd8Pa7Wt/tMxS6YYXv6JvM+D7 /Q6DOQN5ih+lgZgzEzlYrlb0/Kuk48bk1JxeG65QDtxjzhJfKydroLHii g==; X-IronPort-AV: E=Sophos;i="5.93,228,1654531200"; d="scan'208";a="312669200" 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; 11 Aug 2022 07:03:03 +0800 IronPort-SDR: SckTQp1OI0YmJ03SUVxRHGLW7Uwn7zyAfUeJ7+9UfbYoCVFR+ZxUXW4CSsifgOCxudWbHpb1du bIPp3V7xDsHM1wlzVE2Ak2dkREWmDpdnNsR+PTiH4IZZoi7/6k5psShcGkzb/grCg58yz+2ky/ xtwe1yKYqKZittF3Riveqii43WqBm1ktiEACotpyHlMuYKs3u0/oyKSTaahB2piXJIjJgtslK7 H0JKLRkwafCkjucc/tQueIqMX8EgfNSd/iBIttbE/VwOOfd3eExEyFtsCKiV4VCOr9aL/qeKaB b8FwM8HLwiHwxDDBpJ3h81u2 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 10 Aug 2022 15:18:38 -0700 IronPort-SDR: fDVoCH1qQtxXbNLzbl4rL+L54uU08e2HgfL6dW+XpHlKrSlCghak2ha3ZRkSW7l7mtICwg/PYV KXHwXuZo5Hts9fiekWUnXBw0HoNV3ikJzZOJ93NaVsTN38TeqRtXG2zqCpcVLuhGVvZSoq6syq YLEfSx3bVGv/4iQKXXAhPjK/L6/I7VfZNaiPBzcCy640hQ1uTyI4YT1DLT67glpacvQehIWu8m 6e0jr1GtYvSBXA8SkABxVdrQB9zOBpWIfcAGNoVev3otCLKFvpSabYxdhMscltFUoFHRxERKrH 0y0= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 10 Aug 2022 16:03:04 -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 4M357p6LV6z1Rw4L for ; Wed, 10 Aug 2022 16:03:02 -0700 (PDT) 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=1660172582; x=1662764583; bh=v4byzCh+jC3Z/dV9Zz Titk+VpmQdpEtuAKDzahjmZ+M=; b=FyJ+dL72ivLTtkOUs6bmudVHDWZi8W1tbp l5pXqrANq0z+oLYsPKJWk5a15Zh5S4hiq3Z4C1+e73VUzGb8Jtw5HGI8zplOe6Wz 5DDFyy3lZ+tqFXbWcms8r1j/4fajPnPEtSCT2lyrfRNk9RmTbNse7zT9ixZyj+Cq WNE5oveZA+HptPsuSdVDBWM/y4VkraHY8UnVviM/PwVACcr6btuV6eomZNA5Mnh9 Ab35FyKOg3ayIaNQWfxHAMGAm+TDn9Ks2iGtzXj6EStVveNVfZvda/lovFr0cSWx gXa6jwTneFUGSUMjRYhcOZbKdlaIOwyre1mtw2HuJRue4JTc39fg== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com 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 Q4jtrcLYh2mr for ; Wed, 10 Aug 2022 16:03:02 -0700 (PDT) Received: from fedora.home (unknown [10.225.165.24]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4M357m4gxLz1RtVk; Wed, 10 Aug 2022 16:03:00 -0700 (PDT) From: Wilfred Mallawa To: Alistair.Francis@wdc.com, qemu-riscv@nongnu.org Cc: qemu-devel@nongnu.org, Wilfred Mallawa Subject: [PATCH 3/3] hw/ssi: fixup/add rw1c functionality Date: Thu, 11 Aug 2022 09:02:02 +1000 Message-Id: <20220810230200.149398-3-wilfred.mallawa@opensource.wdc.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220810230200.149398-1-wilfred.mallawa@opensource.wdc.com> References: <20220810230200.149398-1-wilfred.mallawa@opensource.wdc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=68.232.143.124; envelope-from=prvs=2146f6254=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=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 10 Aug 2022 20:58:24 -0400 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 | 36 +++++++++++++++++++++++++++++++--- include/hw/ssi/ibex_spi_host.h | 4 ++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index 8c35bfa95f..935372506c 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -352,7 +352,7 @@ static void ibex_spi_host_write(void *opaque, hwaddr addr, { IbexSPIHostState *s = opaque; uint32_t val32 = val64; - uint32_t shift_mask = 0xff, data; + uint32_t shift_mask = 0xff, data = 0; uint8_t txqd_len; trace_ibex_spi_host_write(addr, size, val64); @@ -362,7 +362,17 @@ static void ibex_spi_host_write(void *opaque, hwaddr addr, 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 = FIELD_DP32(data, INTR_STATE, ERROR, 0); + } + if (FIELD_EX32(val32, INTR_STATE, SPI_EVENT)) { + data = FIELD_DP32(data, INTR_STATE, SPI_EVENT, 0); + } + s->regs[addr] = data; + break; + case IBEX_SPI_HOST_INTR_ENABLE: s->regs[addr] = val32; break; case IBEX_SPI_HOST_INTR_TEST: @@ -506,7 +516,27 @@ static void ibex_spi_host_write(void *opaque, hwaddr addr, * When an error occurs, the corresponding bit must be cleared * here before issuing any further commands */ - s->regs[addr] = val32; + data = s->regs[addr]; + /* rw1c status register */ + if (FIELD_EX32(val32, ERROR_STATUS, CMDBUSY)) { + data = FIELD_DP32(data, ERROR_STATUS, CMDBUSY, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, OVERFLOW)) { + data = FIELD_DP32(data, ERROR_STATUS, OVERFLOW, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, UNDERFLOW)) { + data = FIELD_DP32(data, ERROR_STATUS, UNDERFLOW, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, CMDINVAL)) { + data = FIELD_DP32(data, ERROR_STATUS, CMDINVAL, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, CSIDINVAL)) { + data = FIELD_DP32(data, ERROR_STATUS, CSIDINVAL, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, ACCESSINVAL)) { + data = FIELD_DP32(data, ERROR_STATUS, ACCESSINVAL, 0); + } + s->regs[addr] = data; 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) /* 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) #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 */ /* FIFO Len in Bytes */