From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 6D7FF367B9C for ; Wed, 2 Sep 2026 08:22:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788337350; cv=none; b=pMYO9e6YS3csFziYBQf4p11E1QAZKNeT4Ymsy44jqAZs4lvmAnu7SAQwE8kC1rDmJEufXbtCcJ3Zb1Xk8wZo+uS0JAdOTBD6LQCAk/LkHWi/zz4lc5IcUlIreZCJWNHGxD2dTl3yhhEn3QLpYgyvxhw9l8FPFFq2YipFOj82j5E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788337350; c=relaxed/simple; bh=oa6HjGViZFyoRJTy/Z2W2UNJiXRoDabPV0p1bGeDSUk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fcFF8Aa3WPOV9+7EDiVg8sZZ91JgRS2kQYXKPUMkpZn9RQq5IAZiyAAcvFQVhLY003l6pMcLUBv9tW7JAiclIVU8Dcmopb88P6BQQpCrxizPgExJkY4Rt5IHPYMjkKCV0K5ox1CaC7kYZAiHuLTEBE7BGWluWmDp8bdrCHODYes= 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=r3wSR1M0; arc=none smtp.client-ip=209.85.128.53 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="r3wSR1M0" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4998b5a63e2so7391285e9.1 for ; Wed, 02 Sep 2026 01:22:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788337347; x=1788942147; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=ST0JywuIijs9AyXrfzYTAQmxlPvMrq1DLcWk/E2Kd+c=; b=r3wSR1M0Ek5YvFsPi2mgqJ4woTPjSWVqC/4MFzlWs559LC2b6i5PPGUEIRKTFv4dBP AjkxaQ0Gk1SQ9Q0ncAR49H9g8PzSfpIEoCBRk2zvFCfFkjHt4jd7QNxTa7hV6vY2juyt m2c6XzN5gSOKKoliPpPtuUL5goqlrHjT+SqYzNvk2+nbxTvaHKkXBHhsAKVTcKeiBnEe iQSupFYo5JsKpEO9Vzh4ZwJ926yTk1js0997M1h58oHFbbEHgthggMA62WRDlQPLo/eX yD4f+XVkkj9coZ0jX3NQZOcC/T5YRz0dt/iBSo9QMCGIVcei0Ad5HjYbkvrM5vf09Z0H dypw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788337347; x=1788942147; h=content-transfer-encoding:mime-version: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=ST0JywuIijs9AyXrfzYTAQmxlPvMrq1DLcWk/E2Kd+c=; b=XA+CglpGwzFoxeyOU58cEPkZNFEKCXeTg2ODDOORLMico/93slPxZ7+mVgIuzgKL4J eNycdDJJKY+q9pqAVcHq439V5PJwBeErKCglWbODftaWHAPioHugf9sI1XaiyYtggBZr KbTaL3m930kjvOBSX7vuFEB0WLZQ2qNiNOEGzzbxE+T9czLIwQcUakmnC9y8FBXqfOtr Zm6FTYKvX8Qhc44aGLbni9sOpLX9eR8bX4085G7EdDQpXtX875vAQc+PCqxRLsMiC0Vd 1Iu+0Fb4VQVOA/bvUqIDYOcMGjmhdQ1AXGWGcry+tYXvZgRAvKDBnkG/DPKbImZUjyBR 9FHA== X-Forwarded-Encrypted: i=1; AHgh+RrBvXEmOArzwIrZmhUfoTkNNouBECpWJDs7DiDgrJMj2TvV5nj69kIqGYN+syxswLQSIPJ2THkEpfqkfsQ=@vger.kernel.org X-Gm-Message-State: AFuF++nD+pDggk+UpPkezReOierfK6NAEC4y/qS7lcuRa69EVU/54qk+ RN5NNPKliNUqEuXpt2Slw0r6pD+ZyXm1QP8/+6VjSe27JKGZS/LRApSO X-Gm-Gg: AR+sD13CLBfzFReE2sGbO1nzmQyIwp+GneqF7Hudx0yvdmxKY9tFydntayddhrBVaWo lfDsEZQg4jZklaZqxn6ujpPbKZnQPnNWpgPPx2qdeARYiGR3os2drYyjVEKx5V/QoFOhyY3s2Qb 3osuubA6jdnUQ3e8uhHn3/ajEMmqgi0lvVVw6fNj3qFknIBYMRXIVdh33OeaVoqMKcx5CYnWbjt mIBzR1YBFQmxG+g5yZ/SAug/6hJeXZTd2GTMtUky5MnEsUrzwbwvBeNhBHgeR2nxKEPwZIdxCJr pPfQ9m4l28a8En6h7hmgiRo7cysROSpEg8MwdnXstYzAmoRKkoaBWKx/TmLe2/cqQs+5RDxysno vIs0PIcl2uhhg5eRpRJA5LcPNgy6yyVyAkbrQs7jPYaqw3Hi0Ff7A1vJ+enmMTyzY4ubY87hAhy Zr5YCzteistSlNIrbvtHZAci1FDoGuF3f81UJJyNfOtlC0oWorj+M= X-Received: by 2002:a05:600c:c170:b0:49b:d45:703e with SMTP id 5b1f17b1804b1-49ce57f072fmr62819355e9.8.1788337346382; Wed, 02 Sep 2026 01:22:26 -0700 (PDT) Received: from vitor-nb ([2001:8a0:c4c6:f00:e66:da8a:ae8a:96d3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448ee9cf7sm4992947f8f.25.2026.09.02.01.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2026 01:22:25 -0700 (PDT) From: Vitor Soares To: Jeff Johnson Cc: Vitor Soares , linux-wireless@vger.kernel.org, ath12k@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH ath-next] wifi: ath12k: provide MAC address list for single-radio wiphys Date: Wed, 2 Sep 2026 09:22:18 +0100 Message-ID: <20260902082219.3010793-2-ivitro@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Vitor Soares ath12k supports creating vdevs with addresses provided by mac80211. Userspace can already make concurrent interfaces work by explicitly assigning different locally administered addresses. However, ath12k does not advertise an address list, so when a second interface is created without an explicit address, mac80211 has nothing to pick from and falls back to the permanent address. If the first interface is already running with that address, bringing up the second one fails with -ENOTUNIQ. As in ath11k, provide a list of usable addresses so ieee80211_assign_perm_addr() can hand each new interface an unused one. Keep the first entry as the radio's own MAC address. Generate the remaining entries as locally administered variants by changing only the upper nibble of the first octet, which naturally limits the pool to 16 unique addresses. Handle only single-radio wiphys. Wiphys with more than one radio behave exactly as before. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Vitor Soares --- Note that a device which is not MLO capable registers one wiphy per radio, so each radio of a multi-radio device also gets a pool, seeded from that radio's own MAC. I only have single-radio WCN7850 hardware, so that case is untested. --- drivers/net/wireless/ath/ath12k/mac.c | 48 +++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index 9a775602775d..bee6701f1029 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -14685,6 +14685,50 @@ static void ath12k_mac_cleanup_unregister(struct ath12k *ar) kfree(ar->mac.sbands[NL80211_BAND_6GHZ].channels); } +static void ath12k_mac_cleanup_mac_address_list(struct ath12k_hw *ah) +{ + kfree(ah->hw->wiphy->addresses); +} + +static void ath12k_mac_setup_mac_address_list(struct ath12k_hw *ah, + const u8 *mac_addr) +{ + struct ath12k *ar = ath12k_ah_to_ar(ah, 0); + struct mac_address *addresses; + u16 n_addresses; + int i; + + /* The pool is derived from one base address, so it can describe only a + * single-radio wiphy: with more radios each radio has its own base + * address, possibly from a different ath12k_base. + */ + if (ah->num_radio != 1) + return; + + /* Only the upper nibble of the first octet is varied, so at most 16 + * addresses can be derived from one base. + */ + n_addresses = min_t(u16, TARGET_NUM_VDEVS(ar->ab), 16); + if (n_addresses <= 1) + return; + + addresses = kzalloc_objs(*addresses, n_addresses); + if (!addresses) + return; + + ether_addr_copy(addresses[0].addr, mac_addr); + for (i = 1; i < n_addresses; i++) { + ether_addr_copy(addresses[i].addr, mac_addr); + /* set Local Administered Address bit */ + addresses[i].addr[0] |= 0x2; + + addresses[i].addr[0] += i << 4; + } + + ah->hw->wiphy->addresses = addresses; + ah->hw->wiphy->n_addresses = n_addresses; +} + static void ath12k_mac_hw_unregister(struct ath12k_hw *ah) { struct ieee80211_hw *hw = ah->hw; @@ -14704,6 +14748,7 @@ static void ath12k_mac_hw_unregister(struct ath12k_hw *ah) ath12k_mac_cleanup_unregister(ar); ath12k_mac_cleanup_iface_combinations(ah); + ath12k_mac_cleanup_mac_address_list(ah); SET_IEEE80211_DEV(hw, NULL); } @@ -14820,6 +14865,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah) wiphy->available_antennas_tx = antennas_tx; SET_IEEE80211_PERM_ADDR(hw, mac_addr); + ath12k_mac_setup_mac_address_list(ah, mac_addr); SET_IEEE80211_DEV(hw, ab->dev); ret = ath12k_mac_setup_iface_combinations(ah); @@ -15041,6 +15087,8 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah) ath12k_mac_cleanup_unregister(ar); } + ath12k_mac_cleanup_mac_address_list(ah); + SET_IEEE80211_DEV(hw, NULL); return ret; -- 2.55.0