From nobody Sun Feb 02 16:58:53 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 4YmG714gSYz5mRr3; Sun, 02 Feb 2025 16:58:53 +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 4YmG713jWMz3jDJ; Sun, 02 Feb 2025 16:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738515533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NDM02i2Cqkd3fsLUI7Vqc7ZTuG8wUivshUxzUQm9RY=; b=b9D/sScu6/I9SgXTnSCfNrzZF72yrCvO8zCB+XiT6/2sdFfU1Mr+CUDlIU3PVosm2Hrs8H xGmXji7zaqWUVQzuNVgfRqBS3u3L2D5bZbrGZ76w+V8MTIPkpPHaCqSJAwt1UkPFalszix JCD9fb6tHT0AMunNKUSLfVE4negI6maIzhruwshQ/r6++EbngSjQfQVBJwbPRhW5Xqi0w+ Ij+qFAxbcgqcA3xP9tQQpTzhTy8fAD7n3lCah++T7Fh9BbpHszAx5EJoOdQf+D9D7mQH2B VwAddXvVYjjFKTJJ5TQl61JdovBHpm9kA/uIa0MrYp0CmBHQMfMyxRSCVgLxDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738515533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NDM02i2Cqkd3fsLUI7Vqc7ZTuG8wUivshUxzUQm9RY=; b=FW/GzeQgikVxN5YP3L728rtja4EG5b/N+nzBLlCchxdf801wYx24CIFb0T1/WkMRUGJh7D YvSfuO1aUwlEN7fuJzBX6tzPPC5WR1X37mzfD3Qy+Q+YQuZR49L3UBXGwEBjABgLSj/g6O Xzm0fxXUcgOMKMNH+fgtiQjdxBCwmJrN6fqYKcpoKLG2Uc9PKvRdqSrJSB5VC0lvYOvP4d pBiwS7t+F+rjwueEvYi7tG5BcOFt8O/KYVjQiF5cTXC0mER7sebEBMXn8Slxrajkl9fycJ EweZgHJtZhXGcIi/7N9Yfr+VHUdBljELFOW9CkQda1Lp8/veN7Cb3xYawDHIsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738515533; a=rsa-sha256; cv=none; b=pGhA2oHkncDggEYqjoy42TmmeQzlfiAQWWKJBsvx30ZfnoScrhcesELRHMjvZizLmRDh4+ Suj4WGWC/vrm0gV6ZKLO+5APgqEBvMDL1TiQ/WyY2PU+mVojqztDf/yp4InhSqaDnZyiMz xf1v0OfwxUVn6tNPzJYo7PMj7SHLhKNUmooDp6bEjGwMBGL99yz5CgMFTb2YgCldOBxS+W oIP0Pwn+bJCnx7c6vyLqZJ9cLAa0t7E5WTA9dAKquzCHVytm3b4YnwjlcBtYn+EAalb7md cjAKn5dCzj6WxHlATCbXbolrrZe8BFSC07fzt5/llRf1ioB6nL0MfCaLfhGR/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YmG713GS8zxsS; Sun, 02 Feb 2025 16:58:53 +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 512Gwr78013075; Sun, 2 Feb 2025 16:58:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 512Gwr8K013072; Sun, 2 Feb 2025 16:58:53 GMT (envelope-from git) Date: Sun, 2 Feb 2025 16:58:53 GMT Message-Id: <202502021658.512Gwr8K013072@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: 5a8caf9bfae2 - main - bce: make compile with BCE_DEBUG 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 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: 5a8caf9bfae280614ebd98df894a9d895aacd876 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5a8caf9bfae280614ebd98df894a9d895aacd876 commit 5a8caf9bfae280614ebd98df894a9d895aacd876 Author: Warner Losh AuthorDate: 2025-02-02 16:57:01 +0000 Commit: Warner Losh CommitDate: 2025-02-02 16:57:01 +0000 bce: make compile with BCE_DEBUG Builds now with BCE_DEBUG defined. All bets are of as to whether or not it works though. This is not the default, and likely quite a rare config given (a) it's been broken for years and (b) this is an old card people aren't actively debugging anymore. I don't have the hardware to test it, though I've not changed anything in the BCE_DEBUG undefined case. Sponsored by: Netflix --- sys/dev/bce/if_bce.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index b0ba56099135..16bfce5338a7 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -1594,7 +1594,7 @@ bce_shutdown(device_t dev) static u32 bce_reg_rd(struct bce_softc *sc, u32 offset) { - u32 val = REG_RD(sc, offset); + u32 val = bus_space_read_4(sc->bce_btag, sc->bce_bhandle, offset); DBPRINT(sc, BCE_INSANE_REG, "%s(); offset = 0x%08X, val = 0x%08X\n", __FUNCTION__, offset, val); return val; @@ -1611,7 +1611,7 @@ bce_reg_wr16(struct bce_softc *sc, u32 offset, u16 val) { DBPRINT(sc, BCE_INSANE_REG, "%s(); offset = 0x%08X, val = 0x%04X\n", __FUNCTION__, offset, val); - REG_WR16(sc, offset, val); + bus_space_write_2(sc->bce_btag, sc->bce_bhandle, offset, val); } /****************************************************************************/ @@ -1625,7 +1625,7 @@ bce_reg_wr(struct bce_softc *sc, u32 offset, u32 val) { DBPRINT(sc, BCE_INSANE_REG, "%s(); offset = 0x%08X, val = 0x%08X\n", __FUNCTION__, offset, val); - REG_WR(sc, offset, val); + bus_space_write_4(sc->bce_btag, sc->bce_bhandle, offset, val); } #endif @@ -5780,7 +5780,7 @@ bce_fill_rx_chain(struct bce_softc *sc) /* We should never end up pointing to a next page pointer. */ DBRUNIF(((prod & USABLE_RX_BD_PER_PAGE) == USABLE_RX_BD_PER_PAGE), BCE_PRINTF("%s(): Invalid rx_prod value: 0x%04X\n", - __FUNCTION__, rx_prod)); + __FUNCTION__, sc->rx_prod)); /* Write the mailbox and tell the chip about the waiting rx_bd's. */ REG_WR16(sc, MB_GET_CID_ADDR(RX_CID) + BCE_L2MQ_RX_HOST_BDIDX, prod); @@ -5944,7 +5944,7 @@ bce_fill_pg_chain(struct bce_softc *sc) DBRUNIF(((prod & USABLE_RX_BD_PER_PAGE) == USABLE_RX_BD_PER_PAGE), BCE_PRINTF("%s(): Invalid pg_prod value: 0x%04X\n", - __FUNCTION__, pg_prod)); + __FUNCTION__, sc->pg_prod)); /* * Write the mailbox and tell the chip about @@ -9030,7 +9030,7 @@ bce_add_sysctls(struct bce_softc *sc) CTLFLAG_RW, &bootcode_running_failure_sim_control, 0, "Debug control to force bootcode running failures"); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_U16(ctx, children, OID_AUTO, "rx_low_watermark", CTLFLAG_RD, &sc->rx_low_watermark, 0, "Lowest level of free rx_bd's"); @@ -9040,7 +9040,7 @@ bce_add_sysctls(struct bce_softc *sc) CTLFLAG_RD, &sc->rx_empty_count, "Number of times the RX chain was empty"); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_U16(ctx, children, OID_AUTO, "tx_hi_watermark", CTLFLAG_RD, &sc->tx_hi_watermark, 0, "Highest level of used tx_bd's");