Skip to contentSkip to conversation

linux/sizes.h: sync from kernel

PATCH In review Emanuele Ghidoli 3 participants 4 messages May 20, 2025 – Jun 3, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux/sizes.h: sync from kernel

From: Emanuele Ghidoli <[email protected]>

The kernel added new size definitions and substituted the boilerplate/reference to the license with a SPDX identifier.

Drop a local SZ_8G definition in MediaTek MT7988 SoC board file.

---
 arch/arm/mach-mediatek/mt7988/init.c |  3 +--
 include/linux/sizes.h                | 28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)
arch/arm/mach-mediatek/mt7988/init.c +1 -2
index 2efc8c6a88fe..8bdd3848d261 100644
@@ -6,14 +6,13 @@
 
 #include <fdtdec.h>
 #include <init.h>
+#include <linux/sizes.h>
 #include <asm/armv8/mmu.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define SZ_8G				_AC(0x200000000, ULL)
-
 int dram_init(void)
 {
 	int ret;
include/linux/sizes.h +24 -4
index fbde0bc7e882..49039494076f 100644
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * include/linux/sizes.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #ifndef __LINUX_SIZES_H__
 #define __LINUX_SIZES_H__
@@ -26,17 +23,25 @@
 #define SZ_4K				0x00001000
 #define SZ_8K				0x00002000
 #define SZ_16K				0x00004000
+#define SZ_24K				0x00006000
 #define SZ_32K				0x00008000
 #define SZ_64K				0x00010000
 #define SZ_128K				0x00020000
+#define SZ_192K				0x00030000
 #define SZ_256K				0x00040000
+#define SZ_384K				0x00060000
 #define SZ_512K				0x00080000
 
 #define SZ_1M				0x00100000
 #define SZ_2M				0x00200000
+#define SZ_3M				0x00300000
 #define SZ_4M				0x00400000
+#define SZ_6M				0x00600000
 #define SZ_8M				0x00800000
+#define SZ_12M				0x00c00000
 #define SZ_16M				0x01000000
+#define SZ_18M				0x01200000
+#define SZ_24M				0x01800000
 #define SZ_32M				0x02000000
 #define SZ_64M				0x04000000
 #define SZ_128M				0x08000000
@@ -47,5 +52,20 @@
 #define SZ_2G				0x80000000
 
 #define SZ_4G				_AC(0x100000000, ULL)
+#define SZ_8G				_AC(0x200000000, ULL)
+#define SZ_16G				_AC(0x400000000, ULL)
+#define SZ_32G				_AC(0x800000000, ULL)
+#define SZ_64G				_AC(0x1000000000, ULL)
+#define SZ_128G				_AC(0x2000000000, ULL)
+#define SZ_256G				_AC(0x4000000000, ULL)
+#define SZ_512G				_AC(0x8000000000, ULL)
+
+#define SZ_1T				_AC(0x10000000000, ULL)
+#define SZ_2T				_AC(0x20000000000, ULL)
+#define SZ_4T				_AC(0x40000000000, ULL)
+#define SZ_8T				_AC(0x80000000000, ULL)
+#define SZ_16T				_AC(0x100000000000, ULL)
+#define SZ_32T				_AC(0x200000000000, ULL)
+#define SZ_64T				_AC(0x400000000000, ULL)
 
 #endif /* __LINUX_SIZES_H__ */
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#2 lore raw
In reply to Emanuele Ghidoli
Quoted 106 lines · Emanuele Ghidoli

External email : Please do not click links or open attachments until you have verified the sender or the content.

From: Emanuele Ghidoli <[email protected]>

The kernel added new size definitions and substituted the boilerplate/reference to the license with a SPDX identifier.

Drop a local SZ_8G definition in MediaTek MT7988 SoC board file.

---
 arch/arm/mach-mediatek/mt7988/init.c |  3 +--
 include/linux/sizes.h                | 28 ++++++++++++++++++++++++
----
 2 files changed, 25 insertions(+), 6 deletions(-)
arch/arm/mach- renamed from arch/arm/mach-mediatek/mt7988/init.c +0 -0

mediatek/mt7988/init.c
index 2efc8c6a88fe..8bdd3848d261 100644

arch/arm/mach-mediatek/mt7988/init.c +1 -2
@@ -6,14 +6,13 @@
 
 #include <fdtdec.h>
 #include <init.h>
+#include <linux/sizes.h>
 #include <asm/armv8/mmu.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define SZ_8G                          _AC(0x200000000, ULL)
-
 int dram_init(void)
 {
        int ret;
include/linux/sizes.h +1 -2
index fbde0bc7e882..49039494076f 100644
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * include/linux/sizes.h
- *
- * This program is free software; you can redistribute it and/or

modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
*/
#ifndef __LINUX_SIZES_H__
#define __LINUX_SIZES_H__

include/linux/sizes.h +15 -0
@@ -26,17 +23,25 @@
 #define SZ_4K                          0x00001000
 #define SZ_8K                          0x00002000
 #define SZ_16K                         0x00004000
+#define SZ_24K                         0x00006000
 #define SZ_32K                         0x00008000
 #define SZ_64K                         0x00010000
 #define SZ_128K                                0x00020000
+#define SZ_192K                                0x00030000
 #define SZ_256K                                0x00040000
+#define SZ_384K                                0x00060000
 #define SZ_512K                                0x00080000
 
 #define SZ_1M                          0x00100000
 #define SZ_2M                          0x00200000
+#define SZ_3M                          0x00300000
 #define SZ_4M                          0x00400000
+#define SZ_6M                          0x00600000
 #define SZ_8M                          0x00800000
+#define SZ_12M                         0x00c00000
 #define SZ_16M                         0x01000000
+#define SZ_18M                         0x01200000
+#define SZ_24M                         0x01800000
 #define SZ_32M                         0x02000000
 #define SZ_64M                         0x04000000
 #define SZ_128M                                0x08000000
@@ -47,5 +52,20 @@
 #define SZ_2G                          0x80000000
 
 #define SZ_4G                          _AC(0x100000000, ULL)
+#define SZ_8G                          _AC(0x200000000, ULL)
+#define SZ_16G                         _AC(0x400000000, ULL)
+#define SZ_32G                         _AC(0x800000000, ULL)
+#define SZ_64G                         _AC(0x1000000000, ULL)
+#define SZ_128G                                _AC(0x2000000000,
 ULL)
+#define SZ_256G                                _AC(0x4000000000,
 ULL)
+#define SZ_512G                                _AC(0x8000000000,

ULL)

include/linux/sizes.h +8 -1
+
+#define SZ_1T                          _AC(0x10000000000, ULL)
+#define SZ_2T                          _AC(0x20000000000, ULL)
+#define SZ_4T                          _AC(0x40000000000, ULL)
+#define SZ_8T                          _AC(0x80000000000, ULL)
+#define SZ_16T                         _AC(0x100000000000, ULL)
+#define SZ_32T                         _AC(0x200000000000, ULL)
+#define SZ_64T                         _AC(0x400000000000, ULL)
 
 #endif /* __LINUX_SIZES_H__ */
--
Quoted 2 lines

2.43.0

Thanks

#3 lore raw
In reply to Emanuele Ghidoli
Quoted 6 lines · Emanuele Ghidoli

The kernel added new size definitions and substituted the boilerplate/reference to the license with a SPDX identifier.

Drop a local SZ_8G definition in MediaTek MT7988 SoC board file.

Applied to u-boot/next, thanks!

[1/1] linux/sizes.h: sync from kernel

      commit: 422222f5170ac399f0e5fd39290f8508ad777fcc
Signature · 1 line
Tom