Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1792AC4338F for ; Wed, 11 Aug 2021 18:56:19 +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 110706108C for ; Wed, 11 Aug 2021 18:56:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 110706108C 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 366C882D5B; Wed, 11 Aug 2021 20:56:16 +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="JnLuoXnL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 847B982D73; Wed, 11 Aug 2021 20:56:14 +0200 (CEST) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) (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 8962182C46 for ; Wed, 11 Aug 2021 20:56:11 +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-x42b.google.com with SMTP id b13so4498505wrs.3 for ; Wed, 11 Aug 2021 11:56:11 -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=OCt0xTvUbu0UJqu4okA6jQqh3yZUVsX2lygj2KcXruA=; b=JnLuoXnL55VUNNtZd/1jD4YIUmOY4ql6+l4Yl3WWQsrVaW5Zs3Aj6Hs7hgC8M9QXbJ 3DGiLwnQnJvH34En/cilQlxwPvh/7GD3AAFFkCX+IYZbtSrFrM/tJzUjkbNNE6NudBsy wJ5mLKp+MiO0nlduDr1osWR/zUZqQE1IDllTE7HZ/4dCBmqDv+A9gcaASQmj46o6SILz JOvyPIh9dMfykH60zRRgc3YsMk5N0nuxY3A67Anw1GPGddeZ7e8XPILYKH1Bxg9UP1qP NNs7QSIKRNfUa6iXnmQiNpZgbogUKtKnjnq6k8YWwm4ScTEtJBVbT6GDqFByd3uD9mdz LMsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=OCt0xTvUbu0UJqu4okA6jQqh3yZUVsX2lygj2KcXruA=; b=s1qn9czR/QSYpkYaNBlMH5S+oO1aZDueJn27Qb40wi/YE1g3ch4mPj1c/7ic29bqL/ nOYNUMM3I4JEYdxZ7rErL2dNEOBUzavqRbxAKpNs0q0enjWkSdPLhxZQDBkBHNSSNxGG 3hw/4OtKeGIaQO00sGUNa0GWmWptJa/r7MX8zQyG62MKGBowA8/C49OLqhVA/W755LH/ G6BKUXrEqBvHgxWhAmehxffVLnMFzk9BUFCs6vD+FVoIqp6PlMNcVmkx+WfVbVopB28T 19Tj7Y95o5e8J7XpncGytsSMByxeT/K8BEYRXkwMdZiuAALA44zGd9nMSKG5yMFtsp/T uGrg== X-Gm-Message-State: AOAM5322iHm55Q29CPRR1WwoX77mO6J9XElnkcXzMPK5sQy86DYMCY97 e4LcJkly2XlEuUW84OLP5NU00g== X-Google-Smtp-Source: ABdhPJxw8GoQn49jGX+hl5QBZt3AYCTYDBhIa1f6Uy8EShmDP+ZlMmSvIin9efwMdLzgw3HmOwSX3w== X-Received: by 2002:a05:6000:110:: with SMTP id o16mr39419146wrx.2.1628708171139; Wed, 11 Aug 2021 11:56:11 -0700 (PDT) Received: from trex (240.red-79-154-201.dynamicip.rima-tde.net. [79.154.201.240]) by smtp.gmail.com with ESMTPSA id o10sm168808wrq.51.2021.08.11.11.56.10 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Aug 2021 11:56:10 -0700 (PDT) From: "Jorge Ramirez-Ortiz, Foundries" X-Google-Original-From: "Jorge Ramirez-Ortiz, Foundries" Date: Wed, 11 Aug 2021 20:56:09 +0200 To: Jorge Ramirez-Ortiz Cc: monstr@monstr.eu, adrian.fiergolski@fastree3d.com, ibai.erkiaga-elorza@xilinx.com, sjg@chromium.org, t.karthik.reddy@xilinx.com, ricardo@foundries.io, u-boot@lists.denx.de Subject: Re: [PATCH] zynqmp: restore the jtag interface Message-ID: <20210811185609.GB1091@trex> References: <20210716171640.18879-1-jorge@foundries.io> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210716171640.18879-1-jorge@foundries.io> 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 16/07/21, Jorge Ramirez-Ortiz wrote: reminder > As a security feature, if boot.bin was 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 attempts to restore the interface - if the CSU allows for it. > > Signed-off-by: Jorge Ramirez-Ortiz > --- > arch/arm/mach-zynqmp/Kconfig | 9 ++++++++ > arch/arm/mach-zynqmp/include/mach/hardware.h | 23 +++++++++++++------ > board/xilinx/zynqmp/zynqmp.c | 24 ++++++++++++++++++++ > 3 files changed, 49 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig > index 39144d654e..1e551c0020 100644 > --- a/arch/arm/mach-zynqmp/Kconfig > +++ b/arch/arm/mach-zynqmp/Kconfig > @@ -149,6 +149,15 @@ 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 > + default n > + 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 3776499070..58822e3f25 100644 > --- a/arch/arm/mach-zynqmp/include/mach/hardware.h > +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h > @@ -42,17 +42,20 @@ > 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,9 +144,15 @@ struct apu_regs { > 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 1748fec2e4..feffda54e7 100644 > --- a/board/xilinx/zynqmp/zynqmp.c > +++ b/board/xilinx/zynqmp/zynqmp.c > @@ -355,6 +355,25 @@ static int multi_boot(void) > return 0; > } > > +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ZYNQMP_RESTORE_JTAG) > +static void restore_jtag(void) > +{ > + const u32 disable_security_gate = 0xff; > + const u32 setup_clock = 0x01002002; > + const u32 setup_jtag = 0x3; > + const u32 release_pl = 0x1; > + const u32 enable_debug = 0xff; > + const u32 do_reset = 0x0; > + > + writel(disable_security_gate, &csu_base->jtag_sec); > + writel(enable_debug, &csu_base->jtag_dap_cfg); > + writel(setup_jtag, &csu_base->jtag_chain_status_wr); > + writel(setup_clock, &crlapb_base->dbg_lpd_ctrl); > + writel(do_reset, &crlapb_base->rst_lpd_dbg); > + writel(release_pl, &csu_base->pcap_prog); > +} > +#endif > + > #define PS_SYSMON_ANALOG_BUS_VAL 0x3210 > #define PS_SYSMON_ANALOG_BUS_REG 0xFFA50914 > > @@ -374,6 +393,11 @@ 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()); > + > +#if defined(CONFIG_SPL_ZYNQMP_RESTORE_JTAG) > + /* the CSU disables the JTAG interface when secure boot is enabled */ > + restore_jtag(); > +#endif > #else > if (CONFIG_IS_ENABLED(DM_I2C) && CONFIG_IS_ENABLED(I2C_EEPROM)) > xilinx_read_eeprom(); > -- > 2.31.1 >