From nobody Thu Mar 5 20:41:42 2026 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 4fRhKL1R5qz6Td5V for ; Thu, 05 Mar 2026 20:41:42 +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 4fRhKL0nx2z4J3n for ; Thu, 05 Mar 2026 20:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772743302; 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=IMvWC2QF4l5XEY3xlIM1lNKwU4zOlHhYImtyFqV2C+k=; b=W3r969CpgBY8Xgr47v82c3DAxtH0Vb85OoOyBg//fdsm3ow6b4B7YVrIPFEYb70Ptb438B 9TFzTRPwFvNGGwZ7H7qqx6RyYjSgAxBn65dCg9YNKO5yVV+1dvXpnizHGMBGRGMVZtIJou xQWUoucSNGiBNjpxUj3OdGclnkUb2ke5RVpjH6EcP+PVnU5p4X1jlY4guLsgml99ujAeaW jW9Vu1rDl5GbxeVbXAB/hH+ndsNXztM1ey3hb6x/a5j1rVB2EJA6YKAWfXBxKnoYktBRbW aCWYZ71QOqVReKa3jh0tZixk4cKeT1DGXXPo19FW9LBG7HfGnwK9qrgpjfGoSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772743302; a=rsa-sha256; cv=none; b=VFmnKGNDVHaStmqnFDYWRMJCRTChS+FN5yiXQBGio73zp4XaxD/4r0ZhhUEBG7xOAiOE6u TD6jQ1GMNalugR+zIrNKuINK6VszJ1wmP1dUejv7g92u9LKmmRU51iWZuk33Xw6HtsceVr 7Liis+jMxXKAUPkS12wPijJOsVJi5bIrYxi2jEA9we/BjWXCK7kY6oPGaUNwj1mE3QAXx/ 9j+9TaAr2VKUlXMnv8p57CsDW82/Czf9Iw7H9LLvTtOIdj1NSpku+FU1PlnqR4D5ifnrOq 7rJ0aqVLXMrGoPW+yA8oF2p9DvdA5wE5bQek4GiRv7vdcVxU4qgpGwzww1rA0Q== 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=1772743302; 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=IMvWC2QF4l5XEY3xlIM1lNKwU4zOlHhYImtyFqV2C+k=; b=l0e7k7GC1T3uqHNtFacqHcTrYU4gMvBGDyx1YvAcxkQkAZBPExFLDwh9KCo+rso2j7hSLP RVx8ICxIPycMszidVNbWjDsr0S3dP4aeZwhN3/xf0jXiPspiHcDZ4TPyrAhGX2sG0nXDR8 h6zXQd/ewRGNLb2rfzJATKA0WdjM0tOzqs4AdVJ44Uw1arI5bFY6zxyDYztdaesRVpQH9W FOoqBRraoDS1gQLHmfy+J/FxyO5WhlOniG1fYtG12/RHtW4XBf6sv1cSBdfm9L1YihRdgR JwPxyE19ALPHrbReuO9tzQGyDMk2hTjSSATL5+JQO0gCAQKSHLi+DR1buEaNCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRhKL0Mt1zsQT for ; Thu, 05 Mar 2026 20:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24715 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 20:41:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 35da55c28dbb - main - iwx: Fix 32-bit compilation 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35da55c28dbb56dd7056b7863efc5b547950d885 Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 20:41:42 +0000 Message-Id: <69a9ea86.24715.1743999a@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=35da55c28dbb56dd7056b7863efc5b547950d885 commit 35da55c28dbb56dd7056b7863efc5b547950d885 Author: Olivier Certner AuthorDate: 2026-03-05 12:31:51 +0000 Commit: Olivier Certner CommitDate: 2026-03-05 20:40:53 +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 --- sys/dev/iwx/if_iwx.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 8f11e6a414e7..ea1ba513734a 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 @@ -5818,15 +5819,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++) { @@ -5834,8 +5841,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); @@ -11079,8 +11090,8 @@ 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); - IWX_DPRINTF(sc, IWX_DEBUG_KEYMGMT, "%s: k->wk_keytsc=%lu\n", __func__, - k->wk_keytsc); + IWX_DPRINTF(sc, IWX_DEBUG_KEYMGMT, "%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,