From nobody Thu Mar 31 17:35:18 2022 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 A98351A53AC2; Thu, 31 Mar 2022 17:35:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTr6Z3tmDz4prh; Thu, 31 Mar 2022 17:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648748118; 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=3aFrsbrGJeb4fht1k4lCAF8taQTFVqja/uZZaxcUR0M=; b=RaWrRzJSvGI3COFhaKp37X+AJ9L6EePoDrh5mcfnh6EXpcQf6LO9S2rlX7PReJFGnXbu1H mVp1CfvFaeYnmkGO9HYsZF/kC2wx+fgBaQEm4waU+YWZC2vCQKDCjoP2069kPMcl549qHt mQ79Z3o7b7+GoobBteRnCE+/yTHhw0IGMRmQcqyjc0GhrF5u2JbasZiuJmbXAoyNu6l2YL M4QeIWyDjAJ4Y5dUhlzlf9nlZ2zPAOJMlSWZgNc+KZH3/bMApF7T2w2sXI0La/oxDEOxBp ee2mMvaMr0fHUojcFRIxObzBBFf3wqRXTaoPPXLckQXfh3mgzxkwNvKeuQfAZw== 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 62B032BF1A; Thu, 31 Mar 2022 17:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22VHZIZQ016074; Thu, 31 Mar 2022 17:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22VHZICP016073; Thu, 31 Mar 2022 17:35:18 GMT (envelope-from git) Date: Thu, 31 Mar 2022 17:35:18 GMT Message-Id: <202203311735.22VHZICP016073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 86220d3cbd50 - main - LinuxKPI: 802.11: fix compat code for i386 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86220d3cbd500b1018dcdabb0ba70644db438cfd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648748118; 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=3aFrsbrGJeb4fht1k4lCAF8taQTFVqja/uZZaxcUR0M=; b=YrmYL0Nbdku9xjVl57o7FhRCSJab1r1Tu5+2wykZg4s2VCWwjD9gtJjLuSfV2GdhMoBuMv Te9id+K0gCglWy6dApbmCXc0vbYFG9Y8T/jsIafas9haTJgkCHcXQNAll4xsNh91jRME/7 YzIvwLdmvcnxfyyNSmV7OshePclKRvpoPQ5mQzdbz0sInortqAXxm9ANJ53p2os4+jXH52 X6xpXxrGjLqvX7RG+xP0mI29LBfbhJ8MBw/+xQe2jFY2c3uVRtuMD5rZC2w0WtySsKiqMy PRnfAhzvtVSgzr5ErW7UH3TZPpHqWjQ/hP9gqRg6K7idAz/Zrt+gN5HpC6Au/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648748118; a=rsa-sha256; cv=none; b=gTB9WoiIAw0nfoqr3e7be943RWQBYeN7OroHOfccLcJVfvemcjifXzRPpjEfwNFHUs5hcE ZbIcqrNPOMNxTnW0UZtcSiA7GBtT+yg/hJqsVroSlnY31hcaxqqxJVeDDvBOn07D//0on1 xMkPpKbqMVDiV8hYfz7mrqHy6cnLMWbX9TmEqN+2L+LuQh3AnjkCkacN/rjNR8AcoWTrjl nw4NbKn0dWP5IatyWM+pKl7SyKtsdmLF70/Dt5SDJFbGYs937lCNdiVUbGA4OD6TdGPnzc Imelkmt3YtX7FKtuB9SrsnbcBmEzebqm4ICBOwqdNLIMrRgG08alNuvRSoQS4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=86220d3cbd500b1018dcdabb0ba70644db438cfd commit 86220d3cbd500b1018dcdabb0ba70644db438cfd Author: Bjoern A. Zeeb AuthorDate: 2022-03-31 17:29:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-31 17:29:53 +0000 LinuxKPI: 802.11: fix compat code for i386 Compiling another driver on i386 revealed two problems: - ieee80211_tx_info.status.status_driver_data space needs to be calculated. While a pointer is 32bit vm_paddr_t is 64 bit on i386 so we didn't fit more than one of these in but needed more space. - the arguments to ieee80211_txq_get_depth() are expected to unsigned long and not uint64_t. No user noticable changes. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 9 +++++---- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 5cf2c8b75e40..d69f5094765b 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -670,7 +670,7 @@ struct ieee80211_tx_info { uint8_t antenna; uint16_t tx_time; bool is_valid_ack_signal; - void *status_driver_data[2]; /* XXX TODO */ + void *status_driver_data[16 / sizeof(void *)]; /* XXX TODO */ } status; #define IEEE80211_TX_INFO_DRIVER_DATA_SIZE (5 * sizeof(void *)) /* XXX TODO 5? */ void *driver_data[IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *)]; @@ -900,8 +900,8 @@ struct sk_buff *linuxkpi_ieee80211_pspoll_get(struct ieee80211_hw *, struct ieee80211_vif *); struct sk_buff *linuxkpi_ieee80211_nullfunc_get(struct ieee80211_hw *, struct ieee80211_vif *, bool); -void linuxkpi_ieee80211_txq_get_depth(struct ieee80211_txq *, uint64_t *, - uint64_t *); +void linuxkpi_ieee80211_txq_get_depth(struct ieee80211_txq *, unsigned long *, + unsigned long *); struct wireless_dev *linuxkpi_ieee80211_vif_to_wdev(struct ieee80211_vif *); void linuxkpi_ieee80211_connection_loss(struct ieee80211_vif *); void linuxkpi_ieee80211_beacon_loss(struct ieee80211_vif *); @@ -1931,7 +1931,8 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) } static __inline void -ieee80211_txq_get_depth(struct ieee80211_txq *txq, uint64_t *frame_cnt, uint64_t *byte_cnt) +ieee80211_txq_get_depth(struct ieee80211_txq *txq, unsigned long *frame_cnt, + unsigned long *byte_cnt) { if (frame_cnt == NULL && byte_cnt == NULL) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3a70d8bbfcab..13ad2908c021 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4007,11 +4007,11 @@ linuxkpi_ieee80211_tx_dequeue(struct ieee80211_hw *hw, void linuxkpi_ieee80211_txq_get_depth(struct ieee80211_txq *txq, - uint64_t *frame_cnt, uint64_t *byte_cnt) + unsigned long *frame_cnt, unsigned long *byte_cnt) { struct lkpi_txq *ltxq; struct sk_buff *skb; - uint64_t fc, bc; + unsigned long fc, bc; ltxq = TXQ_TO_LTXQ(txq);