Received: by 2002:a05:7412:7c14:b0:fa:6e18:a558 with SMTP id ii20csp267615rdb; Mon, 22 Jan 2024 03:43:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHR9oY8pEzwbXcJBkS/pyRORzu90WUX/XZjYcNlMlky7JHcwAs/D6CglfqAhGZRla9watU1 X-Received: by 2002:a05:6512:281b:b0:50e:7557:b345 with SMTP id cf27-20020a056512281b00b0050e7557b345mr776613lfb.58.1705923831317; Mon, 22 Jan 2024 03:43:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705923831; cv=pass; d=google.com; s=arc-20160816; b=1Lzda1JZYrVIHmiWbjVj1pPesAet0oHoXVnBgd+XjxmYDBBwz29TREB0OY5MEkuAcQ D8ulQ+zG3Sc42eCjLSatsQ3NnMCzu2LdehfBIxN2VObF6QnjTCGmTryj9+jASn5AtECI c3Z+i5xYSbOMIOa+s2PJNhfGQDLc6YwX3w9qinFhy7uOrA5tuKbcJYzl9fKTxfx9VUxc lF1Xkv4dAwxHfkeAxEMJpI+C+pAuPClsWH/pMVbcAbppI9ksb2IR1FqAcIOQkGIctDzf S5SQ7R6CKo60JxDHymhGTrw8vBFZc9CZxFSBpRTVcviHCP0UJRzhXPLteOGIeOKgfx7H pbQQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=7W3YU2YgXwVUEfQNU3/tfbR9Tp/xv6ooTwFRN9fxGyE=; fh=nsXMNwyQ6Js4V/BswY1tH4B32D/qQcO3q9PUs38uuf4=; b=HDSZNQC4Y40+s3rRK7uhw0bMaba5uaKGSshcPx3dnNYfTvufEh+nR9wy9goayk0PLu j9QZlqLzrd8ztX9YoL63Z01P3qI6ClH7QquxyL1XxeU/6yuPDQV6+nzXnSLZo8yohsrW GVMd1ssnEUJB+XqesEA2vGl5JwmnSQ3aOeh7yGC0/mLRdRu30QV3L6T0Q6TtOsuxM4VQ C11Ih+hqVr13q3H8WOeAdArRFNY1O3R45BkzVw3FcraydFEkPow+HyuEe/Molq1Kmq7J hVuD0ipvCI+nM8+qwummbUd22IJf0bougMz5se7xV4XW6AgMSNS5emka0o3pkOQ2rWJ7 aoTw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=PFGQopL7; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-wireless+bounces-2316-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-wireless+bounces-2316-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id pv21-20020a170907209500b00a26db3465fasi10181946ejb.1028.2024.01.22.03.43.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 03:43:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless+bounces-2316-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=PFGQopL7; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-wireless+bounces-2316-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-wireless+bounces-2316-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B6C031F23859 for ; Mon, 22 Jan 2024 11:43:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 70EF33D55F; Mon, 22 Jan 2024 11:39:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="PFGQopL7" X-Original-To: linux-wireless@vger.kernel.org Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D2223D0D0 for ; Mon, 22 Jan 2024 11:39:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705923576; cv=none; b=d4LtKKFSDMWlq9hG1hcBnQ/rE/r2tLLDSOvUkrIrblEBDfAKN5OGfO0mG6lBOzSTTAaIn7pC6vV/c8GaNp6bd0bDLQoNpEv2vOxk38Bx2Khk7j9gb+o4UUAmlPGozPKkvxgg32QtdqaVto0obD6p2QNOmyV7capduzTeMFJbsvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705923576; c=relaxed/simple; bh=laFjmuLTwKnWdhL33Opkj8SmFmMtQdAK4zrpilSpSks=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Jg+58wTscodsQfZmnCgNkhW7npOPlgPk7OvC3VVget0C3ipACipz3UoixDmjYtCS6hIlt3sLyh8K6nIxUIBBnjkL9GT+VRXfSDRHNq4fxdirECsVWF5okKpweQsgF4O3X4mfj4aMhzaLYI6muXjJMbc8Q8v/ZCDeAQG3rlshkVs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=PFGQopL7; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40MAlthd002673; Mon, 22 Jan 2024 11:39:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= qcppdkim1; bh=7W3YU2YgXwVUEfQNU3/tfbR9Tp/xv6ooTwFRN9fxGyE=; b=PF GQopL7rRl5miASskoFJxHz+sbbVkl8BgEdHXO5e2V9IjzYBFeVTi8YzzFkafDiLJ A3xAjOrbMOFbgcZfSMJCMEZtESk+6+/lPyofUsi/mPyUC362wXh5kvyYG5Aqqx6e I00V3jT87ZtHIfHwhmUHOC4omWNJ9mLg6TSiEWhmAPD6BKw+E1jOk5vab2AoH86x yGZHrFTPn3KBfMyvfz/VXTR055Wf1edHAJXyXqPN2waaSjfJjsN/DkRQCZFUQZQm ozJYv63v7M97gLyYm5uywsyaPw9fFjlTdRxXt6jycW7i+pOchbGuxwm2QT/O3oA1 7mkOFosSTMGsKS9mwqhA== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vspw8r3xh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Jan 2024 11:39:26 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 40MBdPF5014889 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Jan 2024 11:39:25 GMT Received: from yk-E5440.qca.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Mon, 22 Jan 2024 03:39:24 -0800 From: Kang Yang To: CC: , Subject: [PATCH v3 01/10] wifi: ath12k: change interface combination for P2P mode Date: Mon, 22 Jan 2024 19:38:55 +0800 Message-ID: <20240122113904.8938-2-quic_kangyang@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240122113904.8938-1-quic_kangyang@quicinc.com> References: <20240122113904.8938-1-quic_kangyang@quicinc.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: SHGr0Rr_4WGmxJrIIQ2lpUeHxvGpgvh5 X-Proofpoint-ORIG-GUID: SHGr0Rr_4WGmxJrIIQ2lpUeHxvGpgvh5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-22_02,2024-01-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 adultscore=0 mlxscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 suspectscore=0 impostorscore=0 mlxlogscore=837 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401220083 Current interface combination doesn't support P2P mode. Change the combination for P2P mode. Also, there is a bug that when mesh is enabled but ap is not enabled. In this situation, the mesh's max_interface of interface combination won't be set. So assign the max_interfaces for mesh directly. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 Signed-off-by: Kang Yang --- v3: rebase on new ath-tag. v2: 1. add Tested-on tag of QCN9274. 2. update copyright. --- drivers/net/wireless/ath/ath12k/mac.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index fe600dbef875..4751bfeaf46f 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -7479,9 +7479,10 @@ static int ath12k_mac_setup_iface_combinations(struct ath12k_hw *ah) struct ieee80211_iface_combination *combinations; struct ieee80211_iface_limit *limits; int n_limits, max_interfaces; - bool ap, mesh; + bool ap, mesh, p2p; ap = ath12k_mac_is_iface_mode_enable(ah, NL80211_IFTYPE_AP); + p2p = ath12k_mac_is_iface_mode_enable(ah, NL80211_IFTYPE_P2P_DEVICE); mesh = IS_ENABLED(CONFIG_MAC80211_MESH) && ath12k_mac_is_iface_mode_enable(ah, NL80211_IFTYPE_MESH_POINT); @@ -7490,9 +7491,15 @@ static int ath12k_mac_setup_iface_combinations(struct ath12k_hw *ah) if (!combinations) return -ENOMEM; - if (ap || mesh) { + if ((ap || mesh) && !p2p) { n_limits = 2; max_interfaces = 16; + } else if (p2p) { + n_limits = 3; + if (ap || mesh) + max_interfaces = 16; + else + max_interfaces = 3; } else { n_limits = 1; max_interfaces = 1; @@ -7507,14 +7514,22 @@ static int ath12k_mac_setup_iface_combinations(struct ath12k_hw *ah) limits[0].max = 1; limits[0].types |= BIT(NL80211_IFTYPE_STATION); - if (ap) { + if (ap || mesh || p2p) limits[1].max = max_interfaces; + + if (ap) limits[1].types |= BIT(NL80211_IFTYPE_AP); - } if (mesh) limits[1].types |= BIT(NL80211_IFTYPE_MESH_POINT); + if (p2p) { + limits[1].types |= BIT(NL80211_IFTYPE_P2P_CLIENT) | + BIT(NL80211_IFTYPE_P2P_GO); + limits[2].max = 1; + limits[2].types |= BIT(NL80211_IFTYPE_P2P_DEVICE); + } + combinations[0].limits = limits; combinations[0].n_limits = n_limits; combinations[0].max_interfaces = max_interfaces; -- 2.34.1