From patchwork Fri Nov 10 14:29:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13452455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 72368C4332F for ; Fri, 10 Nov 2023 14:30:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Bg6FzqOqYklsY1mncsYlVB1nxUAJEPjJT2rqIjpGJbI=; b=z50BM+LegpLtiN D58+IpmeC9XSB+6B6wVMJ7Cqzierl3P5+k7p/Lp13L08nAMV88pKVnsxXwpaeTr7m36WSPiPZ3E03 4Yvq/OKKz3fLy5PuS239+g/v0viFtGPbAOZhH6LdjmzKZ1Pyhbw5RvjPAivg2T6ZE3uavhtomquQJ silqdZolmk1lcg1zcvdYslmp9KxSGJJv0LYyN2CwyV8tPStMwupFruL6xwN7N8BC7v8wAA4P8vYI7 1OQn9d2Dgjm59e0nnA6QnRicXSirD6XHv75wA1DE+/+po8fMooRksPFo5+wAzJST3X7ZcUXeDeLEd fKtb8uG0ChIr4l6rB0Fg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r1SWG-008vbH-0w; Fri, 10 Nov 2023 14:30:00 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r1SWE-008vaF-0a; Fri, 10 Nov 2023 14:29:59 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 75919619F8; Fri, 10 Nov 2023 14:29:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AA8BC433C7; Fri, 10 Nov 2023 14:29:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699626596; bh=nLlP5zYhWe9W91LWYdUOANl7JYKJxORxVdmkjcwH0Fs=; h=From:To:Cc:Subject:Date:From; b=qxa3WiwlZU/JYQmPYD4XnuPogZqrblGFEefjgDc/LBLt0n3SAtxDGBwMrw5zi5QeQ /ze1SQmOpav4e+VBgWN97fcnudCWzsL6zaqzYT+SWuUF3Q0ba7KXIhANddvQkKm2VA lj9rGCIVCEGuIej00dRE1LiXkyc4f5OsOeCVM44z1tUXAIVM7laGJOOrDdsnUj8iFD NvjlJt1XfuXm52Zu8yUdBbTZdg8xObKvFgVqPUdLyqZhv3GCTmZxIwQPRp4nXi8rfJ e3KAEvn6G3hX06UVnBv1maxNmFjqvVRrDhSuCPB0jNeNSdMzsDBkm8luHnTiyqWtOj ZK8D1eHHtqdLA== From: Arnd Bergmann To: Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Kalle Valo , Matthias Brugger , AngeloGioacchino Del Regno , Yi-Chia Hsieh , Peter Chiu , Money Wang , Evelyn Tsai Cc: Arnd Bergmann , Shayne Chen , Sean Wang , Bo Jiao , MeiChia Chiu , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH] wifi: mt76: mt7996: fix mt7996_mcu_all_sta_info_event struct packing Date: Fri, 10 Nov 2023 15:29:30 +0100 Message-Id: <20231110142948.3841137-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231110_062958_265295_C6BF0B2D X-CRM114-Status: GOOD ( 10.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The internal struct and union inside mt7996_mcu_all_sta_info_event is marked as being aligned, which conflicts with it being unaligned within that structure: drivers/net/wireless/mediatek/mt76/mt7996/mcu.h:165:2: error: field within 'struct mt7996_mcu_all_sta_info_event' is less aligned than 'union mt7996_mcu_all_sta_info_event::(anonymous at ../drivers/net/wireless/mediatek/mt76/mt7996/mcu.h:165:2)' and is usually due to 'struct mt7996_mcu_all_sta_info_event' being packed, which can lead to unaligned accesses [-Werror,-Wunaligned-access] Mark all three as being packed as well to ensure byte packing for the entire thing. Fixes: adde3eed4a75 ("wifi: mt76: mt7996: Add mcu commands for getting sta tx statistic") Signed-off-by: Arnd Bergmann --- drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h index a88f6af323da..e20c38f17827 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h @@ -168,15 +168,15 @@ struct mt7996_mcu_all_sta_info_event { u8 rsv[2]; __le32 tx_bytes[IEEE80211_NUM_ACS]; __le32 rx_bytes[IEEE80211_NUM_ACS]; - } adm_stat[0]; + } adm_stat[0] __packed; struct { __le16 wlan_idx; u8 rsv[2]; __le32 tx_msdu_cnt; __le32 rx_msdu_cnt; - } msdu_cnt[0]; - }; + } msdu_cnt[0] __packed; + } __packed; } __packed; enum mt7996_chan_mib_offs {