From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18C4C3D1A97 for ; Wed, 5 Aug 2026 08:26:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918410; cv=none; b=LtjP8bpAfQdHnfFPGa4LtpYBMxb6sj56zFsoyBJZIj3mprUHHJk1+9mFnC+uWKgizmYgRXfdP9aAGiaxq+/2ZyGRjQJJIqnBvCj+rH/mbWrD05+jbsfUsxEUbFsWeoTSvqwoKBj3G3FqDFOiZKM20b+0tRS5SOChssgxRge0Yp4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785918410; c=relaxed/simple; bh=yxjNkZ8RDtnKLLBtUDzry9ka1J/AonCMd8VeTUNrAR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XMeTdW8bPBkNNs4GEEe/16s6dqKaAlRSNYiv21ATDRHQ5j9Oo3VJjemT6WyWqupZECNtc86IuXMu8+ArqJ2+eQmO4KIOX1lmMY0ch1hGon7k7mbd1hVmtE+CKcN1fXsXA7jhclutbLp2fKxsjhtZ8yrFNgFVMXHIHUouB1FOYQI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=sfdQaw33; arc=none smtp.client-ip=209.85.216.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sfdQaw33" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-382ef647e20so755292a91.1 for ; Wed, 05 Aug 2026 01:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785918408; x=1786523208; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4KvgqB1WiIQ06bt23ukkBqvaJLYhdGYjoetwwW9XLQg=; b=sfdQaw33hPMtMJ6/e0qQUyufva0MlSQLM4/Undv+XnclVtF+BXqOcqUVqeyRNk9dzE 5NFjgHcOZ383S6umRG2qPmFOH4Wqu9jskeWYtdX6gQmraE5jvjetFeDJI3tEWbqx/I+Y uZb5DjujXay7WYE4USF2+HWwtk0w9nX8bx5V5xmX4s8NqkgeWCla4H5lE8x/aLuBuK/X ESzUShuh7PN4T7OmpQL5l3Q4nZOamFkdWCQF8dd2whnanS2rhHyAIDI8nasD9vNLPdxX /r7j/HOCq1+gvmd0suBNWw47hPcUEtPQ+4eWbT7vg2sSFvp/GR/7WVvKYHWzeh39SUI2 tA0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785918408; x=1786523208; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4KvgqB1WiIQ06bt23ukkBqvaJLYhdGYjoetwwW9XLQg=; b=JIHA3VTgDWJf8b80gRMUvdjYgdL50cd3HGjG2bF7/upkqIStqaiTB/AHmj6A3p+PYN vQCSUNBZep5XsHBme+YO6C8Lj5Asd4jtgXAgRi2cXKPBtETNCjna1ZqWnvnDXlMpGA6J 5rGRu43JbNxZzsrTsJeSg8HxDhR3nFWphh3Hsi0QfCktOSSzEx5/X4oMe8wMByzsCmB0 He04pzzOm0rWvPT3ZTzvlqYczp9D1LiXvhC4JcuGyexTAFlpji1QmQ1ZMgIDrCanH05h RDi342EqGX67DvECUjrivVCGQfmZX8CjPMkWxwfzTcTCb6XDgTsKwssQrE0fJhzHnZ6I CM+w== X-Forwarded-Encrypted: i=1; AHgh+RorGwvEWg/3aGyIfM0iMqCAdlFaHRXMae1lBfR8P0JXcnJ4J6wY1Tuwh0MZJF8giJwXGJ5zCCU=@vger.kernel.org X-Gm-Message-State: AOJu0YzzaOLnQsVYilb+7LuX8qRilGXmxWFVIZsseH23r2catJ/siFw6 MTPkz73VNnUDaD2ZVzOYwG4WMAW192B7h+7yMMSf/D2oo/9UEKt0/syX X-Gm-Gg: AR+sD11o6i0aQXalYJrL+Pxydc+c8if4UYw9ntac8I8DXGC2oZXRyGc1EqsB8tdJKlu 2p4mjiPDMc/wtZtf30gHhBoPbyB68Mbmu1OqvSn9p2mWaoYIK/isBhEcXv7olnzhFor/dSxEqup TPfAl52fu2xZsurjYN+aGYt0t4p98CGTh31U5VSn2u1WOQ/GXY5wTu06DuuhYbDQ8BTOfOpLGvE cLhPp+zOpGO0AAmMUR4S7DjiFuCd/LrAP1UleFaeZfo+QcRarteDysvAZ5Y6v+OL3xkIpqwAICc tUCZKp4Vdvw/ig+ULXk/kJAEvMngB5gGT1VvhemrV0jvyVOCmoeIM+88HFEjBRlBHs8T2iPiDz+ iZXyu/N/15RHgbDUw6lKUxN9PDZphs/w4Y3SmrcIqCfwAHLuFI0p+8U7UblQw4BPrHfEafDQz9j Ed54jg0PS/9AaKfHRXOgBNwvZwvuRK16xxfwSJJT6YSTCK+yylPNF1KIquwf0wBOB5uUlAVDVo7 dGgOtlyxNow X-Received: by 2002:a17:90b:2782:b0:36a:8240:2477 with SMTP id 98e67ed59e1d1-3903c60c488mr5311472a91.19.1785918408334; Wed, 05 Aug 2026 01:26:48 -0700 (PDT) Received: from osman.mioffice.cn ([43.224.245.178]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3903f5fdfe5sm1263278a91.4.2026.08.05.01.26.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2026 01:26:47 -0700 (PDT) From: Zhan Xusheng X-Google-Original-From: Zhan Xusheng To: Miri Korenblit , linux-wireless@vger.kernel.org Cc: Johannes Berg , Richard Cochran , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, zhanxusheng@xiaomi.com Subject: [PATCH 1/2] wifi: iwlwifi: mvm: Fix GP2 to nanoseconds overflow on 32-bit Date: Wed, 5 Aug 2026 16:25:14 +0800 Message-ID: <20260805082515.4136842-2-zhanxusheng@xiaomi.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260805082515.4136842-1-zhanxusheng@xiaomi.com> References: <20260805082515.4136842-1-zhanxusheng@xiaomi.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit GP2 is a free-running 32-bit microsecond hardware counter. The PTP code converts a u32 GP2 value to nanoseconds as: gp2 * NSEC_PER_USEC NSEC_PER_USEC is a plain 'long' (1000L), so on 32-bit builds this multiplication is evaluated in 32-bit arithmetic and overflows once the GP2 value exceeds ~4.29 million microseconds (~4.3 s). GP2 wraps only every 2^32 microseconds (~71.5 min), so the product is truncated for almost the entire counter range, producing bogus PTP timestamps. Neighbouring conversions already cast to u64 first (e.g. (u64)gp2 * NSEC_PER_USEC); these sites just missed the cast. Cast to u64 so the multiplication is performed in 64-bit, matching the existing call sites. 64-bit builds are unaffected. Fixes: a2f49f7d52a9 ("wifi: iwlwifi: mvm: implement PHC clock adjustments") Fixes: 0e49e940d1bc ("wifi: iwlwifi: mvm: add an option to use ptp clock for rx timestamp") Signed-off-by: Zhan Xusheng --- drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 4 ++-- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c b/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c index 49dcb1388007..5f33e2f8fb2a 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c @@ -47,7 +47,7 @@ static void iwl_mvm_ptp_update_new_read(struct iwl_mvm *mvm, u32 gp2) u64 iwl_mvm_ptp_get_adj_time(struct iwl_mvm *mvm, u64 base_time_ns) { struct ptp_data *data = &mvm->ptp_data; - u64 last_gp2_ns = mvm->ptp_data.scale_update_gp2 * NSEC_PER_USEC; + u64 last_gp2_ns = (u64)mvm->ptp_data.scale_update_gp2 * NSEC_PER_USEC; u64 res; u64 diff; @@ -259,7 +259,7 @@ static int iwl_mvm_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm) */ gp2 = iwl_mvm_get_systime(mvm); data->scale_update_adj_time_ns = - iwl_mvm_ptp_get_adj_time(mvm, gp2 * NSEC_PER_USEC); + iwl_mvm_ptp_get_adj_time(mvm, (u64)gp2 * NSEC_PER_USEC); data->scale_update_gp2 = gp2; data->wrap_counter = 0; data->delta = 0; diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c index 7f0b4f5daa21..7c21cd89db93 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c @@ -2016,8 +2016,8 @@ static void iwl_mvm_rx_fill_status(struct iwl_mvm *mvm, rx_status->device_timestamp = phy_data->gp2_on_air_rise; if (mvm->rx_ts_ptp && mvm->monitor_on) { - u64 adj_time = - iwl_mvm_ptp_get_adj_time(mvm, phy_data->gp2_on_air_rise * NSEC_PER_USEC); + u64 gp2_ns = (u64)phy_data->gp2_on_air_rise * NSEC_PER_USEC; + u64 adj_time = iwl_mvm_ptp_get_adj_time(mvm, gp2_ns); rx_status->mactime = div64_u64(adj_time, NSEC_PER_USEC); rx_status->flag |= RX_FLAG_MACTIME_IS_RTAP_TS64; -- 2.43.0