From patchwork Mon May 30 16:05:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 577195 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:330b:0:0:0:0 with SMTP id f11csp380796mag; Mon, 30 May 2022 09:16:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbqpc0xNKy/EVaqFNadZtzyPQhA7+0G5N1VYxvQOHamFjVZmjKE0Gw6BKIWEN//w4Eg1JU X-Received: by 2002:a05:620a:84b:b0:6a3:4895:d272 with SMTP id u11-20020a05620a084b00b006a34895d272mr35448647qku.338.1653927409856; Mon, 30 May 2022 09:16:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653927409; cv=none; d=google.com; s=arc-20160816; b=Ita7QhrwjL2WO09b+JbqVRXammVf/qBS4xa5q63SaGJ0cDhuTPJasyWblY3H56RfSg zXR+SZDIN0EKndJ0vRf5urqp0AQ4jIfuoo2+Lw4LX/XWLIv7o1bgHw17/1Sp+Nr+8Zmf seeOrw5Sfqmt4z/YRv0bJelNrGXWEweSe5p6/sWu3ySEJQ57ep6mtVi2IjDuswz1Ojeh zPmWVMSmARQ05pGmWwYfVGEm3LTG2ajWT0CRcnY4fNmTk28PavhilXAoWRxWoqAXTELI vhjOEOg57TdOViZ8srEidlOalKhE+aZN0vdBO8LU9kfUSB/RRPIUKK/HuF8DBACyOipp eX1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=lKRJrIgeaUwwXJZeQ6utUWAPa0M3UoWr4zCBZlSuKrQ=; b=MjUq4mg5C7xzei4+B20GAAmSftU2nu2gY8Y8T7v44tfEz7HTyqyJnWF4ayzy8gOaPn 1M8OqHcrJejVc0bHxeZXYzoid3pE+M4FHquPwvTpx8wXfb11BZxmUtvsJ4IP5JlEogQr PHMDbrdeCwzuUu82H9AmRfA6GbMV+2HcU80LquoFRoTZUE6S34jInxZNVSWlocPRhXbX fzwvtmkWSGvaEhk4TvuxFUi0v/d1+RASPZ5qzg5iFR/m7V0F3JCW+C/lha2jyHNDTqGR QDdf7+sHvuaq7dp2mFJ0za/1x2suRDqn9Bd6hHjjtStAnEqwhAV2XTl1ZNvtYJyzKVMP M67Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nnGJUoR1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j11-20020a05620a288b00b0069f8790d19dsi8579773qkp.42.2022.05.30.09.16.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 May 2022 09:16:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nnGJUoR1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvi4W-0003wY-Pz for patch@linaro.org; Mon, 30 May 2022 12:16:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvhvI-0002dr-NG for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:20 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvhvG-0007Aa-53 for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:15 -0400 Received: by mail-wr1-x430.google.com with SMTP id p10so15256837wrg.12 for ; Mon, 30 May 2022 09:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lKRJrIgeaUwwXJZeQ6utUWAPa0M3UoWr4zCBZlSuKrQ=; b=nnGJUoR1pe2AtKF4AS+uHIpw3GvqBm7CcyZQ7HecJvP5Tlgwq+NzJk2BjJDNZuNo6J czMpOxWFymuvMV8VOrskc7GEH5hECZy1Rj8nMjNIyGPlBZOPspmc5lMW4rn47ijVr0QW FKpVRx7Vnh9vlTB5XXa7Anz8Z9Pb3qvvSAjXa975DxRUzW4S49sVUNU7KbRHqg4DOtmF iI5AmF5MpE9kMXMSSYSugJSXx+QnX+fMw8TpdeRYeFVy+3X3cnCvfP5SJfrbep6QZfjN 9VM3+McwbOpzZdATkJGPeqrxj7UCKPfOnRQlJq6fGFe9qqLpgv/kHz7QAhxXTj3XH2Ox CMJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lKRJrIgeaUwwXJZeQ6utUWAPa0M3UoWr4zCBZlSuKrQ=; b=WgG35KXKgpXro9jyrRNEvQBaPcYt80zFxB4xbN/vJY7348ZkCnI65whmOJi68LvG2s lvRCq7yTlZlcQNH3tyjyIZemYhIKKFc0onFMuRWqeeYlLR6KGDYZaBQBWsMhmWyjiVKL IWawKnwMNHZucyvRBJDIuP5ZQ1udFPcBdaxGL3szaW1CXB4QSkRPmpYIf5mvRowsywIk epCc4hzaUYHzwfrptVpq0ZG8Es3UMe8QEBw0mnjp+TL/aCsef9FexqP1XpZFFGIExWge K4pI6uHEAWEEK23pKY1CAbxiZQUpNbZiAUmkB4uIp+eABOHjq7PjrRYI+TJ+ekq3Vd6Q p1ww== X-Gm-Message-State: AOAM533eVlUvcogDbrnbwpCfzYeT/v43hZHA2FTogwp8nejfHOXUoJsg 1cz0YeIoaTNt8WwJU8s31rMJ0rZNzt6xCA== X-Received: by 2002:a5d:6c66:0:b0:20f:86f3:ea05 with SMTP id r6-20020a5d6c66000000b0020f86f3ea05mr40690832wrz.154.1653926832550; Mon, 30 May 2022 09:07:12 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id bi12-20020a05600c3d8c00b003974b95d897sm10232152wmb.37.2022.05.30.09.07.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 09:07:12 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 003/117] hw/sd/allwinner-sdhost: report FIFO water level as 1 when data ready Date: Mon, 30 May 2022 17:05:14 +0100 Message-Id: <20220530160708.726466-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220530160708.726466-1-peter.maydell@linaro.org> References: <20220530160708.726466-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Icenowy Zheng U-Boot queries the FIFO water level to reduce checking status register when doing PIO SD card operation. Report a FIFO water level of 1 when data is ready, to prevent the code from trying to read 0 words from the FIFO each time. Signed-off-by: Icenowy Zheng Message-id: 20220520124200.2112699-1-uwu@icenowy.me Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/sd/allwinner-sdhost.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c index 041e45c6804..455d6eabf64 100644 --- a/hw/sd/allwinner-sdhost.c +++ b/hw/sd/allwinner-sdhost.c @@ -114,7 +114,9 @@ enum { }; enum { + SD_STAR_FIFO_EMPTY = (1 << 2), SD_STAR_CARD_PRESENT = (1 << 8), + SD_STAR_FIFO_LEVEL_1 = (1 << 17), }; enum { @@ -467,6 +469,11 @@ static uint64_t allwinner_sdhost_read(void *opaque, hwaddr offset, break; case REG_SD_STAR: /* Status */ res = s->status; + if (sdbus_data_ready(&s->sdbus)) { + res |= SD_STAR_FIFO_LEVEL_1; + } else { + res |= SD_STAR_FIFO_EMPTY; + } break; case REG_SD_FWLR: /* FIFO Water Level */ res = s->fifo_wlevel;