From nobody Thu Mar 5 22:06:15 2026 X-Original-To: dev-commits-src-branches@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 4fRkBv5ptfz6TkpZ for ; Thu, 05 Mar 2026 22:06:15 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fRkBv50MQz3CYl for ; Thu, 05 Mar 2026 22:06:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772748375; 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=8eYYdIora5mRhQx+nqSPT8XTGgp3sjo6DvJQR3i/E7g=; b=VLmsF3oORfEdestVwX8CvZYy8wc7Et4JKEp3Cs2jEEWwLxhmsOEmx7By7dXp/azM4PRJ87 H6F0ig3zEKYxXPN5ipJUXgyWohA95S7Wgn19VlYfZsZfC2aoTCEZ8O5VrnOBQzK2QaOW24 8Fc9lHNoorfg7vJO/ln+fKyNKae7TTtu35WqTTh799TUYPK49Sj10NLdp9IbE9BFW031tT dF6FlTZPzePbqQGh7TjsIKhwZqljwN35RYUKinqosXKryGLqM+5BiPwses18a7i/25o+FE FvLdkiVVKdBqrToAgaXD6PWBfdY8DKX8aJF7UaCK5N7o6Q7ywR58c3GJ1mFihA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772748375; a=rsa-sha256; cv=none; b=f0fSdRRuUMJb2J4wywonhZ8KqjAGBUYFiHW8ajG4H61QoV7FPdp6Ra+NLVFvQ/Y3AW1gdD jKe3eBscs14BSX/R0s8+qtd3m/O7vmhW4h61m6qxzs/9Bjvk/UnVdZOyhuplay+achoPIe gxx0zfKDC+DNVqHgZeN2vIwW8YeoPckSPaz9kT15msTNgNKX3PNkExHSuMCkLRDdpA18Xz 9Xv4P7MfqfrUFFWN24zqMv9Lp9PDd1lsFbp8FXH5nRhapypcDGjOLmWpH+DuVhV3pIYbqj 9VevupF95UnVNJ3Z1u381KajnfRCTReRrvPTjg6SwNlunjcXzCjDKOAQnWLxvQ== 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=1772748375; 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=8eYYdIora5mRhQx+nqSPT8XTGgp3sjo6DvJQR3i/E7g=; b=X7MsazFDAXqBUhl46LovN02C0dhPDam38KhAHIDks/D6V/uB3rzKRodhfwWyH1T0UC5PZn //AHANkqMjLx4JbTxB8e5dAFfCwRNjjfL8zIRtYA54bhIZcc4fK3o0qcSSsh/MLhdstIBB F1CY5ZMciO9qhjFFCCih2SmITqjbaTauxYQu2ENAkfamDXvDFjCoqxKjXI/Bf8Nf0OjpyQ cBHPhW6Br71qJZIkYaAsP2KRJuF2l4gkmo3NdW4AkARfJYsoGcDVMcTs4kRryzqJjXf5Un Fd/RqrraLxo6CMw4BW2HvOcMmXT+wGd4JIJcAmo6yjAfAYXVO/j524+2s8AHqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRkBv4JbXzvnK for ; Thu, 05 Mar 2026 22:06:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34787 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 22:06:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: b4269beda1b1 - stable/15 - iwx: Fix 32-bit compilation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b4269beda1b1a64fab5c9a582a35b0bb2c688360 Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 22:06:15 +0000 Message-Id: <69a9fe57.34787.77af5135@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b4269beda1b1a64fab5c9a582a35b0bb2c688360 commit b4269beda1b1a64fab5c9a582a35b0bb2c688360 Author: Olivier Certner AuthorDate: 2026-03-05 12:31:51 +0000 Commit: Olivier Certner CommitDate: 2026-03-05 22:05:42 +0000 iwx: Fix 32-bit compilation - Avoid shifts wider than integer types, by wrapping the corresponding checks into '#if __SIZEOF_SIZE_T__ > 32' blocks. 'bus_addr_t' currently has the same width as 'size_t' on all architectures (and this is not going to change for 32-bit architectures). - Use appropriate printf(3) format for 'wk_keytsc'. Reviewed by: adrian MFC after: 1 minute MFC to: stable/15 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55667 (cherry picked from commit 35da55c28dbb56dd7056b7863efc5b547950d885) --- sys/dev/iwx/if_iwx.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 1fe531d69933..6d12de0753c0 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -155,6 +155,7 @@ #include #include +#include #include #include #include @@ -5775,15 +5776,21 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) desc->tbs[0].tb_len = htole16(IWX_FIRST_TB_SIZE); paddr = htole64(data->cmd_paddr); memcpy(&desc->tbs[0].addr, &paddr, sizeof(paddr)); - if (data->cmd_paddr >> 32 != (data->cmd_paddr + le32toh(desc->tbs[0].tb_len)) >> 32) +#if __SIZEOF_SIZE_T__ > 32 + if (data->cmd_paddr >> 32 != (data->cmd_paddr + + le32toh(desc->tbs[0].tb_len)) >> 32) DPRINTF(("%s: TB0 crosses 32bit boundary\n", __func__)); +#endif desc->tbs[1].tb_len = htole16(sizeof(struct iwx_cmd_header) + txcmd_size + hdrlen + pad - IWX_FIRST_TB_SIZE); paddr = htole64(data->cmd_paddr + IWX_FIRST_TB_SIZE); memcpy(&desc->tbs[1].addr, &paddr, sizeof(paddr)); - if (data->cmd_paddr >> 32 != (data->cmd_paddr + le32toh(desc->tbs[1].tb_len)) >> 32) +#if __SIZEOF_SIZE_T__ > 32 + if (data->cmd_paddr >> 32 != (data->cmd_paddr + + le32toh(desc->tbs[1].tb_len)) >> 32) DPRINTF(("%s: TB1 crosses 32bit boundary\n", __func__)); +#endif /* Other DMA segments are for data payload. */ for (i = 0; i < nsegs; i++) { @@ -5791,8 +5798,12 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) desc->tbs[i + 2].tb_len = htole16(seg->ds_len); paddr = htole64(seg->ds_addr); memcpy(&desc->tbs[i + 2].addr, &paddr, sizeof(paddr)); - if (data->cmd_paddr >> 32 != (data->cmd_paddr + le32toh(desc->tbs[i + 2].tb_len)) >> 32) - DPRINTF(("%s: TB%d crosses 32bit boundary\n", __func__, i + 2)); +#if __SIZEOF_SIZE_T__ > 32 + if (data->cmd_paddr >> 32 != (data->cmd_paddr + + le32toh(desc->tbs[i + 2].tb_len)) >> 32) + DPRINTF(("%s: TB%d crosses 32bit boundary\n", __func__, + i + 2)); +#endif } bus_dmamap_sync(ring->data_dmat, data->map, BUS_DMASYNC_PREWRITE); @@ -10987,7 +10998,7 @@ iwx_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) cmd.common.sta_id = IWX_STATION_ID; cmd.transmit_seq_cnt = htole64(k->wk_keytsc); - DPRINTF(("%s: k->wk_keytsc=%lu\n", __func__, k->wk_keytsc)); + DPRINTF(("%s: k->wk_keytsc=%" PRIu64 "\n", __func__, k->wk_keytsc)); status = IWX_ADD_STA_SUCCESS; err = iwx_send_cmd_pdu_status(sc, IWX_ADD_STA_KEY, sizeof(cmd), &cmd,