From patchwork Wed Aug 28 07:40:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacobe Zang X-Patchwork-Id: 824394 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2115.outbound.protection.outlook.com [40.107.117.115]) (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 E20E115A87B; Wed, 28 Aug 2024 07:41:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.117.115 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724830904; cv=fail; b=DM8fqy9DwsgTF1iRP9lO3H8oR6NHKmJcg7VB9q1Ito+cqKgDUdr0xvWa+RK2pNM2+2oeyoTGWlhNdnxBQ3g+E6u5mRiPA6v4jx36XHVIyI88faCERak/2Xo0xtwkFV/DLOA3oQ6h6n3+4gVgs954AitDdlwL97d5qhVmpKF8nc0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724830904; c=relaxed/simple; bh=eaPDKg4EgZjhgoZGjOIrFz/PouRc4pgRKLayAeEjx7s=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=ERVQibT0DyoeD3/v1nBd8XtljWvOQpVuTnKPjWS4OX3OxpK9EZgaTsiV0tHFSriqDgjOOMXL1UCdyPL2JEAdw/xUKpzZ7yPUFL1KPPuiSKE1jv8dDJeN3m6CiyxF6Q6kXLzdiu0LgkZWbx+cdUtupMz2JDt8p5cY+0jgbCuea6k= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=wesion.com; spf=pass smtp.mailfrom=wesion.com; arc=fail smtp.client-ip=40.107.117.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=wesion.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wesion.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P1DkfV59s19/wgqENKjri/UKVrf61qbNBDpG6fdTe+e792HjhrsG+nklNWxPiGlkJeNz5FadD28XrdU9cdulKKOShXjFyes3EzLZEv98vNV+7zm6+zuScC7KymqEgeBdoQQpjMEfD8eoS6dww7DKH7n7pee6Ni39q3TrEgzzNY0f9GPNgDIlib5yL5Sbv09MFk3wBAWyv9w8rW1FqJbfOIcfzABFCE91zgV0gyfdZDyUR5HGjDIOBHjrBsSyqtQTFl6G8/DObJaeNxi4jVIXR2lxfsePUglku1cyXx8puLDJPrPygA6Rp6KxzDT4eiP3A+ZP3GP3+PKWy/3rdrwXRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iIa/19ZSdmiXE/+0Ze0XxBHm6vHkH0nd5ZiJsa5DkWA=; b=xXVMy44APLieOZZErPljFN5K6bZdBx8xf8hsKZ1sBQjJCBbihfulfYJCSaqc6Z+IuUjXYIWpyDy4ai4OQhKAi/LvNv3I0fELFlWjrXOKYE2xQflCmz1fzUpX7y+n/cdTeq1nNsT3wb3ruTNztFRKW+KXMtWbmlA5g2DQEyDwS5CCa4S+Apyeol2JejyHuDq+OaITjk/QJGd0eHTMWxcfTGPPqzctjcuwefdLGNpZvnAHZmY6eeimijozDT3c8aIaIs4gwe1H7EF6y5KJum9afPrZXpZ3GVsXo131i+QcNuOJJJ/7+r3g7RMmyWClkSPCuZvZ9Ug3n76PHeZZB0NzEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wesion.com; dmarc=pass action=none header.from=wesion.com; dkim=pass header.d=wesion.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wesion.com; Received: from TYZPR03MB7001.apcprd03.prod.outlook.com (2603:1096:400:26a::14) by KL1PR03MB7765.apcprd03.prod.outlook.com (2603:1096:820:ec::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.25; Wed, 28 Aug 2024 07:41:21 +0000 Received: from TYZPR03MB7001.apcprd03.prod.outlook.com ([fe80::78dd:5e68:1a9c:36c0]) by TYZPR03MB7001.apcprd03.prod.outlook.com ([fe80::78dd:5e68:1a9c:36c0%4]) with mapi id 15.20.7875.019; Wed, 28 Aug 2024 07:41:21 +0000 From: Jacobe Zang Date: Wed, 28 Aug 2024 15:40:52 +0800 Subject: [PATCH v12 5/5] wifi: brcmfmac: add flag for random seed during firmware download Message-Id: <20240828-wireless-mainline-v12-5-9064ac7acf1d@wesion.com> References: <20240828-wireless-mainline-v12-0-9064ac7acf1d@wesion.com> In-Reply-To: <20240828-wireless-mainline-v12-0-9064ac7acf1d@wesion.com> To: Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , van Spriel , Arend van Spriel Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, Jacobe Zang , Ondrej Jirman X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1724830868; l=6614; i=jacobe.zang@wesion.com; s=20240828; h=from:subject:message-id; bh=eaPDKg4EgZjhgoZGjOIrFz/PouRc4pgRKLayAeEjx7s=; b=14FbAN54TnGf0PTz7mST9t7L8IHhkUGrkrZMbAXiInJpzfj78gXEN4LqayO7q91ZlFbhqZtOb crq+Mr4tmsTDXKcVAOsx/4dEFAJWJAGDKR/ajx2syfBkfjqvqUP5J59 X-Developer-Key: i=jacobe.zang@wesion.com; a=ed25519; pk=CkP5TjIqHSwHJwZXTGtadoXZucYvakXcO3HjbR6FoeU= X-ClientProxiedBy: TYCP286CA0372.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:79::20) To TYZPR03MB7001.apcprd03.prod.outlook.com (2603:1096:400:26a::14) Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR03MB7001:EE_|KL1PR03MB7765:EE_ X-MS-Office365-Filtering-Correlation-Id: b72da464-45be-4d40-5573-08dcc734cf7e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|366016|1800799024|376014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?onRUCDpYHEmQ6DrdTmMjI+G0ZHevWJE?= =?utf-8?q?TgN+R/WMoy05rsIyue8Qd1y/M0AbaxlFvf86cvQcjTam3g1nlAfSgeyFFsz1zCoRV?= =?utf-8?q?cYmJKkz3YM98DztCl46Ua5b+DC1SN1U5u5XzjOx7DtXtfk2I6oCBKIpJUn91Ovwdp?= =?utf-8?q?WUBOqLAxUioqLlG+Vi8I/AoegeKOwuXzWx+v859bMKHSg8xb97QOs3eOCRg3JCgDH?= =?utf-8?q?HfaTjL5AEitXPcVgAWVvNMCUKOcWPbpgTrk5lwXbbbGGc7rTAXAvJRgB0nvukyPTw?= =?utf-8?q?e7gBKyAOebFlrJW2DKCU7Yp7Mrpkop9mN20ZZ6ykcxXDyuIdfTOo6ws684FZTjpKM?= =?utf-8?q?2Tjt7ysh3fEyfSNpd3HGNr3V4ohgDI8RElmXdVjT3P2iQQhDYtV6GN4r92QrIi8fL?= =?utf-8?q?C6fLsADnI6LGyKqPz9P6yhlVClz242Q+BtqOAR1SYNullAG9ekJsOGQXIegDzl37N?= =?utf-8?q?zgamfyKiWjVGZE+qsuwMHzrtyQfCyYDR1RobqeEZCcDtFAu7r9S+fQC/42QnbAEdt?= =?utf-8?q?YF2wDaJXBFv8pVKicVur94p2s1YWlUxLOocailvwwYu9BF+b0k/JmPXrA4iVnIWSO?= =?utf-8?q?OjR+upysNCnZ896F2RDboBGI38djLjPGTHJ+85b2iYP1YOwSbZ3n4fX4GuoStDcgc?= =?utf-8?q?paR36IOe3SQgCqGmjcXDlU7jCrIT794ar+4SeCJxayvWdpGxEjSnP4guy/ME8+rhz?= =?utf-8?q?wuz+p5ZjC0NdsxyH7q7oI804GeVYu843q2YQMgOicxWy3MzOIowGJ+RYrTmmbptfM?= =?utf-8?q?HUVIMVQxl9QSmbC7NP7WGadXRI1r3VjMIwkZSfQbfltoNkRAnK0J9Qm5Pjwe70U/D?= =?utf-8?q?nRN2FyAhlpeJdzk2XDtmyQi+tQ/TsiVZt6rzAIILzNq0F1yLbbZVTqx+9EVcGQjxA?= =?utf-8?q?O63jEZ7w8F2aTlchrYhj7ZySvlHbwzq8zWgLcZv46qIXJdgQ4fSir1oPA3ndxuI0T?= =?utf-8?q?XPHYGjtH9KE4rnIbUbUZz7JVbNHOASfI2++CGG18AOamUJxn9QRjMhO9wu5/OFtcr?= =?utf-8?q?8b0edm24jpQrmLx0zUtt9QbqG7glN4HtJNuQxrwGco9KU8na/Ia9iER5OTOclONN8?= =?utf-8?q?EhmH5o/acV1X521crJxCrEqTuH78oJXzd7nI6BdStGvUF0eHdMGBSQY42DklnmTis?= =?utf-8?q?F7ThwvvrVIVUDl1Jl0IialublRiOmpOf1ao2jZ0rOQLSnHGxVJA6d2wGdaPSMLPYF?= =?utf-8?q?i9/CK4LDJvmZ2J9x+14XTaByjfir2x2SKc1eMipm7uRsJswoy/GP3DmnzXW2VEhXD?= =?utf-8?q?3HV22k8214SV3sv5X8J5tjhIhgmplC1Vx9tH2ODWRhD7itUyoYEXJaBcvFB2aVsBG?= =?utf-8?q?Py8BNKlsHWCJIRuMAKapP34Rq/oP9HS14Hy50YO8H5XPIUd7SdcCmIo=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYZPR03MB7001.apcprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(366016)(1800799024)(376014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?B9VMYJkHQi3YUOHZl+MQMKt0N2qe?= =?utf-8?q?TOhU3AGUYsOgEAL4UU9Wb9lst4ohBUbsDzpO98fOIGA9CPljsfgwyIDBQLlO/NBYr?= =?utf-8?q?rdspb/Cd7riU9JMgzX0My9Xp3l5hqmlyaxFIsrwBl3LPS/FJyEiRimOE4JsmgpBFI?= =?utf-8?q?S+hdHewlP34sphPpwogzSUBEd5RK7ssrQsPVIdjl6Pn+n2N8rqU157TyCi7dCbRd9?= =?utf-8?q?KwKPzfvQBVgl0//Z9qxRIiG33xD63qI855JohLKJcJNa1HBwILYueaPOvTo3pTA0d?= =?utf-8?q?iIZpPKhVe6uc3VQmxG3diTo6km30cEpuGBCF1gCvW9Dih4fP56xhki+kNBhBTlmgm?= =?utf-8?q?M4M3djTRIsbyd1H7rHaAaXIMtOyooPSyHfxtVaHrpe8IUZ7I1iAUlX4wmEpATLiEo?= =?utf-8?q?CZH0geRDF03PkCDUvY+R6F19A+UDxfgcXQvalFiDlXgyWf7KDOMUPJfj6xty+Hjwr?= =?utf-8?q?pTftzScf00sxDTpLIZsgRCLs73BpnfnGF5OORSPa5dlisVYownCdn6r4mXBBlcn0L?= =?utf-8?q?Xp1ndjd/UJUS0D11XGTYSq9w02YNYPdDCDmAu25KmXZj/az8Iw79e+OhCF7OiPZpR?= =?utf-8?q?WVF7TjtzDiNqMOieIhnyxfLVs7MusWUX6zhmCnekKrCPBb2Rxve6/kOqx1kXwDfBF?= =?utf-8?q?tLz6lt5Ud8AqluUiwb5lcloYVjd13d8VRvTXxX9/1rbCqdZR08defZPPM+jwboziN?= =?utf-8?q?Lp3qH+q7iQaykdICmv2KZMdm9DxevgVzTaJOj3q+fUj+8LS9yrSuETBkRbvMY7du5?= =?utf-8?q?LsIrR1gmjK+qQiS0C6ym5RVfg14pfTrg26wmr2m36/2+7r4OzbnIQvqbolUmEwn5S?= =?utf-8?q?WlOqTiMSTaczzCc5dzsXlYTpECs3ttM/8p5dB8TyDbhmJOGehyyrhkzZDWwHDG6M9?= =?utf-8?q?Mk2iYlGhxOjgymTKkHnmrOUaGg6HwhrJIjeLX2i3F4XaiP+WSu7+W3ebcFNCnRF3H?= =?utf-8?q?FlvJoJk8EmtUpeQR4p5O+9V2R6qlVMNEnUh0HIw/FGCA71c7jAUphmsUMPjQgMfyp?= =?utf-8?q?Lh7GnK49FPkEtkauHvXoVR0F/HiL2bZDjdz2bluP7Pz05fAZqNpPqGOFgRf2bayqx?= =?utf-8?q?wYr3dftJq+rAq+5Ut8YRcXNPpCxl/Ve6O+eENITXx7vK/7RSTFjlTnarFLLNxtdhB?= =?utf-8?q?KhBmlWSuCdJ+PripUluTx9Pr528t8LpjycLCThNhLL5UE64WO9sjYNgF7F4d5XhYb?= =?utf-8?q?3iz6kHl9E55fpMy6fHJTDouox0wNWNMu6ajRnAdxeAyjgqNbWi/iR9dc4cbFpmtJQ?= =?utf-8?q?rHh3V+nAyCIyIlW7oLLihh3B9cvfJvJeVAaVzA3wHDHam4JkpSs8quB9f7pvnLVYl?= =?utf-8?q?YLhE7jSUIvNyqneA0soa3NWFhtCNW5pFE49NodiqkRlWo0Bfe0ZaMmxSyj9IJTMlR?= =?utf-8?q?NVkLd6w6diaa1jioq/TgMR2zXfV/JFz5OA21fx6Fz9uWSUh9GCP3WDk0x0narn9PT?= =?utf-8?q?n0LZnIUdzdYHDy277I4VstHX2h2bE9nz/CStQhHfFP2L6pEBZHKLlmCaIbZ7Ekb/N?= =?utf-8?q?4LSAmWFHtk0p?= X-OriginatorOrg: wesion.com X-MS-Exchange-CrossTenant-Network-Message-Id: b72da464-45be-4d40-5573-08dcc734cf7e X-MS-Exchange-CrossTenant-AuthSource: TYZPR03MB7001.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2024 07:41:21.3747 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 2dc3bd76-7ac2-4780-a5b7-6c6cc6b5af9b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MyFIYzjCXi+SUuIiF3p42etcXmXQJxYiDzninIBErSiR+GWuu/AwJbSx88jH0PXgfMuWJIDToKrfuc5mtBHj+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR03MB7765 Providing the random seed to firmware was tied to the fact that the device has a valid OTP, which worked for some Apple chips. However, it turns out the BCM43752 device also needs the random seed in order to get firmware running. Suspect it is simply tied to the firmware branch used for the device. Introducing a mechanism to allow setting it for a device through the device table. Co-developed-by: Ondrej Jirman Signed-off-by: Ondrej Jirman Co-developed-by: Arend van Spriel Signed-off-by: Arend van Spriel Signed-off-by: Jacobe Zang --- .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 52 ++++++++++++++++++---- .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 190e8990618c5..c0fdaa4dceda4 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -66,6 +66,7 @@ BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie"); BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie"); BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie"); BRCMF_FW_DEF(4371, "brcmfmac4371-pcie"); +BRCMF_FW_CLM_DEF(43752, "brcmfmac43752-pcie"); BRCMF_FW_CLM_DEF(4377B3, "brcmfmac4377b3-pcie"); BRCMF_FW_CLM_DEF(4378B1, "brcmfmac4378b1-pcie"); BRCMF_FW_CLM_DEF(4378B3, "brcmfmac4378b3-pcie"); @@ -104,6 +105,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_43664_CHIP_ID, 0xFFFFFFF0, 4366C), BRCMF_FW_ENTRY(BRCM_CC_43666_CHIP_ID, 0xFFFFFFF0, 4366C), BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371), + BRCMF_FW_ENTRY(BRCM_CC_43752_CHIP_ID, 0xFFFFFFFF, 43752), BRCMF_FW_ENTRY(BRCM_CC_4377_CHIP_ID, 0xFFFFFFFF, 4377B3), /* revision ID 4 */ BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0x0000000F, 4378B1), /* revision ID 3 */ BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFE0, 4378B3), /* revision ID 5 */ @@ -353,6 +355,7 @@ struct brcmf_pciedev_info { u16 value); struct brcmf_mp_device *settings; struct brcmf_otp_params otp; + bool fwseed; #ifdef DEBUG u32 console_interval; bool console_active; @@ -1715,14 +1718,14 @@ static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo, memcpy_toio(devinfo->tcm + address, nvram, nvram_len); brcmf_fw_nvram_free(nvram); - if (devinfo->otp.valid) { + if (devinfo->fwseed) { size_t rand_len = BRCMF_RANDOM_SEED_LENGTH; struct brcmf_random_seed_footer footer = { .length = cpu_to_le32(rand_len), .magic = cpu_to_le32(BRCMF_RANDOM_SEED_MAGIC), }; - /* Some Apple chips/firmwares expect a buffer of random + /* Some chips/firmwares expect a buffer of random * data to be present before NVRAM */ brcmf_dbg(PCIE, "Download random seed\n"); @@ -2394,6 +2397,37 @@ static void brcmf_pcie_debugfs_create(struct device *dev) } #endif +struct brcmf_pcie_drvdata { + enum brcmf_fwvendor vendor; + bool fw_seed; +}; + +enum { + BRCMF_DRVDATA_CYW, + BRCMF_DRVDATA_BCA, + BRCMF_DRVDATA_WCC, + BRCMF_DRVDATA_WCC_SEED, +}; + +static const struct brcmf_pcie_drvdata drvdata[] = { + [BRCMF_DRVDATA_CYW] = { + .vendor = BRCMF_FWVENDOR_CYW, + .fw_seed = false, + }, + [BRCMF_DRVDATA_BCA] = { + .vendor = BRCMF_FWVENDOR_BCA, + .fw_seed = false, + }, + [BRCMF_DRVDATA_WCC] = { + .vendor = BRCMF_FWVENDOR_WCC, + .fw_seed = false, + }, + [BRCMF_DRVDATA_WCC_SEED] = { + .vendor = BRCMF_FWVENDOR_WCC, + .fw_seed = true, + }, +}; + /* Forward declaration for pci_match_id() call */ static const struct pci_device_id brcmf_pcie_devid_table[]; @@ -2475,9 +2509,10 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) bus->bus_priv.pcie = pcie_bus_dev; bus->ops = &brcmf_pcie_bus_ops; bus->proto_type = BRCMF_PROTO_MSGBUF; - bus->fwvid = id->driver_data; bus->chip = devinfo->coreid; bus->wowl_supported = pci_pme_capable(pdev, PCI_D3hot); + bus->fwvid = drvdata[id->driver_data].vendor; + devinfo->fwseed = drvdata[id->driver_data].fw_seed; dev_set_drvdata(&pdev->dev, bus); ret = brcmf_alloc(&devinfo->pdev->dev, devinfo->settings); @@ -2663,14 +2698,14 @@ static const struct dev_pm_ops brcmf_pciedrvr_pm = { BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id), \ PCI_ANY_ID, PCI_ANY_ID, \ PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, \ - BRCMF_FWVENDOR_ ## fw_vend \ + BRCMF_DRVDATA_ ## fw_vend \ } #define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev, fw_vend) \ { \ BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id), \ (subvend), (subdev), \ PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, \ - BRCMF_FWVENDOR_ ## fw_vend \ + BRCMF_DRVDATA_ ## fw_vend \ } static const struct pci_device_id brcmf_pcie_devid_table[] = { @@ -2698,9 +2733,10 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID, BCA), BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_43596_DEVICE_ID, CYW), - BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID, WCC), - BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_DEVICE_ID, WCC), - BRCMF_PCIE_DEVICE(BRCM_PCIE_4387_DEVICE_ID, WCC), + BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID, WCC_SEED), + BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_DEVICE_ID, WCC_SEED), + BRCMF_PCIE_DEVICE(BRCM_PCIE_4387_DEVICE_ID, WCC_SEED), + BRCMF_PCIE_DEVICE(BRCM_PCIE_43752_DEVICE_ID, WCC_SEED), { /* end: all zeroes */ } }; diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h index 44684bf1b9acc..c1e22c589d85e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h @@ -52,6 +52,7 @@ #define BRCM_CC_43664_CHIP_ID 43664 #define BRCM_CC_43666_CHIP_ID 43666 #define BRCM_CC_4371_CHIP_ID 0x4371 +#define BRCM_CC_43752_CHIP_ID 43752 #define BRCM_CC_4377_CHIP_ID 0x4377 #define BRCM_CC_4378_CHIP_ID 0x4378 #define BRCM_CC_4387_CHIP_ID 0x4387 @@ -94,6 +95,7 @@ #define BRCM_PCIE_4366_5G_DEVICE_ID 0x43c5 #define BRCM_PCIE_4371_DEVICE_ID 0x440d #define BRCM_PCIE_43596_DEVICE_ID 0x4415 +#define BRCM_PCIE_43752_DEVICE_ID 0x449d #define BRCM_PCIE_4377_DEVICE_ID 0x4488 #define BRCM_PCIE_4378_DEVICE_ID 0x4425 #define BRCM_PCIE_4387_DEVICE_ID 0x4433