From patchwork Fri Feb 28 21:05:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1246858 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=evg1UZju; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48ThyZ2jzqz9sQt for ; Sat, 29 Feb 2020 08:10:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A29B2812EF; Fri, 28 Feb 2020 22:07:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="evg1UZju"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 958A68126E; Fri, 28 Feb 2020 22:06:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6A2EA811F7 for ; Fri, 28 Feb 2020 22:06:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x841.google.com with SMTP id g21so3097484qtq.10 for ; Fri, 28 Feb 2020 13:06:35 -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 :mime-version:content-transfer-encoding; bh=vn5k8uD+iSa1/ZpcwiUUg2hrfbxWd5VYrUE5ZzXYoo8=; b=evg1UZjuwZ4aPg01hEEUSS1wz5/0LFJrMT8l2AdLhH9gOU7nilaD+QeAAYqDiXvJGu 5obtHewdCyJXDz7WPKg0QCwEk6mF7Db7OCF+j432TZ14kWS6QAqCRZPKwBx3+eMefZpT uK27cwWW9fBrHVDMw7Z/aJrHHI85WJfsRczMLFCHJWE6YkCSLXoJnryeLvHKOJZg14an +5BfMHGYwo6hNqG7ZqT754UGMwFyaG6f+caAFtRqJjvrQTe2k2buiHTobiPr1rQB6QNy NZmcB2TsJ82xtqEqBP4pYBPSR3mozTbpXHn8H9JFjpXPQTZiLqZn9cm2Y0DcJ7ApKPE1 TqpA== 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:mime-version:content-transfer-encoding; bh=vn5k8uD+iSa1/ZpcwiUUg2hrfbxWd5VYrUE5ZzXYoo8=; b=ZOKt6NCjclkkW9pLvKTRDhl7pqMjL8nGncwGCbEBqMbOf02+0gFjOzEGuvzNfME0c3 Gs7RPHdusEpiX2bRfLXxM1qvE4R2cJG0QYPjtgEsv3P7M3DaqSy+M6q8obXQizBxGsrP rLA5nfsy5jD67Lc700Xzq5dh50qtCOhwIoWBP1qIVOj8Gn1uDCXrsuTQh3s42/Wf33bi VpeW5ASdWzriXQCOSxdRDZlzhtZOS5nJVQcl0Odyd8jp86WpfACeu31LAWqdfJy2N3wR xCR4PzrdsSuhwOSuNuNMGTDEp5a4nRxnvODUgqA9JMj3ER5EtAb4YFtmeBH1Y+8IFrh7 822A== X-Gm-Message-State: APjAAAUmOL4OkSyDlCQrh5fFz4/9wYVMbtZqPwv9fzw1n4Q8h6x1WoiH VkOKTZ5xuEGq3oiltyhozY9MuwJL+E4= X-Google-Smtp-Source: APXvYqz1jwCtoAwCfdy2wVu6eAn85B9nStkiLKvyK2/354v0kHGmkw6aWEd358FEdinRiN7Rg4TJog== X-Received: by 2002:ac8:6999:: with SMTP id o25mr5775777qtq.342.1582923994111; Fri, 28 Feb 2020 13:06:34 -0800 (PST) Received: from localhost.localdomain ([75.102.135.197]) by smtp.gmail.com with ESMTPSA id f21sm1509571qtq.16.2020.02.28.13.06.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 13:06:33 -0800 (PST) From: Sean Anderson To: u-boot@lists.denx.de Cc: Rick Chen , Bin Meng , Sean Anderson , Eugeniy Paltsev , Jagan Teki , Simon Glass Subject: [PATCH v5 22/33] spi: dw: Speed up transfer loops Date: Fri, 28 Feb 2020 16:05:40 -0500 Message-Id: <20200228210552.615672-23-seanga2@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200228210552.615672-1-seanga2@gmail.com> References: <20200228210552.615672-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean The transfer loops are very tight on some platforms (especially on higher speeds). If we don't read/write fast enough we can run into over-/under- flow problems. This patch removes several divisions and log statements, and simplifies the read logic. Signed-off-by: Sean Anderson --- Changes in v5: - New drivers/spi/designware_spi.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 38c24fe550..613eb0d0e6 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -304,7 +304,7 @@ static inline u32 tx_max(struct dw_spi_priv *priv) { u32 tx_left, tx_room, rxtx_gap; - tx_left = (priv->tx_end - priv->tx) / (priv->bits_per_word >> 3); + tx_left = priv->tx_end - priv->tx; tx_room = priv->fifo_len - dw_read(priv, DW_SPI_TXFLR); /* @@ -315,8 +315,7 @@ static inline u32 tx_max(struct dw_spi_priv *priv) * shift registers. So a control from sw point of * view is taken. */ - rxtx_gap = ((priv->rx_end - priv->rx) - (priv->tx_end - priv->tx)) / - (priv->bits_per_word >> 3); + rxtx_gap = ((priv->rx_end - priv->rx) - (priv->tx_end - priv->tx)); return min3(tx_left, tx_room, (u32)(priv->fifo_len - rxtx_gap)); } @@ -324,7 +323,7 @@ static inline u32 tx_max(struct dw_spi_priv *priv) /* Return the max entries we should read out of rx fifo */ static inline u32 rx_max(struct dw_spi_priv *priv) { - u32 rx_left = (priv->rx_end - priv->rx) / (priv->bits_per_word >> 3); + u32 rx_left = priv->rx_end - priv->rx; return min_t(u32, rx_left, dw_read(priv, DW_SPI_RXFLR)); } @@ -336,15 +335,10 @@ static void dw_writer(struct dw_spi_priv *priv) while (max--) { /* Set the tx word if the transfer's original "tx" is not null */ - if (priv->tx_end - priv->len) { - if (priv->bits_per_word == 8) - txw = *(u8 *)(priv->tx); - else - txw = *(u16 *)(priv->tx); - } + if (priv->tx_end - priv->len) + txw = *(u8 *)(priv->tx); dw_write(priv, DW_SPI_DR, txw); - debug("%s: tx=0x%02x\n", __func__, txw); - priv->tx += priv->bits_per_word >> 3; + priv->tx++; } } @@ -355,16 +349,11 @@ static void dw_reader(struct dw_spi_priv *priv) while (max--) { rxw = dw_read(priv, DW_SPI_DR); - debug("%s: rx=0x%02x\n", __func__, rxw); /* Care about rx if the transfer's original "rx" is not null */ - if (priv->rx_end - priv->len) { - if (priv->bits_per_word == 8) - *(u8 *)(priv->rx) = rxw; - else - *(u16 *)(priv->rx) = rxw; - } - priv->rx += priv->bits_per_word >> 3; + if (priv->rx_end - priv->len) + *(u8 *)(priv->rx) = rxw; + priv->rx++; } }