From patchwork Thu Apr 13 08:52:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ivan T. Ivanov" X-Patchwork-Id: 82866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp889949vqo; Thu, 13 Apr 2023 02:03:15 -0700 (PDT) X-Google-Smtp-Source: AKy350ZCjNDChNWOjL7tAq1Vvmu2hh5OdagSy1t7nzpNs+0+f9/SdBW7V2S6GwfSvuUAUIT5BhWI X-Received: by 2002:a17:903:2350:b0:1a1:953b:9559 with SMTP id c16-20020a170903235000b001a1953b9559mr1852978plh.3.1681376595350; Thu, 13 Apr 2023 02:03:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681376595; cv=none; d=google.com; s=arc-20160816; b=qRcSoqSQy6Bjyo/we6ruE/N4gz/TOd0tUTFcD7UhNi8ucGWWjY3xvJyzodV0yiQ48a VR/FkZUM0FkQmIh55KE4jl0NkxtAXPTPRYoiPhJZ7x6NYlH1Sx8+q0CQInD2iNHVqHZK Ixjz17RSw15tYDDGRb218dndd8/3/qSHZT5T/QMaCvSY1oV91UlcwJAI+cWGpER9yV2e DoqOUz+uifq4KBsXRn9WunlPN71Zdc+HABM32+z7HMOo70desccUelTiw1sTfSFWpIBW f6RjdsTuZYyWTXduBCxH+uMekmrxutB+IeRARcYaxCvSMU/qLwtA03K0LPLLc7v5PcQe WaPg== 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:dkim-signature; bh=ear+cnYjNr0Xxid0IYuEKGOWEhCYOcJOGEYisWpZTKo=; b=xP/JGch1dmGfIEgdOn+wSGAn7qb0qLxAdkftFyfTz58yU/iK9FJpMn6RzeqHqarlVG Jdmoj64v/dwBkgxtOWYw2A6cve84I6c6fjXgg/5nSE/YhemODbUA1twX4GADW57DV6VN cIdPsvQOx8So6/r5zf7CKzjBeULp5A5WXtKfGyyqsqibvwVPll2jMI6Cb5w8+qLuFE7Z QbG2ihHasOTCxL3LqlKoVqknsvLoCSI+2GiASJzbw6EHl4t+K5IUOhblqdeaPMUBw4fH 2ezCaI2072dxo25Fbxu0f4BASu2i1J4yiSaCx3CaEQGvFp72twnDhUZ33sQhZ8ai9Ny1 PwnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=C24EABfN; dkim=neutral (no key) header.i=@suse.de; 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=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a16-20020a1709027d9000b001a183ade90bsi1506496plm.423.2023.04.13.02.03.02; Thu, 13 Apr 2023 02:03:15 -0700 (PDT) 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=@suse.de header.s=susede2_rsa header.b=C24EABfN; dkim=neutral (no key) header.i=@suse.de; 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=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229908AbjDMIxi (ORCPT + 99 others); Thu, 13 Apr 2023 04:53:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229925AbjDMIxT (ORCPT ); Thu, 13 Apr 2023 04:53:19 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38A90180 for ; Thu, 13 Apr 2023 01:53:06 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E520F218D6; Thu, 13 Apr 2023 08:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1681375984; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ear+cnYjNr0Xxid0IYuEKGOWEhCYOcJOGEYisWpZTKo=; b=C24EABfNHbEBMqwr4/h+JHYgokjsw8ix4LML/cy29uP6URY6CKIXQsggFcmNAC9QsfJGpU X52ksK0IOlpxdAss2WvoLFj1A9ykM94mO0hTAN5knLcUGqJDQD02zRLBhN+4CNc6WFmi+M mRMzY4KOXbeddISQ/2wSbPa9PVCp/uo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1681375984; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ear+cnYjNr0Xxid0IYuEKGOWEhCYOcJOGEYisWpZTKo=; b=9NIL9C8KqTMIlIlDJ8DPR26DM/xiQezNmGfZN0od/ZvM40T5Uwn+UBLnv7nBBPtJzRfRUA jWez3NnzQWfRmdBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D1664139D3; Thu, 13 Apr 2023 08:53:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EH/jMvDCN2RyIAAAMHmgww (envelope-from ); Thu, 13 Apr 2023 08:53:04 +0000 From: "Ivan T. Ivanov" To: Srinivas Kandagatla Cc: Nicolas Saenz Julienne , Florian Fainelli , Stefan Wahren , Tim Gover , Phil Elwell , linux-rpi-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Ivan T . Ivanov" Subject: [PATCH v2 1/2] nvmem: rmem: Use NVMEM_DEVID_AUTO Date: Thu, 13 Apr 2023 11:52:05 +0300 Message-Id: <20230413085206.149730-2-iivanov@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230413085206.149730-1-iivanov@suse.de> References: <20230413085206.149730-1-iivanov@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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?1763051144777951569?= X-GMAIL-MSGID: =?utf-8?q?1763051144777951569?= From: Phil Elwell It is reasonable to declare multiple nvmem blocks. Unless a unique 'id' is passed in for each block there may be name clashes. Avoid this by using the magic token NVMEM_DEVID_AUTO. Fixes: 5a3fa75a4d9cb ("nvmem: Add driver to expose reserved memory as nvmem") Signed-off-by: Phil Elwell Signed-off-by: Ivan T. Ivanov --- drivers/nvmem/rmem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c index 80cb187f1481..752d0bf4445e 100644 --- a/drivers/nvmem/rmem.c +++ b/drivers/nvmem/rmem.c @@ -71,6 +71,7 @@ static int rmem_probe(struct platform_device *pdev) config.dev = dev; config.priv = priv; config.name = "rmem"; + config.id = NVMEM_DEVID_AUTO; config.size = mem->size; config.reg_read = rmem_read; From patchwork Thu Apr 13 08:52:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ivan T. Ivanov" X-Patchwork-Id: 82862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp885712vqo; Thu, 13 Apr 2023 01:54:38 -0700 (PDT) X-Google-Smtp-Source: AKy350YWunagQkP7HcW9OmhOS6fp7Ox2USBSRfsUpLDkxe0CpXpTFFZJBpO8iA3YDIKJHZEYU/4P X-Received: by 2002:a05:6a20:4d9d:b0:eb:e22b:ef9f with SMTP id gj29-20020a056a204d9d00b000ebe22bef9fmr1394557pzb.36.1681376077797; Thu, 13 Apr 2023 01:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681376077; cv=none; d=google.com; s=arc-20160816; b=jPjZkXCXUgcwERHTEyc+20KLm+3FeJ6boGdy6Kd6Ma0hrWXBCJDhaHvGy72dAu+yiY 3qLQU7IIFPXa12XFJDsQ4f/LV1q1s7CIHIQgsplsUtdMa67zEJoB2oDT+y+ZzOL3b60L FqbMv3I7uFIcXd2PoUY93DZq9yxleLdkX8u4iD3nkZCxuYzDn9hP4vR6uN/xlPj19j1+ iX20XLmthIhwHr01zY//41I2j9h4Ekq9vO9gqZdnRXIkkN7R1CDEKxqY5BP51mzN1YDN 4uwpprQFxpAqaTBvRtMIuJmR6On5217Fznc1OQw2kSmZStKEZb5piCF3qvm6hnwUSIH7 GIjw== 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:dkim-signature; bh=Vw1ZoNwWrSTGCF9w3p1Uuiz6HkW0chKEEXorzYdcJC8=; b=GASkvuxFFK3ZUwuUWmarBNAxQ2VRLrVjkfoQ8Kns2ZrTKOcLu2GM/sUE8GbuRZchR9 4DBwkZUOXQJrRn8cXBCKO+COtzxtlAyv3agule3vbWlbdb3t59xigXZaYRl5X7uQX6nb IwwD4SZKU6qVrDC43Il/IxWtXlsLLjgRwn966yq41LVCcHubFGdJI6URwe8OmE6v3XL2 Juap/rcY4/WzGRvxpW4EY4Nf4PJAM4i1zrGY8QrBZK/fTflF9AgIILVdeUXQBLLXMMCr V5y2jYxcF71LhlQxM1lmHLrVlq1ggSF2bqaxeo8ww/U5Mw3Z/fsZIUHsL9fGEPGoV69J V84A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=fdEKnQ9D; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b6-20020a656686000000b0051909d663desi1550573pgw.481.2023.04.13.01.54.25; Thu, 13 Apr 2023 01:54:37 -0700 (PDT) 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=@suse.de header.s=susede2_rsa header.b=fdEKnQ9D; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229648AbjDMIxf (ORCPT + 99 others); Thu, 13 Apr 2023 04:53:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229922AbjDMIxT (ORCPT ); Thu, 13 Apr 2023 04:53:19 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4554993CA for ; Thu, 13 Apr 2023 01:53:06 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id F40911FD68; Thu, 13 Apr 2023 08:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1681375985; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vw1ZoNwWrSTGCF9w3p1Uuiz6HkW0chKEEXorzYdcJC8=; b=fdEKnQ9DznBOosiiDYeBvRSZ4TdmZiA9We57/ZfpE/tUk5DzZ+sbRtX9EEM2Ow7QBa1yQy RsMvuZoF/BnCguN5YcrEaL+EsFFNu7JgdaJ0min47h6wyt7WNAafY5SMOtbLe9ZRNVS5vu Gx+GoJyuW0U4Z/Z14udlXGHYTGda2xI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1681375985; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vw1ZoNwWrSTGCF9w3p1Uuiz6HkW0chKEEXorzYdcJC8=; b=mFlVifnwk8TtEc5aaOWUwgDbFirHu/qEIAW+bmbqRAvZPQphqnw9nuQeCukJIUdiuvkmMr p/glk/SPaCfJ4KBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id E205313421; Thu, 13 Apr 2023 08:53:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EBLyNvDCN2RyIAAAMHmgww (envelope-from ); Thu, 13 Apr 2023 08:53:04 +0000 From: "Ivan T. Ivanov" To: Srinivas Kandagatla Cc: Nicolas Saenz Julienne , Florian Fainelli , Stefan Wahren , Tim Gover , Phil Elwell , linux-rpi-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Ivan T . Ivanov" Subject: [PATCH v2 2/2] ARM: dts: Add nvmem node for BCM2711 bootloader public key Date: Thu, 13 Apr 2023 11:52:06 +0300 Message-Id: <20230413085206.149730-3-iivanov@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230413085206.149730-1-iivanov@suse.de> References: <20230413085206.149730-1-iivanov@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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?1763050601994493316?= X-GMAIL-MSGID: =?utf-8?q?1763050601994493316?= From: Tim Gover Make a copy of the bootloader secure-boot public key available to the OS via an nvmem node. The placement information is populated by the Raspberry Pi firmware if a public key is present in the BCM2711 bootloader EEPROM. Signed-off-by: Tim Gover Signed-off-by: Ivan T. Ivanov --- arch/arm/boot/dts/bcm2711-rpi.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi index 98817a6675b9..e30fbe84f9c3 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -15,6 +15,7 @@ aliases { ethernet0 = &genet; pcie0 = &pcie0; blconfig = &blconfig; + blpubkey = &blpubkey; }; }; @@ -67,6 +68,19 @@ blconfig: nvram@0 { no-map; status = "disabled"; }; + + /* + * RPi4 will copy the binary public key blob (if present) from the bootloader + * into memory for use by the OS. + */ + blpubkey: nvram@1 { + compatible = "raspberrypi,bootloader-public-key", "nvmem-rmem"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0 0x0 0x0>; + no-map; + status = "disabled"; + }; }; &v3d {