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>
125 lines
3.4 KiB
C
125 lines
3.4 KiB
C
/*
|
|
* Copyright 2003 PMC-Sierra
|
|
* Author: Manish Lachwani (lachwani@pmc-sierra.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
|
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/delay.h>
|
|
#include <asm/io.h>
|
|
|
|
#include <asm/titan_dep.h>
|
|
|
|
static int titan_ht_config_read_dword(struct pci_bus *bus, unsigned int devfn,
|
|
int offset, u32 * val)
|
|
{
|
|
volatile uint32_t address;
|
|
int busno;
|
|
|
|
busno = bus->number;
|
|
|
|
address = (busno << 16) | (devfn << 8) | (offset & 0xfc) | 0x80000000;
|
|
if (busno != 0)
|
|
address |= 1;
|
|
|
|
/*
|
|
* RM9000 HT Errata: Issue back to back HT config
|
|
* transcations. Issue a BIU sync before and
|
|
* after the HT cycle
|
|
*/
|
|
|
|
*(volatile int32_t *) 0xfb0000f0 |= 0x2;
|
|
|
|
udelay(30);
|
|
|
|
*(volatile int32_t *) 0xfb0006f8 = address;
|
|
*(val) = *(volatile int32_t *) 0xfb0006fc;
|
|
|
|
udelay(30);
|
|
|
|
* (volatile int32_t *) 0xfb0000f0 |= 0x2;
|
|
|
|
return PCIBIOS_SUCCESSFUL;
|
|
}
|
|
|
|
static int titan_ht_config_read(struct pci_bus *bus, unsigned int devfn,
|
|
int offset, int size, u32 * val)
|
|
{
|
|
uint32_t dword;
|
|
|
|
titan_ht_config_read_dword(bus, devfn, offset, &dword);
|
|
|
|
dword >>= ((offset & 3) << 3);
|
|
dword &= (0xffffffffU >> ((4 - size) << 8));
|
|
|
|
return PCIBIOS_SUCCESSFUL;
|
|
}
|
|
|
|
static inline int titan_ht_config_write_dword(struct pci_bus *bus,
|
|
unsigned int devfn, int offset, u32 val)
|
|
{
|
|
volatile uint32_t address;
|
|
int busno;
|
|
|
|
busno = bus->number;
|
|
|
|
address = (busno << 16) | (devfn << 8) | (offset & 0xfc) | 0x80000000;
|
|
if (busno != 0)
|
|
address |= 1;
|
|
|
|
*(volatile int32_t *) 0xfb0000f0 |= 0x2;
|
|
|
|
udelay(30);
|
|
|
|
*(volatile int32_t *) 0xfb0006f8 = address;
|
|
*(volatile int32_t *) 0xfb0006fc = val;
|
|
|
|
udelay(30);
|
|
|
|
*(volatile int32_t *) 0xfb0000f0 |= 0x2;
|
|
|
|
return PCIBIOS_SUCCESSFUL;
|
|
}
|
|
|
|
static int titan_ht_config_write(struct pci_bus *bus, unsigned int devfn,
|
|
int offset, int size, u32 val)
|
|
{
|
|
uint32_t val1, val2, mask;
|
|
|
|
titan_ht_config_read_dword(bus, devfn, offset, &val2);
|
|
|
|
val1 = val << ((offset & 3) << 3);
|
|
mask = ~(0xffffffffU >> ((4 - size) << 8));
|
|
val2 &= ~(mask << ((offset & 3) << 8));
|
|
|
|
titan_ht_config_write_dword(bus, devfn, offset, val1 | val2);
|
|
|
|
return PCIBIOS_SUCCESSFUL;
|
|
}
|
|
|
|
struct pci_ops titan_ht_pci_ops = {
|
|
.read = titan_ht_config_read,
|
|
.write = titan_ht_config_write,
|
|
};
|