From: Sascha Hauer <s.hauer@pengutronix.de>
To: "open list:BAREBOX" <barebox@lists.infradead.org>
Subject: [PATCH v3 22/23] ARM: k3: Add DRAM size detection
Date: Mon, 13 Jan 2025 12:27:09 +0100 [thread overview]
Message-ID: <20250113-k3-r5-v3-22-065fcdcc28d3@pengutronix.de> (raw)
In-Reply-To: <20250113-k3-r5-v3-0-065fcdcc28d3@pengutronix.de>
This adds support for reading the DRAM size back from the DDRSS memory
controller.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-k3/Makefile | 1 +
arch/arm/mach-k3/common.c | 1 +
| 76 +++++++++++++++++++++++++++++++++++++++++++++++
include/mach/k3/common.h | 4 +++
4 files changed, 82 insertions(+)
diff --git a/arch/arm/mach-k3/Makefile b/arch/arm/mach-k3/Makefile
index 6e105095da..b9b987d211 100644
--- a/arch/arm/mach-k3/Makefile
+++ b/arch/arm/mach-k3/Makefile
@@ -1,5 +1,6 @@
obj-y += common.o
obj-pbl-$(CONFIG_MACH_K3_CORTEX_R5) += r5.o
+obj-pbl-y += ddrss.o
extra-y += combined-dm-cfg-am625.k3cfg combined-sysfw-cfg-am625.k3cfg
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index d7b44f31e8..d8bed194d6 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -171,6 +171,7 @@ static int am625_init(void)
am625_get_bootsource(&src, &instance);
bootsource_set(src, instance);
+ am625_register_dram();
genpd_activate();
--git a/arch/arm/mach-k3/ddrss.c b/arch/arm/mach-k3/ddrss.c
new file mode 100644
index 0000000000..b51371d661
--- /dev/null
+++ b/arch/arm/mach-k3/ddrss.c
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <memory.h>
+#include <linux/bitfield.h>
+#include <mach/k3/common.h>
+#include <linux/bits.h>
+#include <io.h>
+#include <asm/memory.h>
+#include <linux/kernel.h>
+
+#define CTLPHY_CTL_CFG_CTLCFG_DENALI_CTL_0 0x0
+
+#define DRAM_CLASS GENMASK(11, 8)
+
+#define CTLPHY_CTL_CFG_CTLCFG_DENALI_CTL_327 0x51c
+
+#define CTLPHY_CTL_CFG_CTLCFG_DENALI_CTL_317 0x4f4
+
+#define ROW_DIFF_0 GENMASK(2, 0)
+#define ROW_DIFF_1 GENMASK(10, 8)
+#define COL_DIFF_0 GENMASK(19, 16)
+#define COL_DIFF_1 GENMASK(27, 24)
+
+#define CTLPHY_CTL_CFG_CTLCFG_DENALI_CTL_3 0xc
+
+#define MAX_ROW GENMASK(4, 0)
+#define MAX_COL GENMASK(11, 8)
+
+#define AM625_DDRSS_BASE 0x0f308000
+
+#define DENALI_CTL_0_DRAM_CLASS_DDR4 0xa
+#define DENALI_CTL_0_DRAM_CLASS_LPDDR4 0xb
+
+u64 am625_sdram_size(void)
+{
+ void __iomem *base = IOMEM(AM625_DDRSS_BASE);
+ u32 ctl0 = readl(base + CTLPHY_CTL_CFG_CTLCFG_DENALI_CTL_0);
+ u32 ctl3 = readl(base + CTLPHY_CTL_CFG_CTLCFG_DENALI_CTL_3);
+ u32 ctl317 = readl(base + CTLPHY_CTL_CFG_CTLCFG_DENALI_CTL_317);
+ u32 ctl327 = readl(base + CTLPHY_CTL_CFG_CTLCFG_DENALI_CTL_327);
+ unsigned int cols, rows, banks;
+ u64 size = 0;
+
+ if (FIELD_GET(DRAM_CLASS, ctl0) == DENALI_CTL_0_DRAM_CLASS_LPDDR4)
+ banks = 8;
+ else if (FIELD_GET(DRAM_CLASS, ctl0) == DENALI_CTL_0_DRAM_CLASS_DDR4)
+ banks = 16;
+ else
+ return 0;
+
+ if (ctl327 & BIT(0)) {
+ cols = FIELD_GET(MAX_COL, ctl3) - FIELD_GET(COL_DIFF_0, ctl317);
+ rows = FIELD_GET(MAX_ROW, ctl3) - FIELD_GET(ROW_DIFF_0, ctl317);
+ size += memory_sdram_size(cols, rows, banks, 2);
+ }
+
+ if (ctl327 & BIT(1)) {
+ cols = FIELD_GET(MAX_COL, ctl3) - FIELD_GET(COL_DIFF_1, ctl317);
+ rows = FIELD_GET(MAX_ROW, ctl3) - FIELD_GET(ROW_DIFF_1, ctl317);
+ size += memory_sdram_size(cols, rows, banks, 2);
+ }
+
+ return size;
+}
+
+void am625_register_dram(void)
+{
+ u64 size = am625_sdram_size();
+ u64 lowmem = min_t(u64, size, SZ_2G);
+
+ arm_add_mem_device("ram0", 0x80000000, lowmem);
+
+#ifdef CONFIG_64BIT
+ if (size - lowmem)
+ arm_add_mem_device("ram0", 0x880000000ULL, size - lowmem);
+#endif
+}
diff --git a/include/mach/k3/common.h b/include/mach/k3/common.h
index 448ec1343c..d7ceea51d7 100644
--- a/include/mach/k3/common.h
+++ b/include/mach/k3/common.h
@@ -1,6 +1,10 @@
#ifndef __MACH_K3_COMMON_H
#define __MACH_K3_COMMON_H
+#include <bootsource.h>
+
void am625_get_bootsource(enum bootsource *src, int *instance);
+u64 am625_sdram_size(void);
+void am625_register_dram(void);
#endif /* __MACH_K3_COMMON_H */
--
2.39.5
next prev parent reply other threads:[~2025-01-13 11:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-13 11:26 [PATCH v3 00/23] ARM: K3: Add R5 boot support Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 01/23] ARM: add ARMv7R MPU support Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 02/23] lib/rationale: compile for pbl Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 04/23] ARM: move ARM_CPU_PART_* defines to header Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 05/23] nommu_v7_vectors_init: disable for r5 Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 06/23] clocksource: timer-ti-dm: add support for K3 SoCs Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 07/23] ARM: K3: mount /boot even with env handling disabled Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 08/23] clk: add K3 clk driver Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 09/23] pmdomain: add K3 driver Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 10/23] rproc: add K3 arm64 rproc driver Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 11/23] ARM: k3: add k3_debug_ll_init() Sascha Hauer
2025-01-13 11:26 ` [PATCH v3 12/23] ARM: K3: use debug_ll code for regular PBL console Sascha Hauer
2025-01-13 11:27 ` [PATCH v3 13/23] elf: use iomem regions as fallback when loading to non-sdram memory Sascha Hauer
2025-01-13 11:27 ` [PATCH v3 14/23] rproc: add K3 system_controller Sascha Hauer
2025-01-13 11:27 ` [PATCH v3 15/23] firmware: ti_sci: add function to get global handle Sascha Hauer
2025-01-13 11:27 ` [PATCH v3 16/23] ARM: k3: Add initial r5 support Sascha Hauer
2025-01-13 11:27 ` [PATCH v3 17/23] scripts: k3: add script to generate cfg files from yaml Sascha Hauer
2025-01-14 9:29 ` Ahmad Fatoum
2025-01-14 9:38 ` Sascha Hauer
2025-01-13 11:27 ` [PATCH v3 18/23] ARM: k3: Add k3img tool Sascha Hauer
2025-01-13 11:27 ` [PATCH v3 19/23] ARM: beagleplay: add Cortex-R5 boot support Sascha Hauer
2025-01-13 11:27 ` [PATCH v3 20/23] Documentation: add build documentation for TI K3 SoCs Sascha Hauer
2025-01-13 11:27 ` [PATCH v3 21/23] ARM: am625: disable secondary watchdogs Sascha Hauer
2025-01-13 11:27 ` Sascha Hauer [this message]
2025-01-13 11:27 ` [PATCH v3 23/23] ARM: k3: am625-sk board support Sascha Hauer
2025-01-14 8:32 ` [PATCH v3 00/23] ARM: K3: Add R5 boot support Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250113-k3-r5-v3-22-065fcdcc28d3@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox