From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03736C433F5 for ; Wed, 13 Oct 2021 11:40:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E8021610E7 for ; Wed, 13 Oct 2021 11:40:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E8021610E7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9DE0E83347; Wed, 13 Oct 2021 13:40:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=foundries.io header.i=@foundries.io header.b="U2V7IEvY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1B3528332B; Wed, 13 Oct 2021 13:40:34 +0200 (CEST) Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 958868332B for ; Wed, 13 Oct 2021 13:40:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jorge@foundries.io Received: by mail-wr1-x42c.google.com with SMTP id u18so7372869wrg.5 for ; Wed, 13 Oct 2021 04:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundries.io; s=google; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=AdT59z7slENvNTmcCcXfFkAxhYmzYNPXH9anrrJEKuc=; b=U2V7IEvYqCFy94+jT8YLwaid4DdA5b+r95gfn5Qo9p5YkFCwbqzserpAm4YntnyKkN VBtZ0LEcKPIN4yXF/XzIQhYWiV3n6dk3Cov31BtJFP35qB++FTWf0sf0/PAFa9nbm8my FhmQZmwi8bEmS9mXNuMLWLigdv5rU/fdeSnHqIvE3RfnMhWWuX4/evG6beqHylgX6RvS z8qdEqiyOECEwLsDvQcru/Ticj8F6BZzOdxrERvh9/QJZkXj75NtpT1hzX6lfsvsZfog FuCGM/GNGYjOSKjiSWcXZuRE5yG/OcEgORZxHs1h1fWO8bb7VLWdI7XGlR6ngzyW5mc4 BKsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=AdT59z7slENvNTmcCcXfFkAxhYmzYNPXH9anrrJEKuc=; b=5oMqLE1T9tJQGH32Dt7RfqnWEaPE7WEtaa12sAjhvbphq3gi9ybKDQmrg+NYLU+Xft 4OQM9fdXOqjUwG5R4FKBJNZ+VJ7uYHKRcEBxVcwYx/Kcd4wdijV2Bau2EVfyGvgZPGoO HbuNHP6xeSTouAL5SD/bXf95kUPDoKfruBYCC0aHXPu2bPkmtb8SLhbT/NSmbaxebEaU 8otEQnfN8jyvh6uZlOKP5KqIgBbLhc+OfgG7JOLg2DhzXUpnj/R4GhehuUDdi6vSuWXS u1JHH53ak2cM2jvrKYyJWlsVxPY1nSIuezhLj7L4/2Ahva0kISjsYVFUh6PHl/z3TJlo ecBw== X-Gm-Message-State: AOAM533m1uqngdyMxn+mVkAoeOKLYKU57PE1rcREw73JKHZ56nveCbQn xwDANLz16KoAIDGqskiDQilqsw== X-Google-Smtp-Source: ABdhPJzkLis2OfNgaTp/rDcMrrGR94gDBlZETB9o3nmpGg2Ik3i0uB6sSMHBBHvffdUB4nSKPAia+A== X-Received: by 2002:a05:600c:22c3:: with SMTP id 3mr12148259wmg.170.1634125229856; Wed, 13 Oct 2021 04:40:29 -0700 (PDT) Received: from trex (60.red-83-35-113.dynamicip.rima-tde.net. [83.35.113.60]) by smtp.gmail.com with ESMTPSA id g25sm13665902wrc.88.2021.10.13.04.40.28 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Oct 2021 04:40:29 -0700 (PDT) From: "Jorge Ramirez-Ortiz, Foundries" X-Google-Original-From: "Jorge Ramirez-Ortiz, Foundries" Date: Wed, 13 Oct 2021 13:40:28 +0200 To: Michal Simek Cc: Jorge Ramirez-Ortiz , ashok.reddy.soma@xilinx.com, adrian.fiergolski@fastree3d.com, t.karthik.reddy@xilinx.com, sjg@chromium.org, mike.looijmans@topic.nl, u-boot@lists.denx.de, igor.opaniuk@foundries.io Subject: Re: [PATCHv2] zynqmp: restore the jtag interface Message-ID: <20211013114028.GA562@trex> References: <20211013082514.24031-1-jorge@foundries.io> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On 13/10/21, Michal Simek wrote: > > > On 10/13/21 10:25, Jorge Ramirez-Ortiz wrote: > > When boot.bin is configured for secure boot the CSU will disable the > > JTAG interface on all cases. > > > > Some boards might rely on this interface for flashing to QSPI in which > > case those systems might end up bricked during development. > > > > This commit will restore the interface under CSU control > > > > Signed-off-by: Jorge Ramirez-Ortiz > > --- > > I can't see changelog here. What has changed in 3 minutes between v1 and v2? Not in 3 minutes but in 3 months: the first version was submited on 2021-07-16. The first patch sent this morning was missing the "v2" tag hence why I resent three minutes later. v2 addresses the issues you mentioned with the original patch from July. v2 -- Macros added to hardware.h Used CONFIG_IS_ENABLED where possible Fixed Kconfig identation Removed unnecessary Kconfig default > > > arch/arm/mach-zynqmp/Kconfig | 8 +++++ > > arch/arm/mach-zynqmp/include/mach/hardware.h | 31 +++++++++++++++----- > > board/xilinx/zynqmp/zynqmp.c | 20 ++++++++++++- > > 3 files changed, 51 insertions(+), 8 deletions(-) > > > > diff --git a/arch/arm/mach-zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig > > index f7b08db355..ee0895d9a2 100644 > > --- a/arch/arm/mach-zynqmp/Kconfig > > +++ b/arch/arm/mach-zynqmp/Kconfig > > @@ -149,6 +149,14 @@ config SPL_ZYNQMP_ALT_BOOTMODE_ENABLED > > Overwrite bootmode selected via boot mode pins to tell SPL what should > > be the next boot device. > > +config SPL_ZYNQMP_RESTORE_JTAG > > + bool "Restore JTAG" > > + depends on SPL > > + help > > + Booting SPL in secure mode causes the CSU to disable the JTAG interface > > + even if no eFuses were burnt. This option restores the interface if > > + possible. > > + > > config ZYNQ_SDHCI_MAX_FREQ > > default 200000000 > > diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h > > index eebf38551c..e6a3ee4a57 100644 > > --- a/arch/arm/mach-zynqmp/include/mach/hardware.h > > +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h > > @@ -39,20 +39,26 @@ > > #define RESET_REASON_INTERNAL BIT(1) > > #define RESET_REASON_EXTERNAL BIT(0) > > +#define CRLAPB_DBG_LPD_CTRL_SETUP_CLK 0x01002002 > > +#define CRLAPB_RST_LPD_DBG_RESET 0 > > + > > struct crlapb_regs { > > u32 reserved0[36]; > > u32 cpu_r5_ctrl; /* 0x90 */ > > - u32 reserved1[37]; > > + u32 reserved1[7]; > > + u32 dbg_lpd_ctrl; /* 0xB0 */ > > + u32 reserved2[29]; > > u32 timestamp_ref_ctrl; /* 0x128 */ > > - u32 reserved2[53]; > > + u32 reserved3[53]; > > u32 boot_mode; /* 0x200 */ > > - u32 reserved3_0[7]; > > + u32 reserved4_0[7]; > > u32 reset_reason; /* 0x220 */ > > - u32 reserved3_1[6]; > > + u32 reserved4_1[6]; > > u32 rst_lpd_top; /* 0x23C */ > > - u32 reserved4[4]; > > + u32 rst_lpd_dbg; /* 0x240 */ > > + u32 reserved5[3]; > > u32 boot_pin_ctrl; /* 0x250 */ > > - u32 reserved5[21]; > > + u32 reserved6[21]; > > }; > > #define crlapb_base ((struct crlapb_regs *)ZYNQMP_CRL_APB_BASEADDR) > > @@ -141,12 +147,23 @@ struct apu_regs { > > #define ZYNQMP_SILICON_VER_MASK 0xF > > #define ZYNQMP_SILICON_VER_SHIFT 0 > > +#define CSU_JTAG_SEC_GATE_DISABLE GENMASK(7, 0) > > +#define CSU_JTAG_DAP_ENABLE_DEBUG GENMASK(7, 0) > > +#define CSU_JTAG_CHAIN_WR_SETUP GENMASK(1, 0) > > +#define CSU_PCAP_PROG_RELEASE_PL BIT(0) > > + > > struct csu_regs { > > u32 reserved0[4]; > > u32 multi_boot; > > - u32 reserved1[11]; > > + u32 reserved1[7]; > > + u32 jtag_chain_status_wr; > > + u32 jtag_chain_status; > > + u32 jtag_sec; > > + u32 jtag_dap_cfg; > > u32 idcode; > > u32 version; > > + u32 reserved2[3055]; > > + u32 pcap_prog; > > }; > > #define csu_base ((struct csu_regs *)ZYNQMP_CSU_BASEADDR) > > diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c > > index 000a7cde8d..483f0b9ab2 100644 > > --- a/board/xilinx/zynqmp/zynqmp.c > > +++ b/board/xilinx/zynqmp/zynqmp.c > > @@ -358,6 +358,21 @@ static int multi_boot(void) > > return multiboot; > > } > > +#if defined(CONFIG_SPL_BUILD) > > +static void restore_jtag(void) > > +{ > > + if (current_el() != 3) > > + return; > > + > > + writel(CSU_JTAG_SEC_GATE_DISABLE, &csu_base->jtag_sec); > > + writel(CSU_JTAG_DAP_ENABLE_DEBUG, &csu_base->jtag_dap_cfg); > > + writel(CSU_JTAG_CHAIN_WR_SETUP, &csu_base->jtag_chain_status_wr); > > + writel(CRLAPB_DBG_LPD_CTRL_SETUP_CLK, &crlapb_base->dbg_lpd_ctrl); > > + writel(CRLAPB_RST_LPD_DBG_RESET, &crlapb_base->rst_lpd_dbg); > > + writel(CSU_PCAP_PROG_RELEASE_PL, &csu_base->pcap_prog); > > +} > > +#endif > > + > > #define PS_SYSMON_ANALOG_BUS_VAL 0x3210 > > #define PS_SYSMON_ANALOG_BUS_REG 0xFFA50914 > > @@ -377,11 +392,14 @@ int board_init(void) > > zynqmp_pmufw_load_config_object(zynqmp_pm_cfg_obj, > > zynqmp_pm_cfg_obj_size); > > printf("Silicon version:\t%d\n", zynqmp_get_silicon_version()); > > + > > + /* the CSU disables the JTAG interface when secure boot is enabled */ > > + if (CONFIG_IS_ENABLED(SPL_ZYNQMP_RESTORE_JTAG)) > > + restore_jtag(); > > #else > > if (CONFIG_IS_ENABLED(DM_I2C) && CONFIG_IS_ENABLED(I2C_EEPROM)) > > xilinx_read_eeprom(); > > #endif > > - > > Unrelated. ? checkpatch will fail if we leave two carriage returns > > > printf("EL Level:\tEL%d\n", current_el()); > > /* Bug in ROM sets wrong value in this register */ > > > > M