From patchwork Fri Nov 24 21:29:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francisco Iglesias X-Patchwork-Id: 841181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nMbXGut/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yk8j94qlkz9s03 for ; Sat, 25 Nov 2017 08:39:25 +1100 (AEDT) Received: from localhost ([::1]:51208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eILgx-0000hW-Nf for incoming@patchwork.ozlabs.org; Fri, 24 Nov 2017 16:39:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eILXr-0001ZU-JX for qemu-devel@nongnu.org; Fri, 24 Nov 2017 16:30:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eILXq-0007cU-MZ for qemu-devel@nongnu.org; Fri, 24 Nov 2017 16:29:59 -0500 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:41366) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eILXq-0007c7-Fa for qemu-devel@nongnu.org; Fri, 24 Nov 2017 16:29:58 -0500 Received: by mail-lf0-x241.google.com with SMTP id f134so26674051lfg.8 for ; Fri, 24 Nov 2017 13:29:58 -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=tsdYsLLhHaMAdP4WJ66jfzhS3FC3MRpY/brYDFNy+BA=; b=nMbXGut/TMtdJtXqytkjNhpte07NT/eKfpXJOZFh1aeeR4eWS8PaXtv6tQrTA8ufr6 P049sGrt26OCldjVwJRNG7D3h64KaP/VwH7COvmRS2XRQLV8gPuYwjP/WfINb1Azpsuc WkqL6pZ3XCXl+5kWFo3HwJPpwBK9zed3kv5/DbO97jnD8+Wbxb8UK9UBdDiZ25V2w6Bg 2bkIhdVE4UUU0206xzmKXDOf5GTZsv/E9MUsx7F+ldKkc55wcZLU92plL/gG487YBSEo GWq21I+PBWcQBLzHCKwbPBNNvjW//1mKH/pvBHAoHUTF2zqteD/aYJUou2sIzRH2j+ET ogOw== 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=tsdYsLLhHaMAdP4WJ66jfzhS3FC3MRpY/brYDFNy+BA=; b=leNp7bjc37uyZ00LUkceWwG9ySrdfjYBW2h9XGK7i6aXw5Cjy9KLpIeLRoxTKNftYV hYAVq3C3i+UlJUChzy3bQN+OcEMvPZvD6+Halvx/wH1+OY3cYc28/ZnfIy4AZ90TGaV3 e7AmgqYopixMdeKyYd7xr6r/dBOatZjTrZqVQKSEA9HDVOaTJcvGVwBE0iutRAJx/Lvt eEmmuq+UN99GjsytYkAm7SwRJ45hixSgBrdG5r0Rlv3DPRdoLSWRMNPWiug5c5L4b6Qe z5kIVLlpAAJ1jYCx6dzV7asETS17ntUbI33vNmtQfKMJ5XXD63ySpNdM26PcGNjSC3j1 bsnA== X-Gm-Message-State: AJaThX6rTrv5TSgUjCJRA0UrPjdaN8P7qUJ36eA5/X0DGpnYia6vh0SF sgpOFiWexFRVdOEj8tPDhOdLgQ== X-Google-Smtp-Source: AGs4zMbN4pO7sSf2ZwcyBBG3qjdaI5wVq7BeK0vWlUnwhquMC6S3JlTLgVHQQ3tS1tb7TPFQxmkFOQ== X-Received: by 10.46.85.18 with SMTP id j18mr8980657ljb.109.1511558996962; Fri, 24 Nov 2017 13:29:56 -0800 (PST) Received: from localhost.localdomain (host-90-232-67-40.mobileonline.telia.com. [90.232.67.40]) by smtp.gmail.com with ESMTPSA id n9sm4721083ljb.1.2017.11.24.13.29.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Nov 2017 13:29:56 -0800 (PST) From: Francisco Iglesias To: qemu-devel@nongnu.org Date: Fri, 24 Nov 2017 22:29:34 +0100 Message-Id: <20171124212938.7074-10-frasse.iglesias@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171124212938.7074-1-frasse.iglesias@gmail.com> References: <20171124212938.7074-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::241 Subject: [Qemu-devel] [PATCH v8 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, edgari@xilinx.com, alistai@xilinx.com, francisco.iglesias@feimtech.se, mar.krzeminski@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add support for zero pumping according to the transfer size register. Signed-off-by: Francisco 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) @@ -227,6 +228,7 @@ static void xilinx_spips_reset(DeviceState *d) s->link_state_next_when = 0; s->snoop_state = SNOOP_CHECKING; s->cmd_dummies = 0; + s->man_start_com = 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) } } +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] &= ~0x03ull; + s->regs[R_TRANSFER_SIZE] -= 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 = 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 addr, uint64_t value, unsigned size) { int mask = ~0; - int man_start_com = 0; XilinxSPIPS *s = opaque; DB_PRINT_L(0, "addr=" TARGET_FMT_plx " = %x\n", addr, (unsigned)value); @@ -541,8 +577,8 @@ static void xilinx_spips_write(void *opaque, hwaddr addr, switch (addr) { case R_CONFIG: mask = ~(R_CONFIG_RSVD | MAN_START_COM); - if (value & MAN_START_COM) { - man_start_com = 1; + if ((value & MAN_START_COM) && (s->regs[R_CONFIG] & MAN_START_EN)) { + s->man_start_com = true; } break; case R_INTR_STATUS: @@ -588,10 +624,7 @@ static void xilinx_spips_write(void *opaque, hwaddr addr, s->regs[addr] = (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; uint32_t regs[XLNX_SPIPS_R_MAX]; + + bool man_start_com; }; typedef struct {