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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 64DB0C433FE for ; Wed, 23 Nov 2022 14:20:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3A577852C7; Wed, 23 Nov 2022 15:20:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=intel.com 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=intel.com header.i=@intel.com header.b="VPu2tLlO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 40BA785412; Wed, 23 Nov 2022 15:20:07 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8BF96851F5 for ; Wed, 23 Nov 2022 15:20:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=jitloonl@ecsmtp.png.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669213203; x=1700749203; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=8xdDPDGPq3oVXHn+a3sclAsYGRpXYfHzIJ4FBLboWMY=; b=VPu2tLlO78elq0dqSzyYc2+4nKmEliIgl0N2MMPKTKEHAyshBRGBwGSX tAeaXQfEiTtX5zHUbb09w0GiH8IKBxf+aV6O20b8nK3ZzA1FM2UwdYIsQ hBUaJXdMdRqRVr5IPrGGvlYjQw4awk4yj3w9i8LAT93R9e8Rlfcy0gGQq gqN1g7W346XQsrG0+ot+D/x5DMFpFyM/9At0Ftd/M9E/dSsm9JhZ981B/ rHfUv71u5n+W6bw4LGU9lgdtbHkhMYOtPR2vA0V//wHxkPGS/P9tS4ERz Yuek+uhCePsSPT2CQzXQfWRAzya3VHGrWkFmKxFUSZGz/Cj7NkF3jbGtX g==; X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="378332413" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="378332413" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2022 06:20:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="674740613" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="674740613" Received: from pglmail07.png.intel.com ([10.221.193.207]) by orsmga001.jf.intel.com with ESMTP; 23 Nov 2022 06:19:57 -0800 Received: from localhost (pgli0028.png.intel.com [10.221.84.177]) by pglmail07.png.intel.com (Postfix) with ESMTP id D3CDC482B; Wed, 23 Nov 2022 22:19:56 +0800 (+08) Received: by localhost (Postfix, from userid 12048045) id CFE42E0095B; Wed, 23 Nov 2022 22:19:56 +0800 (+08) From: Jit Loon Lim To: u-boot@lists.denx.de Cc: Jagan Teki , Vignesh R , Marek , Simon , Tien Fong , Kok Kiang , Siew Chin , Sin Hui , Raaj , Dinesh , Boon Khai , Alif , Teik Heng , Hazim , Jit Loon Lim , Sieu Mun Tang Subject: [PATCH] ddr: altera: n5x: Checking DDR DBE Date: Wed, 23 Nov 2022 22:19:55 +0800 Message-Id: <20221123141955.27691-1-jit.loon.lim@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean From: Tien Fong Chee DDR need to be initialized and running calibration if DBE is triggered Signed-off-by: Tien Fong Chee Signed-off-by: Jit Loon Lim --- drivers/ddr/altera/sdram_n5x.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/ddr/altera/sdram_n5x.c b/drivers/ddr/altera/sdram_n5x.c index d707bba862..7d4225e471 100644 --- a/drivers/ddr/altera/sdram_n5x.c +++ b/drivers/ddr/altera/sdram_n5x.c @@ -428,6 +428,17 @@ enum data_process { LOADING }; +bool is_ddr_dbe_triggered(void) +{ + u32 reg = readl(socfpga_get_sysmgr_addr() + + SYSMGR_SOC64_BOOT_SCRATCH_COLD8); + + if (reg & ALT_SYSMGR_SCRATCH_REG_8_DDR_DBE_MASK) + return true; + + return false; +} + void ddr_init_inprogress(bool start) { if (start) @@ -486,17 +497,20 @@ bool is_ddr_init_skipped(u32 reg) reset_type_print(reset_t); - if (reset_t == WARM_RESET) { - debug("%s: DDR init is skipped\n", __func__); - return true; - } - - if (reset_t == COLD_RESET) { - if (is_ddr_retention_enabled(reg)) { - debug("%s: DDR retention bit is set\n", __func__); + if (!is_ddr_dbe_triggered()) { + if (reset_t == WARM_RESET) { debug("%s: DDR init is skipped\n", __func__); return true; } + + if (reset_t == COLD_RESET) { + if (is_ddr_retention_enabled(reg)) { + debug("%s: DDR retention bit is set\n", + __func__); + debug("%s: DDR init is skipped\n", __func__); + return true; + } + } } debug("%s: DDR init is required\n", __func__); @@ -508,7 +522,8 @@ bool is_ddr_calibration_skipped(u32 reg) enum reset_type reset_t = get_reset_type(reg); if ((reset_t == NCONFIG || reset_t == JTAG_CONFIG || - reset_t == RSU_RECONFIG) && is_ddr_retention_enabled(reg)) { + reset_t == RSU_RECONFIG) && is_ddr_retention_enabled(reg) && + !is_ddr_dbe_triggered()) { debug("%s: DDR retention bit is set\n", __func__); return true; } -- 2.26.2