From patchwork Fri Sep 30 03:32:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilfred Mallawa X-Patchwork-Id: 12994862 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id F20FDC433FE for ; Fri, 30 Sep 2022 03:38:42 +0000 (UTC) Received: from localhost ([::1]:60948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oe6rK-0008NG-4i for qemu-devel@archiver.kernel.org; Thu, 29 Sep 2022 23:38:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oe6mh-00044h-BJ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 23:33:55 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:4397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oe6mf-0001d5-Mu for qemu-devel@nongnu.org; Thu, 29 Sep 2022 23:33:55 -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=1664508833; x=1696044833; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dk0sp7z3kDPth8yYGVQNx7ek/N0UtJjbzNJ1wI8KZlc=; b=PT1Uecj+gS0KfO3MIBuT0G9ZGRjFOdOK+jMCN9d48lGNCS/bQMI7ijyy YcMmt2ylDRwGWBifcdALEOrBZc8HBsSWPVYV6aan86+/7UYhq1Ktuhy6K BK6mZDzbnIj72CYK/37DQfJK71cKNFHOl2wuaao4R3xaGBUFzuJTDrWiM T82va2UhxOXmJQW6ZAc759ipAx3l7eqiV8If7OCmXNXUZ2MfCLPyNlt4B lYiyXiO2Vh4umRW8znU/seer5nZbsnHRGPMofZ6iD6sJnRy5CCBysWm86 e5+l0jJHNXSqYqX/uVUsWYkjUsfK1aZC9wlnYRYmG65rY2qqVko/1q+ne A==; X-IronPort-AV: E=Sophos;i="5.93,357,1654531200"; d="scan'208";a="210991994" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 30 Sep 2022 11:33:51 +0800 IronPort-SDR: qa0DcZSxXvoOXCe8VEGtOtKT34AVUYPj/yZEEOTPDVwHqq2vi8MIkaYzdRvO2lSBYt1ZBGZ04f iwbJSARkWNzCx4r6iZdpfxS4Yyo2vG2z2mcNfFSWgMZcFyXlWWA2d5WSJrOUuZ/XxRFa3/cAEE 9UvwnvdfIoOa6GOlt+JAjyqrpJUeT+tS5iI6QifvZpcAYgUhdiQX8cugF4+8PjGmGECLClgtiC w6s5COWWCSLIz3ihFsGicypwUVgz1c1J72qxMQaMx8Nw+lfLNwTVXCDJWi0C54Z97ewl10LI8q CZ6Y+YU16PTxfZLHfXA+PSiI 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; 29 Sep 2022 19:53:45 -0700 IronPort-SDR: WvmTJj5aI9NLa2YETdQLl+qmyiOjTeKz4oTnsdjjiN0m+7raOvAPqom0FV4BVZYDMKD4IqN2uA g9Ka2Qv7PrCU1EXuDtmzmlMis5BMBymGYFG0xrn3LWUsymP6l348NGi1Px/GrGI5bVv3Whv7wm gG5mtuOaxmfBlVYoNYxNzhb6Ew2e32Avf33ivOU01BJZWjeM3HcGhJFLnVRJ84YRU6wpMcesNi 0M5VTmfwZb8osI5FJsCBgkr6mvFLHbQMVt4YNJue9qbNbnAsaVsBjOAmRiCSqeaaK2gySLBjjK 0iQ= WDCIronportException: Internal 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; 29 Sep 2022 20:33:52 -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 4MdwnC3tTkz1RwqL for ; Thu, 29 Sep 2022 20:33:51 -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=1664508831; x=1667100832; bh=dk0sp7z3kDPth8yYGV QNx7ek/N0UtJjbzNJ1wI8KZlc=; b=IgFZS+/4a1d4kVQu0fIcZEybm+p+1TvbEv OGhI+4Nxo0n9BLCU9y0q9DYGn4GlWZm4x8C9xY5sOTytPks/p7tI5eCbDs7yOynf YhlrpfU+fCXGDnZwa00xXlHDJa1evZLhpCSJJCGvV3dfYrQ9uTElIc9W+UvrM1gQ B904UHWl2sAJCXKWkUpAN52D1Pn80mtUWzwReUKILrwaIj8IHJB4e9BmNsVUV75D X8hY5BprFGUOsSyZGGd8bYkmpEjEGwjda1X8QUL0x4UaF6Dz5EkpgNu17j5sgAQc OfDe0ShQSxBKjJteIbNIhORQpYRzeWU+hih2zgGG8QWkp8z579tQ== 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 fHfEfkNI9Lyv for ; Thu, 29 Sep 2022 20:33:51 -0700 (PDT) Received: from fedora.wdc.com (unknown [10.225.165.55]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4Mdwn84HxWz1RvLy; Thu, 29 Sep 2022 20:33:48 -0700 (PDT) From: Wilfred Mallawa To: Alistair.Francis@wdc.com, qemu-riscv@nongnu.org Cc: qemu-devel@nongnu.org, Wilfred Mallawa , Alistair Francis Subject: [PATCH v5 2/2] hw/ssi: ibex_spi: fixup/add rw1c functionality Date: Fri, 30 Sep 2022 13:32:44 +1000 Message-Id: <20220930033241.206581-3-wilfred.mallawa@opensource.wdc.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220930033241.206581-1-wilfred.mallawa@opensource.wdc.com> References: <20220930033241.206581-1-wilfred.mallawa@opensource.wdc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=265e2c498=wilfred.mallawa@opensource.wdc.com; helo=esa4.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 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+qemu-devel=archiver.kernel.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 d145a4cdbd..57df462e3c 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -342,7 +342,7 @@ static void ibex_spi_host_write(void *opaque, hwaddr addr, { IbexSPIHostState *s = opaque; uint32_t val32 = val64; - uint32_t shift_mask = 0xff, status = 0; + uint32_t shift_mask = 0xff, status = 0, data = 0; uint8_t txqd_len; trace_ibex_spi_host_write(addr, size, val64); @@ -352,7 +352,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: @@ -495,7 +505,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; + status = s->regs[addr]; + /* rw1c status register */ + if (FIELD_EX32(val32, ERROR_STATUS, CMDBUSY)) { + status = FIELD_DP32(status, ERROR_STATUS, CMDBUSY, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, OVERFLOW)) { + status = FIELD_DP32(status, ERROR_STATUS, OVERFLOW, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, UNDERFLOW)) { + status = FIELD_DP32(status, ERROR_STATUS, UNDERFLOW, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, CMDINVAL)) { + status = FIELD_DP32(status, ERROR_STATUS, CMDINVAL, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, CSIDINVAL)) { + status = FIELD_DP32(status, ERROR_STATUS, CSIDINVAL, 0); + } + if (FIELD_EX32(val32, ERROR_STATUS, ACCESSINVAL)) { + status = FIELD_DP32(status, ERROR_STATUS, ACCESSINVAL, 0); + } + s->regs[addr] = 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) /* 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 */