From nobody Mon Apr 28 16:04:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZmStW3X9kz5vWtq; Mon, 28 Apr 2025 16:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZmStV62jBz3J5S; Mon, 28 Apr 2025 16:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745856242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=BUHUJ9fn6AUcXV5JwI6XbY5LpYRLd6mHEa7kDGmHOp0=; b=aK5HXqaZ3JWHhC/9w5he6BiPjm3fhNb2Iz1599eQYC21ZMLKsjO1f4PmBpjBITr8ypYB7z +WLztmoNlfnIxqqJW0KLRJ89AsJUCyBG0DqxTDHGEA9qg9ykzq/ouMEwDUv9f6j5GwayyL /5vRG35kJcbr7IYI5+baNKs/ws+uqcSjo3AuyE31hDySFMUvQ7IpbgqCdnFo7xygIMGdTe SStuWvkZq9/otgwRfaltuYvEL7xBM8mfKnWbG1jzy66KpE+hHZLxflSZIO/YyidN2howki 5FO/c1DEPDyhLqbpDpoPdQVUb9uEWvPACyfku0eKtgvKIrTQpPk6h4SjE/oqHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745856242; a=rsa-sha256; cv=none; b=oLwt9jYWINJN7WTh0wdypL9c99k7UTAEeKgGorDLPHhlUsJzPge43BeZnAihjG6By0GzgG Msgcrf5osa6fmXeE2CcVzLvTzS+ZiRoHgmBiaGZ1XrWauBMkTKXzVqUdYQLKTnITj0FU6w FoAB4g3DfyszGinG+u79OU7fZalg3+vAHaMQwIwZZnBqGZDDIMT7MTncTWOb8c1oylagEu 0dggnJ2z7DTODMMsZqzQNvspv3YMK520cC9TMMNAcuTJk4Jfm2YUlvKEDpLAxnlJk+/V01 07d0jN/iLNhvaodNXfX459kikP6aFwAxcgWcB743PORcSl7UlufDaYTpgJD9cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745856242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=BUHUJ9fn6AUcXV5JwI6XbY5LpYRLd6mHEa7kDGmHOp0=; b=xiVIxOGotOPmtrkT/8JvUPIJP0BPJY2wIwg6Ghah2XuFh/qAasqnmBQsdTEBsgqdJ2rgg5 JNDliNO/bVsrMt97sYCEyuy7zE3CFmQOX6HpcU605M0/QsEvaZPFQrDiXQMCl6IID35qO+ qaH03RbVeHpUeHbbONUn65bopYA5Ect6NxNurMwlGh1VvoQvW1uimH6rVVlN5Agj/6ykFj ItR7iEmjqbz2JsMztdQB2qzE8ofYKs8gr38DzaWq5Qprp1LAFeadEIUI85pcKlIyJid2a6 xNngYwiNdvehk9Tp/v1UlYeVOv9HMT5hsbu8UMm1T6hD3PlZX3tzlNfuLDlbCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZmStV5ddkzjTY; Mon, 28 Apr 2025 16:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53SG42NU039087; Mon, 28 Apr 2025 16:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SG421W039084; Mon, 28 Apr 2025 16:04:02 GMT (envelope-from git) Date: Mon, 28 Apr 2025 16:04:02 GMT Message-Id: <202504281604.53SG421W039084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 77be1f2fa6a1 - main - =?utf-8?Q?Fix TXFIFO register write and timeout message Changes: - Fixed incorrect = List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org register write for TXFIFO invalidation (FSPI_IPRXFCR =E2=86=92 FSPI_IPTXF= CR). - Corrected error message for TXFIFO wait timeout (FSPI_INTR_IPRXWA = =E2=86=92 FSPI_INTR_IPTXWE). - Corrected comment for TXFIFO available (RX= FIFO -> TXFIFO)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77be1f2fa6a18afc0d9111b2e4880fd4bacca02a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=77be1f2fa6a18afc0d9111b2e4880fd4bacca02a commit 77be1f2fa6a18afc0d9111b2e4880fd4bacca02a Author: Premal Gajjar AuthorDate: 2025-02-24 13:46:13 +0000 Commit: Warner Losh CommitDate: 2025-04-28 16:02:50 +0000 Fix TXFIFO register write and timeout message Changes: - Fixed incorrect register write for TXFIFO invalidation (FSPI_IPRXFCR → FSPI_IPTXFCR). - Corrected error message for TXFIFO wait timeout (FSPI_INTR_IPRXWA → FSPI_INTR_IPTXWE). - Corrected comment for TXFIFO available (RXFIFO -> TXFIFO) Reviewed-by: imp@FreeBSD.org Reviewed-by: jlduran@FreeBSD.org Pull-request: https://github.com/freebsd/freebsd-src/pull/1604 --- sys/dev/flash/flexspi/flex_spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/flash/flexspi/flex_spi.c b/sys/dev/flash/flexspi/flex_spi.c index 9382b237ee71..44246f4b1c2d 100644 --- a/sys/dev/flash/flexspi/flex_spi.c +++ b/sys/dev/flash/flexspi/flex_spi.c @@ -329,20 +329,20 @@ flex_spi_write_txfifo(struct flex_spi_softc *sc, uint8_t *buf, uint8_t size) int i, ret, reg; /* invalid the TXFIFO */ - write_reg(sc, FSPI_IPRXFCR, FSPI_IPTXFCR_CLR); + write_reg(sc, FSPI_IPTXFCR, FSPI_IPTXFCR_CLR); /* * Default value of water mark level is 8 bytes, hence in single * read request controller can read max 8 bytes of data. */ for (i = 0; i < size; i += 4) { - /* Wait for RXFIFO available */ + /* Wait for TXFIFO available */ if (i % 8 == 0) { ret = reg_read_poll_tout(sc, FSPI_INTR, FSPI_INTR_IPTXWE, 1, 50000, 1); if (ret) device_printf(sc->dev, - "timed out waiting for FSPI_INTR_IPRXWA\n"); + "timed out waiting for FSPI_INTR_IPTXWE\n"); } if (size >= (i + 4))