mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
412 lines
8.9 KiB
C
412 lines
8.9 KiB
C
/*
|
|
** z2ram - Amiga pseudo-driver to access 16bit-RAM in ZorroII space
|
|
** as a block device, to be used as a RAM disk or swap space
|
|
**
|
|
** Copyright (C) 1994 by Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de)
|
|
**
|
|
** ++Geert: support for zorro_unused_z2ram, better range checking
|
|
** ++roman: translate accesses via an array
|
|
** ++Milan: support for ChipRAM usage
|
|
** ++yambo: converted to 2.0 kernel
|
|
** ++yambo: modularized and support added for 3 minor devices including:
|
|
** MAJOR MINOR DESCRIPTION
|
|
** ----- ----- ----------------------------------------------
|
|
** 37 0 Use Zorro II and Chip ram
|
|
** 37 1 Use only Zorro II ram
|
|
** 37 2 Use only Chip ram
|
|
** 37 4-7 Use memory list entry 1-4 (first is 0)
|
|
** ++jskov: support for 1-4th memory list entry.
|
|
**
|
|
** Permission to use, copy, modify, and distribute this software and its
|
|
** documentation for any purpose and without fee is hereby granted, provided
|
|
** that the above copyright notice appear in all copies and that both that
|
|
** copyright notice and this permission notice appear in supporting
|
|
** documentation. This software is provided "as is" without express or
|
|
** implied warranty.
|
|
*/
|
|
|
|
#define DEVICE_NAME "Z2RAM"
|
|
|
|
#include <linux/major.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/setup.h>
|
|
#include <asm/amigahw.h>
|
|
#include <asm/pgtable.h>
|
|
|
|
#include <linux/zorro.h>
|
|
|
|
|
|
extern int m68k_realnum_memory;
|
|
extern struct mem_info m68k_memory[NUM_MEMINFO];
|
|
|
|
#define Z2MINOR_COMBINED (0)
|
|
#define Z2MINOR_Z2ONLY (1)
|
|
#define Z2MINOR_CHIPONLY (2)
|
|
#define Z2MINOR_MEMLIST1 (4)
|
|
#define Z2MINOR_MEMLIST2 (5)
|
|
#define Z2MINOR_MEMLIST3 (6)
|
|
#define Z2MINOR_MEMLIST4 (7)
|
|
#define Z2MINOR_COUNT (8) /* Move this down when adding a new minor */
|
|
|
|
#define Z2RAM_CHUNK1024 ( Z2RAM_CHUNKSIZE >> 10 )
|
|
|
|
static u_long *z2ram_map = NULL;
|
|
static u_long z2ram_size = 0;
|
|
static int z2_count = 0;
|
|
static int chip_count = 0;
|
|
static int list_count = 0;
|
|
static int current_device = -1;
|
|
|
|
static DEFINE_SPINLOCK(z2ram_lock);
|
|
|
|
static struct gendisk *z2ram_gendisk;
|
|
|
|
static void do_z2_request(struct request_queue *q)
|
|
{
|
|
struct request *req;
|
|
|
|
req = blk_fetch_request(q);
|
|
while (req) {
|
|
unsigned long start = blk_rq_pos(req) << 9;
|
|
unsigned long len = blk_rq_cur_bytes(req);
|
|
int err = 0;
|
|
|
|
if (start + len > z2ram_size) {
|
|
printk( KERN_ERR DEVICE_NAME ": bad access: block=%lu, count=%u\n",
|
|
blk_rq_pos(req), blk_rq_cur_sectors(req));
|
|
err = -EIO;
|
|
goto done;
|
|
}
|
|
while (len) {
|
|
unsigned long addr = start & Z2RAM_CHUNKMASK;
|
|
unsigned long size = Z2RAM_CHUNKSIZE - addr;
|
|
if (len < size)
|
|
size = len;
|
|
addr += z2ram_map[ start >> Z2RAM_CHUNKSHIFT ];
|
|
if (rq_data_dir(req) == READ)
|
|
memcpy(req->buffer, (char *)addr, size);
|
|
else
|
|
memcpy((char *)addr, req->buffer, size);
|
|
start += size;
|
|
len -= size;
|
|
}
|
|
done:
|
|
if (!__blk_end_request_cur(req, err))
|
|
req = blk_fetch_request(q);
|
|
}
|
|
}
|
|
|
|
static void
|
|
get_z2ram( void )
|
|
{
|
|
int i;
|
|
|
|
for ( i = 0; i < Z2RAM_SIZE / Z2RAM_CHUNKSIZE; i++ )
|
|
{
|
|
if ( test_bit( i, zorro_unused_z2ram ) )
|
|
{
|
|
z2_count++;
|
|
z2ram_map[ z2ram_size++ ] =
|
|
ZTWO_VADDR( Z2RAM_START ) + ( i << Z2RAM_CHUNKSHIFT );
|
|
clear_bit( i, zorro_unused_z2ram );
|
|
}
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
static void
|
|
get_chipram( void )
|
|
{
|
|
|
|
while ( amiga_chip_avail() > ( Z2RAM_CHUNKSIZE * 4 ) )
|
|
{
|
|
chip_count++;
|
|
z2ram_map[ z2ram_size ] =
|
|
(u_long)amiga_chip_alloc( Z2RAM_CHUNKSIZE, "z2ram" );
|
|
|
|
if ( z2ram_map[ z2ram_size ] == 0 )
|
|
{
|
|
break;
|
|
}
|
|
|
|
z2ram_size++;
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
static int z2_open(struct block_device *bdev, fmode_t mode)
|
|
{
|
|
int device;
|
|
int max_z2_map = ( Z2RAM_SIZE / Z2RAM_CHUNKSIZE ) *
|
|
sizeof( z2ram_map[0] );
|
|
int max_chip_map = ( amiga_chip_size / Z2RAM_CHUNKSIZE ) *
|
|
sizeof( z2ram_map[0] );
|
|
int rc = -ENOMEM;
|
|
|
|
device = MINOR(bdev->bd_dev);
|
|
|
|
if ( current_device != -1 && current_device != device )
|
|
{
|
|
rc = -EBUSY;
|
|
goto err_out;
|
|
}
|
|
|
|
if ( current_device == -1 )
|
|
{
|
|
z2_count = 0;
|
|
chip_count = 0;
|
|
list_count = 0;
|
|
z2ram_size = 0;
|
|
|
|
/* Use a specific list entry. */
|
|
if (device >= Z2MINOR_MEMLIST1 && device <= Z2MINOR_MEMLIST4) {
|
|
int index = device - Z2MINOR_MEMLIST1 + 1;
|
|
unsigned long size, paddr, vaddr;
|
|
|
|
if (index >= m68k_realnum_memory) {
|
|
printk( KERN_ERR DEVICE_NAME
|
|
": no such entry in z2ram_map\n" );
|
|
goto err_out;
|
|
}
|
|
|
|
paddr = m68k_memory[index].addr;
|
|
size = m68k_memory[index].size & ~(Z2RAM_CHUNKSIZE-1);
|
|
|
|
#ifdef __powerpc__
|
|
/* FIXME: ioremap doesn't build correct memory tables. */
|
|
{
|
|
vfree(vmalloc (size));
|
|
}
|
|
|
|
vaddr = (unsigned long) __ioremap (paddr, size,
|
|
_PAGE_WRITETHRU);
|
|
|
|
#else
|
|
vaddr = (unsigned long)z_remap_nocache_nonser(paddr, size);
|
|
#endif
|
|
z2ram_map =
|
|
kmalloc((size/Z2RAM_CHUNKSIZE)*sizeof(z2ram_map[0]),
|
|
GFP_KERNEL);
|
|
if ( z2ram_map == NULL )
|
|
{
|
|
printk( KERN_ERR DEVICE_NAME
|
|
": cannot get mem for z2ram_map\n" );
|
|
goto err_out;
|
|
}
|
|
|
|
while (size) {
|
|
z2ram_map[ z2ram_size++ ] = vaddr;
|
|
size -= Z2RAM_CHUNKSIZE;
|
|
vaddr += Z2RAM_CHUNKSIZE;
|
|
list_count++;
|
|
}
|
|
|
|
if ( z2ram_size != 0 )
|
|
printk( KERN_INFO DEVICE_NAME
|
|
": using %iK List Entry %d Memory\n",
|
|
list_count * Z2RAM_CHUNK1024, index );
|
|
} else
|
|
|
|
switch ( device )
|
|
{
|
|
case Z2MINOR_COMBINED:
|
|
|
|
z2ram_map = kmalloc( max_z2_map + max_chip_map, GFP_KERNEL );
|
|
if ( z2ram_map == NULL )
|
|
{
|
|
printk( KERN_ERR DEVICE_NAME
|
|
": cannot get mem for z2ram_map\n" );
|
|
goto err_out;
|
|
}
|
|
|
|
get_z2ram();
|
|
get_chipram();
|
|
|
|
if ( z2ram_size != 0 )
|
|
printk( KERN_INFO DEVICE_NAME
|
|
": using %iK Zorro II RAM and %iK Chip RAM (Total %dK)\n",
|
|
z2_count * Z2RAM_CHUNK1024,
|
|
chip_count * Z2RAM_CHUNK1024,
|
|
( z2_count + chip_count ) * Z2RAM_CHUNK1024 );
|
|
|
|
break;
|
|
|
|
case Z2MINOR_Z2ONLY:
|
|
z2ram_map = kmalloc( max_z2_map, GFP_KERNEL );
|
|
if ( z2ram_map == NULL )
|
|
{
|
|
printk( KERN_ERR DEVICE_NAME
|
|
": cannot get mem for z2ram_map\n" );
|
|
goto err_out;
|
|
}
|
|
|
|
get_z2ram();
|
|
|
|
if ( z2ram_size != 0 )
|
|
printk( KERN_INFO DEVICE_NAME
|
|
": using %iK of Zorro II RAM\n",
|
|
z2_count * Z2RAM_CHUNK1024 );
|
|
|
|
break;
|
|
|
|
case Z2MINOR_CHIPONLY:
|
|
z2ram_map = kmalloc( max_chip_map, GFP_KERNEL );
|
|
if ( z2ram_map == NULL )
|
|
{
|
|
printk( KERN_ERR DEVICE_NAME
|
|
": cannot get mem for z2ram_map\n" );
|
|
goto err_out;
|
|
}
|
|
|
|
get_chipram();
|
|
|
|
if ( z2ram_size != 0 )
|
|
printk( KERN_INFO DEVICE_NAME
|
|
": using %iK Chip RAM\n",
|
|
chip_count * Z2RAM_CHUNK1024 );
|
|
|
|
break;
|
|
|
|
default:
|
|
rc = -ENODEV;
|
|
goto err_out;
|
|
|
|
break;
|
|
}
|
|
|
|
if ( z2ram_size == 0 )
|
|
{
|
|
printk( KERN_NOTICE DEVICE_NAME
|
|
": no unused ZII/Chip RAM found\n" );
|
|
goto err_out_kfree;
|
|
}
|
|
|
|
current_device = device;
|
|
z2ram_size <<= Z2RAM_CHUNKSHIFT;
|
|
set_capacity(z2ram_gendisk, z2ram_size >> 9);
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_out_kfree:
|
|
kfree(z2ram_map);
|
|
err_out:
|
|
return rc;
|
|
}
|
|
|
|
static int
|
|
z2_release(struct gendisk *disk, fmode_t mode)
|
|
{
|
|
if ( current_device == -1 )
|
|
return 0;
|
|
|
|
/*
|
|
* FIXME: unmap memory
|
|
*/
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct block_device_operations z2_fops =
|
|
{
|
|
.owner = THIS_MODULE,
|
|
.open = z2_open,
|
|
.release = z2_release,
|
|
};
|
|
|
|
static struct kobject *z2_find(dev_t dev, int *part, void *data)
|
|
{
|
|
*part = 0;
|
|
return get_disk(z2ram_gendisk);
|
|
}
|
|
|
|
static struct request_queue *z2_queue;
|
|
|
|
static int __init
|
|
z2_init(void)
|
|
{
|
|
int ret;
|
|
|
|
if (!MACH_IS_AMIGA)
|
|
return -ENODEV;
|
|
|
|
ret = -EBUSY;
|
|
if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME))
|
|
goto err;
|
|
|
|
ret = -ENOMEM;
|
|
z2ram_gendisk = alloc_disk(1);
|
|
if (!z2ram_gendisk)
|
|
goto out_disk;
|
|
|
|
z2_queue = blk_init_queue(do_z2_request, &z2ram_lock);
|
|
if (!z2_queue)
|
|
goto out_queue;
|
|
|
|
z2ram_gendisk->major = Z2RAM_MAJOR;
|
|
z2ram_gendisk->first_minor = 0;
|
|
z2ram_gendisk->fops = &z2_fops;
|
|
sprintf(z2ram_gendisk->disk_name, "z2ram");
|
|
|
|
z2ram_gendisk->queue = z2_queue;
|
|
add_disk(z2ram_gendisk);
|
|
blk_register_region(MKDEV(Z2RAM_MAJOR, 0), Z2MINOR_COUNT, THIS_MODULE,
|
|
z2_find, NULL, NULL);
|
|
|
|
return 0;
|
|
|
|
out_queue:
|
|
put_disk(z2ram_gendisk);
|
|
out_disk:
|
|
unregister_blkdev(Z2RAM_MAJOR, DEVICE_NAME);
|
|
err:
|
|
return ret;
|
|
}
|
|
|
|
static void __exit z2_exit(void)
|
|
{
|
|
int i, j;
|
|
blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), Z2MINOR_COUNT);
|
|
unregister_blkdev(Z2RAM_MAJOR, DEVICE_NAME);
|
|
del_gendisk(z2ram_gendisk);
|
|
put_disk(z2ram_gendisk);
|
|
blk_cleanup_queue(z2_queue);
|
|
|
|
if ( current_device != -1 )
|
|
{
|
|
i = 0;
|
|
|
|
for ( j = 0 ; j < z2_count; j++ )
|
|
{
|
|
set_bit( i++, zorro_unused_z2ram );
|
|
}
|
|
|
|
for ( j = 0 ; j < chip_count; j++ )
|
|
{
|
|
if ( z2ram_map[ i ] )
|
|
{
|
|
amiga_chip_free( (void *) z2ram_map[ i++ ] );
|
|
}
|
|
}
|
|
|
|
if ( z2ram_map != NULL )
|
|
{
|
|
kfree( z2ram_map );
|
|
}
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
module_init(z2_init);
|
|
module_exit(z2_exit);
|
|
MODULE_LICENSE("GPL");
|