mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-15 01:24:33 +00:00
27ac792ca0
On 32-bit architectures PAGE_ALIGN() truncates 64-bit values to the 32-bit boundary. For example: u64 val = PAGE_ALIGN(size); always returns a value < 4GB even if size is greater than 4GB. The problem resides in PAGE_MASK definition (from include/asm-x86/page.h for example): #define PAGE_SHIFT 12 #define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) ... #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) The "~" is performed on a 32-bit value, so everything in "and" with PAGE_MASK greater than 4GB will be truncated to the 32-bit boundary. Using the ALIGN() macro seems to be the right way, because it uses typeof(addr) for the mask. Also move the PAGE_ALIGN() definitions out of include/asm-*/page.h in include/linux/mm.h. See also lkml discussion: http://lkml.org/lkml/2008/6/11/237 [akpm@linux-foundation.org: fix drivers/media/video/uvc/uvc_queue.c] [akpm@linux-foundation.org: fix v850] [akpm@linux-foundation.org: fix powerpc] [akpm@linux-foundation.org: fix arm] [akpm@linux-foundation.org: fix mips] [akpm@linux-foundation.org: fix drivers/media/video/pvrusb2/pvrusb2-dvb.c] [akpm@linux-foundation.org: fix drivers/mtd/maps/uclinux.c] [akpm@linux-foundation.org: fix powerpc] Signed-off-by: Andrea Righi <righi.andrea@gmail.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
122 lines
3.0 KiB
C
122 lines
3.0 KiB
C
/****************************************************************************/
|
|
|
|
/*
|
|
* uclinux.c -- generic memory mapped MTD driver for uclinux
|
|
*
|
|
* (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
|
|
*
|
|
* $Id: uclinux.c,v 1.12 2005/11/07 11:14:29 gleixner Exp $
|
|
*/
|
|
|
|
/****************************************************************************/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/major.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/map.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <asm/io.h>
|
|
|
|
/****************************************************************************/
|
|
|
|
struct map_info uclinux_ram_map = {
|
|
.name = "RAM",
|
|
};
|
|
|
|
struct mtd_info *uclinux_ram_mtdinfo;
|
|
|
|
/****************************************************************************/
|
|
|
|
struct mtd_partition uclinux_romfs[] = {
|
|
{ .name = "ROMfs" }
|
|
};
|
|
|
|
#define NUM_PARTITIONS ARRAY_SIZE(uclinux_romfs)
|
|
|
|
/****************************************************************************/
|
|
|
|
int uclinux_point(struct mtd_info *mtd, loff_t from, size_t len,
|
|
size_t *retlen, void **virt, resource_size_t *phys)
|
|
{
|
|
struct map_info *map = mtd->priv;
|
|
*virt = map->virt + from;
|
|
if (phys)
|
|
*phys = map->phys + from;
|
|
*retlen = len;
|
|
return(0);
|
|
}
|
|
|
|
/****************************************************************************/
|
|
|
|
int __init uclinux_mtd_init(void)
|
|
{
|
|
struct mtd_info *mtd;
|
|
struct map_info *mapp;
|
|
extern char _ebss;
|
|
unsigned long addr = (unsigned long) &_ebss;
|
|
|
|
mapp = &uclinux_ram_map;
|
|
mapp->phys = addr;
|
|
mapp->size = PAGE_ALIGN(ntohl(*((unsigned long *)(addr + 8))));
|
|
mapp->bankwidth = 4;
|
|
|
|
printk("uclinux[mtd]: RAM probe address=0x%x size=0x%x\n",
|
|
(int) mapp->phys, (int) mapp->size);
|
|
|
|
mapp->virt = ioremap_nocache(mapp->phys, mapp->size);
|
|
|
|
if (mapp->virt == 0) {
|
|
printk("uclinux[mtd]: ioremap_nocache() failed\n");
|
|
return(-EIO);
|
|
}
|
|
|
|
simple_map_init(mapp);
|
|
|
|
mtd = do_map_probe("map_ram", mapp);
|
|
if (!mtd) {
|
|
printk("uclinux[mtd]: failed to find a mapping?\n");
|
|
iounmap(mapp->virt);
|
|
return(-ENXIO);
|
|
}
|
|
|
|
mtd->owner = THIS_MODULE;
|
|
mtd->point = uclinux_point;
|
|
mtd->priv = mapp;
|
|
|
|
uclinux_ram_mtdinfo = mtd;
|
|
add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS);
|
|
|
|
return(0);
|
|
}
|
|
|
|
/****************************************************************************/
|
|
|
|
void __exit uclinux_mtd_cleanup(void)
|
|
{
|
|
if (uclinux_ram_mtdinfo) {
|
|
del_mtd_partitions(uclinux_ram_mtdinfo);
|
|
map_destroy(uclinux_ram_mtdinfo);
|
|
uclinux_ram_mtdinfo = NULL;
|
|
}
|
|
if (uclinux_ram_map.virt) {
|
|
iounmap((void *) uclinux_ram_map.virt);
|
|
uclinux_ram_map.virt = 0;
|
|
}
|
|
}
|
|
|
|
/****************************************************************************/
|
|
|
|
module_init(uclinux_mtd_init);
|
|
module_exit(uclinux_mtd_cleanup);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Greg Ungerer <gerg@snapgear.com>");
|
|
MODULE_DESCRIPTION("Generic RAM based MTD for uClinux");
|
|
|
|
/****************************************************************************/
|