Skip to contentSkip to conversation

Move malloc_cache_aligned() to its own header

PATCH New Simon Glass 3 participants 5 messages Sep 2, 2015 – Sep 12, 2015

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

PATCH v2 1/2 Move malloc_cache_aligned() to its own header

At present malloc.h is included everywhere since it recently was added to common.h in this commit:

4519668 mtd/nand/ubi: assortment of alignment fixes

This seems wasteful and unnecessary. We have been trying to trim down common.h and put separate functions into separate header files and that change goes in the opposite direction.

Move malloc_cache_aligned() to a new header so that this can be avoided. The header would perhaps be better named as alignmem.h but it needs to be included after common.h and people might be confused by this. With the name memalign.h it fits nicely after malloc() in most cases.

---

Changes in v2: None

 common/cmd_ubi.c             |  2 +-
 drivers/mtd/nand/nand_util.c |  1 +
 fs/ubifs/super.c             |  3 +++
 fs/ubifs/ubifs.c             |  2 ++
 include/common.h             |  9 ---------
 include/memalign.h           | 25 +++++++++++++++++++++++++
 lib/gzip.c                   |  1 +
 lib/zlib/zutil.c             |  4 +++-
 8 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 include/memalign.h
common/cmd_ubi.c +1 -1
index 10eea65..0460b4c 100644
@@ -14,7 +14,7 @@
 #include <common.h>
 #include <command.h>
 #include <exports.h>
-
+#include <memalign.h>
 #include <nand.h>
 #include <onenand_uboot.h>
 #include <linux/mtd/mtd.h>
drivers/mtd/nand/nand_util.c +1 -0
index 21b4a61..71285b6 100644
@@ -23,6 +23,7 @@
 #include <command.h>
 #include <watchdog.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <div64.h>
 
 #include <asm/errno.h>
fs/ubifs/super.c +3 -0
index 0bf52db..41763a1 100644
@@ -28,6 +28,9 @@
 #include <linux/writeback.h>
 #else
 
+#include <common.h>
+#include <malloc.h>
+#include <memalign.h>
 #include <linux/compat.h>
 #include <linux/stat.h>
 #include <linux/err.h>
fs/ubifs/ubifs.c +2 -0
index 4daa7fa..f7a0847 100644
@@ -23,6 +23,8 @@
  *          Adrian Hunter
  */
 
+#include <common.h>
+#include <memalign.h>
 #include "ubifs.h"
 #include <u-boot/zlib.h>
 
include/common.h +0 -9
index c12f402..c48e5bc 100644
@@ -1060,15 +1060,6 @@ int cpu_release(int nr, int argc, char * const argv[]);
 #define DEFINE_CACHE_ALIGN_BUFFER(type, name, size)			\
 	DEFINE_ALIGN_BUFFER(type, name, size, ARCH_DMA_MINALIGN)
 
-#ifndef __ASSEMBLY__
-#include <malloc.h>
-
-static inline void *malloc_cache_aligned(size_t size)
-{
-	return memalign(ARCH_DMA_MINALIGN, ALIGN(size, ARCH_DMA_MINALIGN));
-}
-#endif
-
 /*
  * check_member() - Check the offset of a structure member
  *
include/memalign.h new file +25 -0
new file mode 100644
index 0000000..f78b9dd
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __ALIGNMEM_H
+#define __ALIGNMEM_H
+
+/*
+ * ARCH_DMA_MINALIGN is defined in asm/cache.h for each architecture.  It
+ * is used to align DMA buffers.
+ */
+#ifndef __ASSEMBLY__
+#include <asm/cache.h>
+
+#include <malloc.h>
+
+static inline void *malloc_cache_aligned(size_t size)
+{
+	return memalign(ARCH_DMA_MINALIGN, ALIGN(size, ARCH_DMA_MINALIGN));
+}
+#endif
+
+#endif /* __ALIGNMEM_H */
lib/gzip.c +1 -0
index cd8e9fe..2c49e4e 100644
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <image.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <u-boot/zlib.h>
 #include "zlib/zutil.h"
 
lib/zlib/zutil.c +3 -1
index 173a81d..227343e 100644
@@ -43,7 +43,9 @@ void z_error (m)
  */
 #ifndef MY_ZCALLOC /* Any system without a special alloc function */
 
-#ifndef __UBOOT__
+#ifdef __UBOOT__
+#include <malloc.h>
+#else
 #ifndef STDC
 extern voidp    malloc OF((uInt size));
 extern voidp    calloc OF((uInt items, uInt size));
Signature · 1 line
2.5.0.457.gab17608
#1 lore raw

PATCH v2 2/2 Move ALLOC_CACHE_ALIGN_BUFFER() to the new memalign.h header

Now that we have a new header file for cache-aligned allocation, we should move the stack-based allocation macro there also.

---

Changes in v2:
- Add a new patch to move ALLOC_CACHE_ALIGN_BUFFER() to the new header

 board/raspberrypi/rpi/rpi.c   |  1 +
 board/samsung/common/misc.c   |  1 +
 common/cmd_usb.c              |  1 +
 common/env_fat.c              |  1 +
 common/env_mmc.c              |  1 +
 common/env_nand.c             |  1 +
 common/env_ubi.c              |  1 +
 common/usb.c                  |  1 +
 common/usb_hub.c              |  1 +
 common/usb_kbd.c              |  1 +
 common/usb_storage.c          |  1 +
 disk/part_dos.c               |  1 +
 disk/part_efi.c               |  1 +
 disk/part_mac.c               |  1 +
 drivers/block/ahci.c          |  1 +
 drivers/mmc/dw_mmc.c          |  1 +
 drivers/mmc/mmc.c             |  1 +
 drivers/mmc/rpmb.c            |  1 +
 drivers/mtd/nand/tegra_nand.c |  1 +
 drivers/net/e1000.c           |  1 +
 drivers/net/fec_mxc.c         |  1 +
 drivers/net/rtl8169.c         |  1 +
 drivers/spi/mxs_spi.c         |  1 +
 drivers/usb/eth/asix.c        |  1 +
 drivers/usb/eth/asix88179.c   |  1 +
 drivers/usb/eth/mcs7830.c     |  1 +
 drivers/usb/eth/smsc95xx.c    |  1 +
 drivers/usb/gadget/ether.c    |  1 +
 drivers/usb/gadget/f_thor.c   |  1 +
 drivers/usb/host/dwc2.c       |  1 +
 drivers/usb/host/ehci-hcd.c   |  1 +
 drivers/usb/host/ohci-hcd.c   |  1 +
 drivers/usb/host/usb-uclass.c |  1 +
 drivers/video/bcm2835.c       |  1 +
 fs/ext4/dev.c                 |  1 +
 fs/ext4/ext4_common.c         |  1 +
 fs/ext4/ext4_write.c          |  1 +
 fs/fat/fat.c                  |  1 +
 include/common.h              | 87 ----------------------------------------
 include/memalign.h            | 93 ++++++++++++++++++++++++++++++++++++++++++-
 40 files changed, 130 insertions(+), 88 deletions(-)
board/raspberrypi/rpi/rpi.c +1 -0
index d21750e..6d7be11 100644
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <fdt_simplefb.h>
 #include <lcd.h>
+#include <memalign.h>
 #include <mmc.h>
 #include <asm/gpio.h>
 #include <asm/arch/mbox.h>
board/samsung/common/misc.c +1 -0
index f0d69d4..e0e2c48 100644
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <version.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <linux/sizes.h>
 #include <asm/arch/cpu.h>
 #include <asm/gpio.h>
common/cmd_usb.c +1 -0
index 6874af7..6bdbbc5 100644
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <memalign.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 #include <part.h>
common/env_fat.c +1 -0
index e4c8489..d79d864 100644
@@ -13,6 +13,7 @@
 #include <environment.h>
 #include <linux/stddef.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <search.h>
 #include <errno.h>
 #include <fat.h>
common/env_mmc.c +1 -0
index 51e7707..9639822 100644
@@ -12,6 +12,7 @@
 #include <environment.h>
 #include <linux/stddef.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <mmc.h>
 #include <search.h>
 #include <errno.h>
common/env_nand.c +1 -0
index 92e0e05..b32eeac 100644
@@ -19,6 +19,7 @@
 #include <environment.h>
 #include <linux/stddef.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <nand.h>
 #include <search.h>
 #include <errno.h>
common/env_ubi.c +1 -0
index 77bbfa6..e0dc5af 100644
@@ -11,6 +11,7 @@
 #include <environment.h>
 #include <errno.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <search.h>
 #include <ubi_uboot.h>
 #undef crc32
common/usb.c +1 -0
index fbaf8ec..700bfc3 100644
@@ -29,6 +29,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <memalign.h>
 #include <asm/processor.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
common/usb_hub.c +1 -0
index 652a104..415b45c 100644
@@ -26,6 +26,7 @@
 #include <command.h>
 #include <dm.h>
 #include <errno.h>
+#include <memalign.h>
 #include <asm/processor.h>
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
common/usb_kbd.c +1 -0
index 0227024..95912f9 100644
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <stdio_dev.h>
 #include <asm/byteorder.h>
 
common/usb_storage.c +1 -0
index b978430..b390310 100644
@@ -39,6 +39,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <mapmem.h>
+#include <memalign.h>
 #include <asm/byteorder.h>
 #include <asm/processor.h>
 #include <dm/device-internal.h>
disk/part_dos.c +1 -0
index cf1a36e..89263d3 100644
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <ide.h>
+#include <memalign.h>
 #include "part_dos.h"
 
 #ifdef HAVE_BLOCK_DEVICE
disk/part_efi.c +1 -0
index 5856f93..15627f2 100644
@@ -16,6 +16,7 @@
 #include <ide.h>
 #include <inttypes.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <part_efi.h>
 #include <linux/ctype.h>
 
disk/part_mac.c +1 -0
index cbcb995..099e0a0 100644
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <memalign.h>
 #include <ide.h>
 #include "part_mac.h"
 
drivers/block/ahci.c +1 -0
index 0d19dd2..82c6843 100644
@@ -15,6 +15,7 @@
 #include <asm/errno.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <scsi.h>
 #include <libata.h>
 #include <linux/ctype.h>
drivers/mmc/dw_mmc.c +1 -0
index 77b87e0..b41bfad 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <errno.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <mmc.h>
 #include <dwmmc.h>
 #include <asm-generic/errno.h>
drivers/mmc/mmc.c +1 -0
index f12546a..361154c 100644
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <linux/list.h>
 #include <div64.h>
 #include "mmc_private.h"
drivers/mmc/rpmb.c +1 -0
index 9d0b8bc..1c6888f 100644
@@ -10,6 +10,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <memalign.h>
 #include <mmc.h>
 #include <u-boot/sha256.h>
 #include "mmc_private.h"
drivers/mtd/nand/tegra_nand.c +1 -0
index debad4f..a77db7b 100644
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <memalign.h>
 #include <nand.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
drivers/net/e1000.c +1 -0
index 7b830ff..2ba03ed 100644
@@ -32,6 +32,7 @@ tested on both gig copper and gig fiber boards
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <memalign.h>
 #include <pci.h>
 #include "e1000.h"
 
drivers/net/fec_mxc.c +1 -0
index c5dcbbb..b683413 100644
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <net.h>
 #include <netdev.h>
 #include <miiphy.h>
drivers/net/rtl8169.c +1 -0
index 7b6e20f..ebd46b2 100644
@@ -44,6 +44,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <net.h>
 #ifndef CONFIG_DM_ETH
 #include <netdev.h>
drivers/spi/mxs_spi.c +1 -0
index 2b9f395..627644b 100644
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <spi.h>
 #include <asm/errno.h>
 #include <asm/io.h>
drivers/usb/eth/asix.c +1 -0
index 8a43e7c..ad083cf 100644
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <usb.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <linux/mii.h>
 #include "usb_ether.h"
 
drivers/usb/eth/asix88179.c +1 -0
index 94dfe85..cf4085d 100644
@@ -12,6 +12,7 @@
 #include <linux/mii.h>
 #include "usb_ether.h"
 #include <malloc.h>
+#include <memalign.h>
 #include <errno.h>
 
 /* ASIX AX88179 based USB 3.0 Ethernet Devices */
drivers/usb/eth/mcs7830.c +1 -0
index c1b7086..bbdad8b 100644
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <linux/mii.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <usb.h>
 
 #include "usb_ether.h"
drivers/usb/eth/smsc95xx.c +1 -0
index 1dcd088..dc8fa88 100644
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <usb.h>
 #include <asm/unaligned.h>
 #include <linux/mii.h>
drivers/usb/gadget/ether.c +1 -0
index 53f4672..c5e35ee 100644
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <usb.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <linux/ctype.h>
 
 #include "gadget_chips.h"
drivers/usb/gadget/f_thor.c +1 -0
index 6346370..99c22c7 100644
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <common.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <version.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
drivers/usb/host/dwc2.c +1 -0
index 85236ae..541c0f9 100644
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <usb.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <phys2bus.h>
 #include <usbroothubdes.h>
 #include <asm/io.h>
drivers/usb/host/ehci-hcd.c +1 -0
index 3a0d32e..bc47e46 100644
@@ -15,6 +15,7 @@
 #include <usb.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <watchdog.h>
 #include <linux/compiler.h>
 
drivers/usb/host/ohci-hcd.c +1 -0
index 0ffd838..9bde2b2 100644
@@ -41,6 +41,7 @@
 #endif
 
 #include <malloc.h>
+#include <memalign.h>
 #include <usb.h>
 
 #include "ohci.h"
drivers/usb/host/usb-uclass.c +1 -0
index b17a7d7..c66ebb6 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <memalign.h>
 #include <usb.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
drivers/video/bcm2835.c +1 -0
index 61d054d..7867fe3 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <lcd.h>
+#include <memalign.h>
 #include <asm/arch/mbox.h>
 #include <asm/global_data.h>
 
fs/ext4/dev.c +1 -0
index c77c02c..20f5256 100644
@@ -25,6 +25,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <memalign.h>
 #include <ext4fs.h>
 #include <ext_common.h>
 #include "ext4_common.h"
fs/ext4/ext4_common.c +1 -0
index cab5465..c77e22d 100644
@@ -24,6 +24,7 @@
 #include <ext4fs.h>
 #include <inttypes.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <stddef.h>
 #include <linux/stat.h>
 #include <linux/time.h>
fs/ext4/ext4_write.c +1 -0
index fbc4c4b..d346c06 100644
@@ -23,6 +23,7 @@
 
 
 #include <common.h>
+#include <memalign.h>
 #include <linux/stat.h>
 #include <div64.h>
 #include "ext4_common.h"
fs/fat/fat.c +1 -0
index bccc3e3..48cf652 100644
@@ -16,6 +16,7 @@
 #include <asm/byteorder.h>
 #include <part.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <linux/compiler.h>
 #include <linux/ctype.h>
 
include/common.h +0 -87

93 lines not on this page · raw message

include/memalign.h +92 -1

101 lines not on this page · raw message

Signature · 1 line
2.5.0.457.gab17608
#2 lore raw

PATCH v2 2/2 Move ALLOC_CACHE_ALIGN_BUFFER() to the new memalign.h header

Quoted 4 lines · Simon Glass

Now that we have a new header file for cache-aligned allocation, we should move the stack-based allocation macro there also.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150912/0dfc1318/attachment.sig>
#3 lore raw

PATCH v2 1/2 Move malloc_cache_aligned() to its own header

In reply to Simon Glass
Quoted 19 lines · Simon Glass

At present malloc.h is included everywhere since it recently was added to
common.h in this commit:

4519668 mtd/nand/ubi: assortment of alignment fixes

This seems wasteful and unnecessary. We have been trying to trim down common.h and put separate functions into separate header files and that
change goes in the opposite direction.

Move malloc_cache_aligned() to a new header so that this can be avoided.
The header would perhaps be better named as alignmem.h but it needs to be
included after common.h and people might be confused by this. With the name
memalign.h it fits nicely after malloc() in most cases.

Quoted 1 line

The series successfully NAND boot tested on Colibri T20 512MB V1.2A therefore

#4 lore raw

PATCH v2 1/2 Move malloc_cache_aligned() to its own header

In reply to Simon Glass
Quoted 9 lines · Simon Glass

At present malloc.h is included everywhere since it recently was added to common.h in this commit:

4519668 mtd/nand/ubi: assortment of alignment fixes

This seems wasteful and unnecessary. We have been trying to trim down common.h and put separate functions into separate header files and that change goes in the opposite direction.

Quoted 7 lines

Move malloc_cache_aligned() to a new header so that this can be avoided. The header would perhaps be better named as alignmem.h but it needs to be included after common.h and people might be confused by this. With the name memalign.h it fits nicely after malloc() in most cases.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150912/c5191218/attachment.sig>