From nobody Tue Feb 10 02:43:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151173889440823.75353357827703; Sun, 26 Nov 2017 15:28:14 -0800 (PST) Received: from localhost ([::1]:58481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJ6L9-0005Vb-JQ for importer@patchew.org; Sun, 26 Nov 2017 18:27:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJ6AR-0004bh-EG for qemu-devel@nongnu.org; Sun, 26 Nov 2017 18:16:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJ6AQ-0000ue-F0 for qemu-devel@nongnu.org; Sun, 26 Nov 2017 18:16:55 -0500 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:40909) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eJ6AQ-0000uA-7L for qemu-devel@nongnu.org; Sun, 26 Nov 2017 18:16:54 -0500 Received: by mail-lf0-x242.google.com with SMTP id d10so19609169lfj.7 for ; Sun, 26 Nov 2017 15:16:54 -0800 (PST) Received: from localhost.localdomain (host-90-232-123-128.mobileonline.telia.com. [90.232.123.128]) by smtp.gmail.com with ESMTPSA id j63sm2070285lfg.95.2017.11.26.15.16.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Nov 2017 15:16:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NZIX9ijr/ke1XOBvls4KWLy0WjF0A4s/ksWVTWWqYF8=; b=SMM7CP4mNsyJA4Kod2qAOm6qIuIw/OePYbbNuedcEWl/rQTCdmCgSX2D72imiOib/8 MA/vz3feUHcancDGtI7oGX1B73CDfNB2aDUEJiwWXyTFEb7tYT3n8vhfhzC4KzRez8uH U1eIfFo+sHmzKh0eSr4zeoyVLZz1bnm+pYqE+C4gMDb3RLlYU9aB92samxTd0lptV8BQ TQBfDEVp0uLjq/aZBMpsjqmFPm0jr3BBEXZcF5vSFcWP/iblUqtxd12PyfcpcQOErnHr 7yEHIhY2o+mcPEWfkeC+wKsPrOUDvvhYAmEfRAcxnk3dv3eN5Ot7i+iYg9iGYnTXu1xT 65ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NZIX9ijr/ke1XOBvls4KWLy0WjF0A4s/ksWVTWWqYF8=; b=L/s/RkbHdoqoYRdrzYJCfBfHv4ZSQnIFky7mJo+99/xdmykJ/jHCBWJHmJVkDuIj0C khNchiMaqPdkqpXR9DepAAYzBbrJZaYikFi6uoE77mJsMq+2fSB3WfTke8CQggh0+uQ8 mNBRRaGgcpEuGrevzRFtrrla3hcF659/hKabI801OteohI6FfkD62ajhA3tGJEPPzDm+ ktYajQwQQ3o51f9keO+FvfU3PwhQSR3KtoojjowNEbO3jmeSulbpugMn5dYPdXyfjHEw EObMqANb3JiA0zbA4gvxiH+NNgEkTpomKbBMpQAe7CT90yZ68ZbWnS1aAdxVlabWOJjI r4tg== X-Gm-Message-State: AJaThX7c/xQFB/LL8VFf7InDxQrUjjKPAkXEAOt++FumO4HS1P6enDMp qF6OAgRDxvR+LFowTnxEtpjI9w== X-Google-Smtp-Source: AGs4zMbu3FQ1cKHSO1QpgtLdMSPGbVFRpozgfd6L8IjkEEUJwASNr/nFztlK/SOO2OQnzwBevgNnGQ== X-Received: by 10.25.215.139 with SMTP id q11mr3325554lfi.98.1511738212664; Sun, 26 Nov 2017 15:16:52 -0800 (PST) From: Francisco Iglesias To: qemu-devel@nongnu.org Date: Mon, 27 Nov 2017 00:16:30 +0100 Message-Id: <20171126231634.9531-10-frasse.iglesias@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171126231634.9531-1-frasse.iglesias@gmail.com> References: <20171126231634.9531-1-frasse.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::242 Subject: [Qemu-devel] [PATCH v9 09/13] xilinx_spips: Add support for zero pumping X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, francisco.iglesias@feimtech.se, f4bug@amsat.org, edgari@xilinx.com, alistai@xilinx.com, mar.krzeminski@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add support for zero pumping according to the transfer size register. Signed-off-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Tested-by: Edgar E. Iglesias --- hw/ssi/xilinx_spips.c | 47 ++++++++++++++++++++++++++++++++++++---= ---- include/hw/ssi/xilinx_spips.h | 2 ++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index 4621dbb..878b17e 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -109,6 +109,7 @@ FIELD(CMND, DUMMY_CYCLES, 2, 6) #define R_CMND_DMA_EN (1 << 1) #define R_CMND_PUSH_WAIT (1 << 0) +#define R_TRANSFER_SIZE (0xc4 / 4) #define R_LQSPI_STS (0xA4 / 4) #define LQSPI_STS_WR_RECVD (1 << 1) =20 @@ -227,6 +228,7 @@ static void xilinx_spips_reset(DeviceState *d) s->link_state_next_when =3D 0; s->snoop_state =3D SNOOP_CHECKING; s->cmd_dummies =3D 0; + s->man_start_com =3D false; xilinx_spips_update_ixr(s); xilinx_spips_update_cs_lines(s); } @@ -464,6 +466,41 @@ static inline void tx_data_bytes(Fifo8 *fifo, uint32_t= value, int num, bool be) } } =20 +static void xilinx_spips_check_zero_pump(XilinxSPIPS *s) +{ + if (!s->regs[R_TRANSFER_SIZE]) { + return; + } + if (!fifo8_is_empty(&s->tx_fifo) && s->regs[R_CMND] & R_CMND_PUSH_WAIT= ) { + return; + } + /* + * The zero pump must never fill tx fifo such that rx overflow is + * possible + */ + while (s->regs[R_TRANSFER_SIZE] && + s->rx_fifo.num + s->tx_fifo.num < RXFF_A_Q - 3) { + /* endianess just doesn't matter when zero pumping */ + tx_data_bytes(&s->tx_fifo, 0, 4, false); + s->regs[R_TRANSFER_SIZE] &=3D ~0x03ull; + s->regs[R_TRANSFER_SIZE] -=3D 4; + } +} + +static void xilinx_spips_check_flush(XilinxSPIPS *s) +{ + if (s->man_start_com || + (!fifo8_is_empty(&s->tx_fifo) && + !(s->regs[R_CONFIG] & MAN_START_EN))) { + xilinx_spips_check_zero_pump(s); + xilinx_spips_flush_txfifo(s); + } + if (fifo8_is_empty(&s->tx_fifo) && !s->regs[R_TRANSFER_SIZE]) { + s->man_start_com =3D false; + } + xilinx_spips_update_ixr(s); +} + static inline int rx_data_bytes(Fifo8 *fifo, uint8_t *value, int max) { int i; @@ -533,7 +570,6 @@ static void xilinx_spips_write(void *opaque, hwaddr add= r, uint64_t value, unsigned size) { int mask =3D ~0; - int man_start_com =3D 0; XilinxSPIPS *s =3D opaque; =20 DB_PRINT_L(0, "addr=3D" TARGET_FMT_plx " =3D %x\n", addr, (unsigned)va= lue); @@ -541,8 +577,8 @@ static void xilinx_spips_write(void *opaque, hwaddr add= r, switch (addr) { case R_CONFIG: mask =3D ~(R_CONFIG_RSVD | MAN_START_COM); - if (value & MAN_START_COM) { - man_start_com =3D 1; + if ((value & MAN_START_COM) && (s->regs[R_CONFIG] & MAN_START_EN))= { + s->man_start_com =3D true; } break; case R_INTR_STATUS: @@ -588,10 +624,7 @@ static void xilinx_spips_write(void *opaque, hwaddr ad= dr, s->regs[addr] =3D (s->regs[addr] & ~mask) | (value & mask); no_reg_update: xilinx_spips_update_cs_lines(s); - if ((man_start_com && s->regs[R_CONFIG] & MAN_START_EN) || - (fifo8_is_empty(&s->tx_fifo) && s->regs[R_CONFIG] & MAN_START_= EN)) { - xilinx_spips_flush_txfifo(s); - } + xilinx_spips_check_flush(s); xilinx_spips_update_cs_lines(s); xilinx_spips_update_ixr(s); } diff --git a/include/hw/ssi/xilinx_spips.h b/include/hw/ssi/xilinx_spips.h index bac90a5..ad2175a 100644 --- a/include/hw/ssi/xilinx_spips.h +++ b/include/hw/ssi/xilinx_spips.h @@ -76,6 +76,8 @@ struct XilinxSPIPS { uint32_t rx_discard; =20 uint32_t regs[XLNX_SPIPS_R_MAX]; + + bool man_start_com; }; =20 typedef struct { --=20 2.9.3