From patchwork Tue Feb 14 08:00:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hector Martin X-Patchwork-Id: 56744 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2830256wrn; Tue, 14 Feb 2023 00:04:15 -0800 (PST) X-Google-Smtp-Source: AK7set/SGMmfc90oJuMq3ipEGU81L2gPXvAC3uj8dae/Vx3Xn8BbX+OFkNNACV2n3NaJwdb3qQVs X-Received: by 2002:a05:6a20:54a8:b0:c2:b6cf:96db with SMTP id i40-20020a056a2054a800b000c2b6cf96dbmr1641552pzk.39.1676361855138; Tue, 14 Feb 2023 00:04:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676361855; cv=none; d=google.com; s=arc-20160816; b=kevzHf/eDwMryCSYQFh/ctbTdR/QUIpeHNysCX4vounpK3h+002I7ZmLsZUu7i7kuv raQ3h6xt9YNCUuwxGvG5Er9IbUmHhIkJQsKWzP8qvzZPDFKfg8PoC3eFW2JX4HE2jRcs sDEs/QWZ+mf18J2l5BNOb0WNmKh5T6zWECwhaIsGsyqFfr+5xR+mpp5+Xt77toKNqMLJ 8+lqry0EHO+MajFRWpu5QwQYjqotRJvD8hogTQxM42+BsfPbFaNFtVtJrnJuLVnA28h6 PTKeD6nCyjGrR6aotub4uKMxnoAwZSzj3rvFPEJvcI9lWVWpd6Vby1NvkvUZsiCjXivy B0hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cWxt0Pft5h/NSYlybdUh6DuQNx098VABaE6u/W/sqi8=; b=Y4l05mdl2HCt+lIDXMLmLr6MVGbpbLXpyut1gwQuxemAVdn02ll+sPlXMo4qF5XYK7 tluIBtpApSxhjwBmuSEL0vLe+Y0Wom7FOt9YdQksM0uS6TJPavXRgbCcrBuU5NdEViRD qyCYYoj+gQjmPQrEMdPV4NzO1KUS74lUKVBAJqvT9CNsVSfIFQJiLZkMn+UerS+p4QTR jdIlil1oUBeCYiK4n5QpbpVwtWbI/NxQSQBxIzc6ryXGNh+Q7M8jfYnb6KK9vEigx6U7 d9xRmDo5wD1wdviK3GeXH5EXX4vloN6OqVdNyLKSRik5O7RsEZsXnWxTp45PXgwqI49E NWAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=IxuZaZcP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=marcan.st Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a3-20020aa78e83000000b00593af3fcbe5si7776684pfr.223.2023.02.14.00.04.02; Tue, 14 Feb 2023 00:04:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=IxuZaZcP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=marcan.st Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231810AbjBNICV (ORCPT + 99 others); Tue, 14 Feb 2023 03:02:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229623AbjBNIBu (ORCPT ); Tue, 14 Feb 2023 03:01:50 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 215FF3584; Tue, 14 Feb 2023 00:01:49 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sendonly@marcansoft.com) by mail.marcansoft.com (Postfix) with ESMTPSA id 021AA4267F; Tue, 14 Feb 2023 08:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1676361707; bh=aKnwARwXd9Y7kXM6JWwg7MoyGvJiNp/PyCpUc6DQNog=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IxuZaZcPAXWh+4LM80B8l4CJl7M594WmlV+Yf1P036e5gCPRAwzuG+GoZP+sD/Ilh tiYISzhqdBmtnNfglg6yXlrG1c6i6cFvZ8P54SkPw5So2c8cE5LZyzG3DgB5ztgGg6 T0+SUuDTUlpKKRWwjSd6XTE6tG8KQvHVLyLmSvvHtdQk32p4+1dGOQwQUw31g0mL2G ihHTQScAJ8viYuAsAtJsX9ktqisXH6j5YVpg3KldeFkkVrhMsfN0NhkiQdPBozXDoa ivN2WPjB8inCg+PTv8OGZGlRndYvWTM79e+/3Z0yJ4qxKnAljdTLLtTj6XBM2B3wTv +kO9YiQlhX7mw== From: Hector Martin To: Arend van Spriel , Franky Lin , Hante Meuleman , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Sven Peter , Alyssa Rosenzweig , Linus Walleij , asahi@lists.linux.dev, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hector Martin Subject: [PATCH 2/2] brcmfmac: pcie: Provide a buffer of random bytes to the device Date: Tue, 14 Feb 2023 17:00:34 +0900 Message-Id: <20230214080034.3828-3-marcan@marcan.st> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230214080034.3828-1-marcan@marcan.st> References: <20230214080034.3828-1-marcan@marcan.st> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757792808930401367?= X-GMAIL-MSGID: =?utf-8?q?1757792808930401367?= Newer Apple firmwares on chipsets without a hardware RNG require the host to provide a buffer of 256 random bytes to the device on initialization. This buffer is present immediately before NVRAM, suffixed by a footer containing a magic number and the buffer length. This won't affect chips/firmwares that do not use this feature, so do it unconditionally for all Apple platforms (those with an Apple OTP). Reviewed-by: Linus Walleij Signed-off-by: Hector Martin Reviewed-by: Julian Calaby --- .../broadcom/brcm80211/brcmfmac/pcie.c | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index f320b6ce8bff..a7b88ab609c2 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -1653,6 +1654,13 @@ brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo, return 0; } +struct brcmf_random_seed_footer { + __le32 length; + __le32 magic; +}; + +#define BRCMF_RANDOM_SEED_MAGIC 0xfeedc0de +#define BRCMF_RANDOM_SEED_LENGTH 0x100 static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo, const struct firmware *fw, void *nvram, @@ -1689,6 +1697,30 @@ static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo, nvram_len; memcpy_toio(devinfo->tcm + address, nvram, nvram_len); brcmf_fw_nvram_free(nvram); + + if (devinfo->otp.valid) { + 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), + }; + void *randbuf; + + /* Some Apple chips/firmwares expect a buffer of random + * data to be present before NVRAM + */ + brcmf_dbg(PCIE, "Download random seed\n"); + + address -= sizeof(footer); + memcpy_toio(devinfo->tcm + address, &footer, + sizeof(footer)); + + address -= rand_len; + randbuf = kzalloc(rand_len, GFP_KERNEL); + get_random_bytes(randbuf, rand_len); + memcpy_toio(devinfo->tcm + address, randbuf, rand_len); + kfree(randbuf); + } } else { brcmf_dbg(PCIE, "No matching NVRAM file found %s\n", devinfo->nvram_name);