mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 20:01:55 +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>
179 lines
4.5 KiB
C
179 lines
4.5 KiB
C
/*
|
|
* Sonics Silicon Backplane
|
|
* Common SPROM support routines
|
|
*
|
|
* Copyright (C) 2005-2008 Michael Buesch <mb@bu3sch.de>
|
|
* Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
|
|
* Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
|
|
* Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
|
|
* Copyright (C) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
|
|
*
|
|
* Licensed under the GNU/GPL. See COPYING for details.
|
|
*/
|
|
|
|
#include "ssb_private.h"
|
|
|
|
#include <linux/ctype.h>
|
|
#include <linux/slab.h>
|
|
|
|
|
|
static const struct ssb_sprom *fallback_sprom;
|
|
|
|
|
|
static int sprom2hex(const u16 *sprom, char *buf, size_t buf_len,
|
|
size_t sprom_size_words)
|
|
{
|
|
int i, pos = 0;
|
|
|
|
for (i = 0; i < sprom_size_words; i++)
|
|
pos += snprintf(buf + pos, buf_len - pos - 1,
|
|
"%04X", swab16(sprom[i]) & 0xFFFF);
|
|
pos += snprintf(buf + pos, buf_len - pos - 1, "\n");
|
|
|
|
return pos + 1;
|
|
}
|
|
|
|
static int hex2sprom(u16 *sprom, const char *dump, size_t len,
|
|
size_t sprom_size_words)
|
|
{
|
|
char c, tmp[5] = { 0 };
|
|
int err, cnt = 0;
|
|
unsigned long parsed;
|
|
|
|
/* Strip whitespace at the end. */
|
|
while (len) {
|
|
c = dump[len - 1];
|
|
if (!isspace(c) && c != '\0')
|
|
break;
|
|
len--;
|
|
}
|
|
/* Length must match exactly. */
|
|
if (len != sprom_size_words * 4)
|
|
return -EINVAL;
|
|
|
|
while (cnt < sprom_size_words) {
|
|
memcpy(tmp, dump, 4);
|
|
dump += 4;
|
|
err = strict_strtoul(tmp, 16, &parsed);
|
|
if (err)
|
|
return err;
|
|
sprom[cnt++] = swab16((u16)parsed);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Common sprom device-attribute show-handler */
|
|
ssize_t ssb_attr_sprom_show(struct ssb_bus *bus, char *buf,
|
|
int (*sprom_read)(struct ssb_bus *bus, u16 *sprom))
|
|
{
|
|
u16 *sprom;
|
|
int err = -ENOMEM;
|
|
ssize_t count = 0;
|
|
size_t sprom_size_words = bus->sprom_size;
|
|
|
|
sprom = kcalloc(sprom_size_words, sizeof(u16), GFP_KERNEL);
|
|
if (!sprom)
|
|
goto out;
|
|
|
|
/* Use interruptible locking, as the SPROM write might
|
|
* be holding the lock for several seconds. So allow userspace
|
|
* to cancel operation. */
|
|
err = -ERESTARTSYS;
|
|
if (mutex_lock_interruptible(&bus->sprom_mutex))
|
|
goto out_kfree;
|
|
err = sprom_read(bus, sprom);
|
|
mutex_unlock(&bus->sprom_mutex);
|
|
|
|
if (!err)
|
|
count = sprom2hex(sprom, buf, PAGE_SIZE, sprom_size_words);
|
|
|
|
out_kfree:
|
|
kfree(sprom);
|
|
out:
|
|
return err ? err : count;
|
|
}
|
|
|
|
/* Common sprom device-attribute store-handler */
|
|
ssize_t ssb_attr_sprom_store(struct ssb_bus *bus,
|
|
const char *buf, size_t count,
|
|
int (*sprom_check_crc)(const u16 *sprom, size_t size),
|
|
int (*sprom_write)(struct ssb_bus *bus, const u16 *sprom))
|
|
{
|
|
u16 *sprom;
|
|
int res = 0, err = -ENOMEM;
|
|
size_t sprom_size_words = bus->sprom_size;
|
|
struct ssb_freeze_context freeze;
|
|
|
|
sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
|
|
if (!sprom)
|
|
goto out;
|
|
err = hex2sprom(sprom, buf, count, sprom_size_words);
|
|
if (err) {
|
|
err = -EINVAL;
|
|
goto out_kfree;
|
|
}
|
|
err = sprom_check_crc(sprom, sprom_size_words);
|
|
if (err) {
|
|
err = -EINVAL;
|
|
goto out_kfree;
|
|
}
|
|
|
|
/* Use interruptible locking, as the SPROM write might
|
|
* be holding the lock for several seconds. So allow userspace
|
|
* to cancel operation. */
|
|
err = -ERESTARTSYS;
|
|
if (mutex_lock_interruptible(&bus->sprom_mutex))
|
|
goto out_kfree;
|
|
err = ssb_devices_freeze(bus, &freeze);
|
|
if (err) {
|
|
ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
|
|
goto out_unlock;
|
|
}
|
|
res = sprom_write(bus, sprom);
|
|
err = ssb_devices_thaw(&freeze);
|
|
if (err)
|
|
ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
|
|
out_unlock:
|
|
mutex_unlock(&bus->sprom_mutex);
|
|
out_kfree:
|
|
kfree(sprom);
|
|
out:
|
|
if (res)
|
|
return res;
|
|
return err ? err : count;
|
|
}
|
|
|
|
/**
|
|
* ssb_arch_set_fallback_sprom - Set a fallback SPROM for use if no SPROM is found.
|
|
*
|
|
* @sprom: The SPROM data structure to register.
|
|
*
|
|
* With this function the architecture implementation may register a fallback
|
|
* SPROM data structure. The fallback is only used for PCI based SSB devices,
|
|
* where no valid SPROM can be found in the shadow registers.
|
|
*
|
|
* This function is useful for weird architectures that have a half-assed SSB device
|
|
* hardwired to their PCI bus.
|
|
*
|
|
* Note that it does only work with PCI attached SSB devices. PCMCIA devices currently
|
|
* don't use this fallback.
|
|
* Architectures must provide the SPROM for native SSB devices anyway,
|
|
* so the fallback also isn't used for native devices.
|
|
*
|
|
* This function is available for architecture code, only. So it is not exported.
|
|
*/
|
|
int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom)
|
|
{
|
|
if (fallback_sprom)
|
|
return -EEXIST;
|
|
fallback_sprom = sprom;
|
|
|
|
return 0;
|
|
}
|
|
|
|
const struct ssb_sprom *ssb_get_fallback_sprom(void)
|
|
{
|
|
return fallback_sprom;
|
|
}
|