From nobody Tue Feb 10 06:08:20 2026 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