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 16067C4332F for ; Wed, 14 Dec 2022 17:52:16 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9E45C85471; Wed, 14 Dec 2022 18:51:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=edgeble.ai 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=edgeble-ai.20210112.gappssmtp.com header.i=@edgeble-ai.20210112.gappssmtp.com header.b="wvxVW3nP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 437D78543C; Wed, 14 Dec 2022 18:51:39 +0100 (CET) Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (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 BAABD84222 for ; Wed, 14 Dec 2022 18:51:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=edgeble.ai Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=jagan@edgeble.ai Received: by mail-pl1-x633.google.com with SMTP id n4so462408plp.1 for ; Wed, 14 Dec 2022 09:51:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=edgeble-ai.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A5mwV56vapU4AaiEQ4IK9QHvzgLtzVZ6hvdGogAh3+w=; b=wvxVW3nPZuNG3Xa8Q87Zv6wPmn1uNw11MPuCzADR07gEgbYsrBvqs38KiFzLoJ79g2 HqTFA43ZbFA67A3mcfO42K2DWgfEFQ3mAIRFn1buTVdXvJvAqWIUfpqmUhr96nyVYuy6 Y110DZ79DrDiaQX7Sn7czifcGoTKwv7lB2JicnTTvGYLOcbIGj7NWn5+5pPJjzAhHoAy 1Na6XUlngjHAPXApAxzeE0wX8jBVo930q7jKaPX2rSP288Tq/m89T16bFsTaWtjrmrga qm0/4ccrP2t3mhR9MAif4Um6gM2f+/N/znEenLLtT67dt2CU/FOCy3s9ujx5KEUU6X0f WAew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A5mwV56vapU4AaiEQ4IK9QHvzgLtzVZ6hvdGogAh3+w=; b=CCAZiifvLIYU5R0RqtBWTHpY9JeX44wGrl9ngXRiWwGw0oYpgjtX6o541oojX/KZFD 7qS/ftyDZhfMD+ijhGJFYUNeIrxI8DtWbWC/RcKylMhrUew4KjmKMy/XMgau5mQ6zK9y XQraR03XOXF9N9VrHpwrBm9UYfW5kSr/JbHT6iYgarGaF8kplWyXUDPnrkYt0m3wK+bH ZgWzLc3mOAf7g1dJVCyIer5R/VNBguzp8BckK1XRB8jjSTubBZOoMJP5qGI7TzfhOrmV /8xluU17p+ISdeDjRrKujvuayAfTNVlhVRGWOCA1Id1YJ4XR0I+aVZ0Gpy4v+IUbB6XM XCEg== X-Gm-Message-State: ANoB5pkRVLlnKwueZgPqx4cbxmDsCB/X2Vdafl/pF/tuj5ybN0Yk9avS S3oL/rXO+4XAQA6t1iliTz4YlH4AaN31UuqogskQKg== X-Google-Smtp-Source: AA0mqf5jNWV0x9YGqMyKn9Nz1Q00p7q+Z9qwrRNMJ2dJbyTYJa/7Vjh0iKLWIx5DSTKOFC0KwCnMQg== X-Received: by 2002:a17:902:6a85:b0:185:441e:2dda with SMTP id n5-20020a1709026a8500b00185441e2ddamr28125347plk.44.1671040293935; Wed, 14 Dec 2022 09:51:33 -0800 (PST) Received: from localhost.localdomain ([2405:201:c00a:a809:5e03:faf:846e:352d]) by smtp.gmail.com with ESMTPSA id c8-20020a170903234800b00186748fe6ccsm2149442plh.214.2022.12.14.09.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 09:51:33 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: u-boot@lists.denx.de, Jagan Teki , YouMin Chen Subject: [PATCH v4 03/25] ram: rockchip: Compute ddr capacity based on grf split Date: Wed, 14 Dec 2022 23:20:49 +0530 Message-Id: <20221214175111.477134-4-jagan@edgeble.ai> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221214175111.477134-1-jagan@edgeble.ai> References: <20221214175111.477134-1-jagan@edgeble.ai> 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 DDR chip capacity is computed based on GRF split in some Rockchip SoC's like PX30 and RV1126. Add split argument in ddr print info so-that the respective ddr driver will pass the grf split. Signed-off-by: YouMin Chen Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Changes for v4: - none Changes for v3: - collect Kever r-b Changes for v2: - none arch/arm/include/asm/arch-rockchip/sdram_common.h | 2 +- drivers/ram/rockchip/sdram_common.c | 6 ++++-- drivers/ram/rockchip/sdram_px30.c | 2 +- drivers/ram/rockchip/sdram_rk3328.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h index 5efa6e9445..a14b37cbc5 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -116,7 +116,7 @@ struct sdram_base_params { void sdram_print_dram_type(unsigned char dramtype); void sdram_print_ddr_info(struct sdram_cap_info *cap_info, - struct sdram_base_params *base); + struct sdram_base_params *base, u32 split); void sdram_print_stride(unsigned int stride); void sdram_org_config(struct sdram_cap_info *cap_info, diff --git a/drivers/ram/rockchip/sdram_common.c b/drivers/ram/rockchip/sdram_common.c index b3e7421d08..1c3236746a 100644 --- a/drivers/ram/rockchip/sdram_common.c +++ b/drivers/ram/rockchip/sdram_common.c @@ -36,7 +36,7 @@ void sdram_print_dram_type(unsigned char dramtype) } void sdram_print_ddr_info(struct sdram_cap_info *cap_info, - struct sdram_base_params *base) + struct sdram_base_params *base, u32 split) { u64 cap; u32 bg; @@ -83,6 +83,8 @@ void sdram_print_ddr_info(struct sdram_cap_info *cap_info, cap = sdram_get_cs_cap(cap_info, 3, base->dramtype); if (cap_info->row_3_4) cap = cap * 3 / 4; + else if (split) + cap = cap / 2 + (split << 24) / 2; printascii(" Size="); printdec(cap >> 20); @@ -123,7 +125,7 @@ inline void sdram_print_dram_type(unsigned char dramtype) } inline void sdram_print_ddr_info(struct sdram_cap_info *cap_info, - struct sdram_base_params *base) + struct sdram_base_params *base, u32 split) { } diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c index 357fe2432a..a003893538 100644 --- a/drivers/ram/rockchip/sdram_px30.c +++ b/drivers/ram/rockchip/sdram_px30.c @@ -711,7 +711,7 @@ int sdram_init(void) if (ret) goto error; - sdram_print_ddr_info(&sdram_params->ch.cap_info, &sdram_params->base); + sdram_print_ddr_info(&sdram_params->ch.cap_info, &sdram_params->base, 0); printascii("out\n"); return ret; diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index 9c6798f816..efe0049ead 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -506,7 +506,7 @@ static int sdram_init_detect(struct dram_info *dram, writel(sys_reg3, &dram->grf->os_reg[3]); } - sdram_print_ddr_info(&sdram_params->ch.cap_info, &sdram_params->base); + sdram_print_ddr_info(&sdram_params->ch.cap_info, &sdram_params->base, 0); return 0; } diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index ce49a91393..1cb67cf14a 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -2986,7 +2986,7 @@ static int sdram_init(struct dram_info *dram, continue; } - sdram_print_ddr_info(cap_info, ¶ms->base); + sdram_print_ddr_info(cap_info, ¶ms->base, 0); set_memory_map(chan, channel, params); cap_info->ddrconfig = calculate_ddrconfig(params, channel); -- 2.25.1