Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 大约 4 年

通知 14
Star 8
Fork 2
K
kernel_linux
提交 ed735ccb 编写于 作者: J Jeff Garzik
浏览文件
操作

Merge HEAD from /spare/repo/linux-2.6/.git

上级 39fbe473 d8971fcb
展开全部 隐藏空白更改
内联 并排
Showing with 29643 addition and 11412 deletion
Documentation/feature-removal-schedule.txt
浏览文件 @ ed735ccb
...@@ -135,3 +135,15 @@ Why: With the 16-bit PCMCIA subsystem now behaving (almost) like a ...@@ -135,3 +135,15 @@ Why: With the 16-bit PCMCIA subsystem now behaving (almost) like a
pcmciautils package available at pcmciautils package available at
http://kernel.org/pub/linux/utils/kernel/pcmcia/ http://kernel.org/pub/linux/utils/kernel/pcmcia/
Who: Dominik Brodowski <linux@brodo.de> Who: Dominik Brodowski <linux@brodo.de>
---------------------------
What: ip_queue and ip6_queue (old ipv4-only and ipv6-only netfilter queue)
When: December 2005
Why: This interface has been obsoleted by the new layer3-independent
"nfnetlink_queue". The Kernel interface is compatible, so the old
ip[6]tables "QUEUE" targets still work and will transparently handle
all packets into nfnetlink queue number 0. Userspace users will have
to link against API-compatible library on top of libnfnetlink_queue
instead of the current 'libipq'.
Who: Harald Welte <laforge@netfilter.org>
arch/ppc/Makefile
浏览文件 @ ed735ccb
...@@ -21,11 +21,13 @@ CC := $(CC) -m32 ...@@ -21,11 +21,13 @@ CC := $(CC) -m32
endif endif
LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic
CPPFLAGS += -Iarch/$(ARCH) CPPFLAGS += -Iarch/$(ARCH) -Iinclude3
AFLAGS += -Iarch/$(ARCH) AFLAGS += -Iarch/$(ARCH)
CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe \ CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe \
-ffixed-r2 -mmultiple -ffixed-r2 -mmultiple
CPP = $(CC) -E $(CFLAGS) CPP = $(CC) -E $(CFLAGS)
# Temporary hack until we have migrated to asm-powerpc
LINUXINCLUDE += -Iinclude3
CHECKFLAGS += -D__powerpc__ CHECKFLAGS += -D__powerpc__
...@@ -101,6 +103,7 @@ endef ...@@ -101,6 +103,7 @@ endef
archclean: archclean:
$(Q)$(MAKE) $(clean)=arch/ppc/boot $(Q)$(MAKE) $(clean)=arch/ppc/boot
$(Q)rm -rf include3
prepare: include/asm-$(ARCH)/offsets.h checkbin prepare: include/asm-$(ARCH)/offsets.h checkbin
...@@ -110,6 +113,12 @@ arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ ...@@ -110,6 +113,12 @@ arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
$(call filechk,gen-asm-offsets) $(call filechk,gen-asm-offsets)
# Temporary hack until we have migrated to asm-powerpc
include/asm: include3/asm
include3/asm:
$(Q)if [ ! -d include3 ]; then mkdir -p include3; fi
$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm
# Use the file '.tmp_gas_check' for binutils tests, as gas won't output # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
# to stdout and these checks are run even on install targets. # to stdout and these checks are run even on install targets.
TOUT := .tmp_gas_check TOUT := .tmp_gas_check
......
arch/ppc/boot/utils/addRamDisk.c 已删除 100644 → 0
浏览文件 @ 39fbe473
#include <stdio.h>
#include <stdlib.h>
#include <netinet/in.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#define ElfHeaderSize (64 * 1024)
#define ElfPages (ElfHeaderSize / 4096)
#define KERNELBASE (0xc0000000)
void get4k(FILE *file, char *buf )
{
unsigned j;
unsigned num = fread(buf, 1, 4096, file);
for ( j=num; j<4096; ++j )
buf[j] = 0;
}
void put4k(FILE *file, char *buf )
{
fwrite(buf, 1, 4096, file);
}
void death(const char *msg, FILE *fdesc, const char *fname)
{
printf(msg);
fclose(fdesc);
unlink(fname);
exit(1);
}
int main(int argc, char **argv)
{
char inbuf[4096];
FILE *ramDisk = NULL;
FILE *inputVmlinux = NULL;
FILE *outputVmlinux = NULL;
unsigned i = 0;
u_int32_t ramFileLen = 0;
u_int32_t ramLen = 0;
u_int32_t roundR = 0;
u_int32_t kernelLen = 0;
u_int32_t actualKernelLen = 0;
u_int32_t round = 0;
u_int32_t roundedKernelLen = 0;
u_int32_t ramStartOffs = 0;
u_int32_t ramPages = 0;
u_int32_t roundedKernelPages = 0;
u_int32_t hvReleaseData = 0;
u_int32_t eyeCatcher = 0xc8a5d9c4;
u_int32_t naca = 0;
u_int32_t xRamDisk = 0;
u_int32_t xRamDiskSize = 0;
if ( argc < 2 ) {
printf("Name of RAM disk file missing.\n");
exit(1);
}
if ( argc < 3 ) {
printf("Name of vmlinux file missing.\n");
exit(1);
}
if ( argc < 4 ) {
printf("Name of vmlinux output file missing.\n");
exit(1);
}
ramDisk = fopen(argv[1], "r");
if ( ! ramDisk ) {
printf("RAM disk file \"%s\" failed to open.\n", argv[1]);
exit(1);
}
inputVmlinux = fopen(argv[2], "r");
if ( ! inputVmlinux ) {
printf("vmlinux file \"%s\" failed to open.\n", argv[2]);
exit(1);
}
outputVmlinux = fopen(argv[3], "w+");
if ( ! outputVmlinux ) {
printf("output vmlinux file \"%s\" failed to open.\n", argv[3]);
exit(1);
}
fseek(ramDisk, 0, SEEK_END);
ramFileLen = ftell(ramDisk);
fseek(ramDisk, 0, SEEK_SET);
printf("%s file size = %d\n", argv[1], ramFileLen);
ramLen = ramFileLen;
roundR = 4096 - (ramLen % 4096);
if ( roundR ) {
printf("Rounding RAM disk file up to a multiple of 4096, adding %d\n", roundR);
ramLen += roundR;
}
printf("Rounded RAM disk size is %d\n", ramLen);
fseek(inputVmlinux, 0, SEEK_END);
kernelLen = ftell(inputVmlinux);
fseek(inputVmlinux, 0, SEEK_SET);
printf("kernel file size = %d\n", kernelLen);
if ( kernelLen == 0 ) {
printf("You must have a linux kernel specified as argv[2]\n");
exit(1);
}
actualKernelLen = kernelLen - ElfHeaderSize;
printf("actual kernel length (minus ELF header) = %d\n", actualKernelLen);
round = actualKernelLen % 4096;
roundedKernelLen = actualKernelLen;
if ( round )
roundedKernelLen += (4096 - round);
printf("actual kernel length rounded up to a 4k multiple = %d\n", roundedKernelLen);
ramStartOffs = roundedKernelLen;
ramPages = ramLen / 4096;
printf("RAM disk pages to copy = %d\n", ramPages);
// Copy 64K ELF header
for (i=0; i<(ElfPages); ++i) {
get4k( inputVmlinux, inbuf );
put4k( outputVmlinux, inbuf );
}
roundedKernelPages = roundedKernelLen / 4096;
fseek(inputVmlinux, ElfHeaderSize, SEEK_SET);
for ( i=0; i<roundedKernelPages; ++i ) {
get4k( inputVmlinux, inbuf );
put4k( outputVmlinux, inbuf );
}
for ( i=0; i<ramPages; ++i ) {
get4k( ramDisk, inbuf );
put4k( outputVmlinux, inbuf );
}
/* Close the input files */
fclose(ramDisk);
fclose(inputVmlinux);
/* And flush the written output file */
fflush(outputVmlinux);
/* fseek to the hvReleaseData pointer */
fseek(outputVmlinux, ElfHeaderSize + 0x24, SEEK_SET);
if (fread(&hvReleaseData, 4, 1, outputVmlinux) != 1) {
death("Could not read hvReleaseData pointer\n", outputVmlinux, argv[3]);
}
hvReleaseData = ntohl(hvReleaseData); /* Convert to native int */
printf("hvReleaseData is at %08x\n", hvReleaseData);
/* fseek to the hvReleaseData */
fseek(outputVmlinux, ElfHeaderSize + hvReleaseData, SEEK_SET);
if (fread(inbuf, 0x40, 1, outputVmlinux) != 1) {
death("Could not read hvReleaseData\n", outputVmlinux, argv[3]);
}
/* Check hvReleaseData sanity */
if (memcmp(inbuf, &eyeCatcher, 4) != 0) {
death("hvReleaseData is invalid\n", outputVmlinux, argv[3]);
}
/* Get the naca pointer */
naca = ntohl(*((u_int32_t *) &inbuf[0x0c])) - KERNELBASE;
printf("naca is at %08x\n", naca);
/* fseek to the naca */
fseek(outputVmlinux, ElfHeaderSize + naca, SEEK_SET);
if (fread(inbuf, 0x18, 1, outputVmlinux) != 1) {
death("Could not read naca\n", outputVmlinux, argv[3]);
}
xRamDisk = ntohl(*((u_int32_t *) &inbuf[0x0c]));
xRamDiskSize = ntohl(*((u_int32_t *) &inbuf[0x14]));
/* Make sure a RAM disk isn't already present */
if ((xRamDisk != 0) || (xRamDiskSize != 0)) {
death("RAM disk is already attached to this kernel\n", outputVmlinux, argv[3]);
}
/* Fill in the values */
*((u_int32_t *) &inbuf[0x0c]) = htonl(ramStartOffs);
*((u_int32_t *) &inbuf[0x14]) = htonl(ramPages);
/* Write out the new naca */
fflush(outputVmlinux);
fseek(outputVmlinux, ElfHeaderSize + naca, SEEK_SET);
if (fwrite(inbuf, 0x18, 1, outputVmlinux) != 1) {
death("Could not write naca\n", outputVmlinux, argv[3]);
}
printf("RAM Disk of 0x%x pages size is attached to the kernel at offset 0x%08x\n",
ramPages, ramStartOffs);
/* Done */
fclose(outputVmlinux);
/* Set permission to executable */
chmod(argv[3], S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
return 0;
}
arch/ppc64/Kconfig
浏览文件 @ ed735ccb
...@@ -302,12 +302,6 @@ config GENERIC_HARDIRQS ...@@ -302,12 +302,6 @@ config GENERIC_HARDIRQS
bool bool
default y default y
config MSCHUNKS
bool
depends on PPC_ISERIES
default y
config PPC_RTAS config PPC_RTAS
bool bool
depends on PPC_PSERIES || PPC_BPA depends on PPC_PSERIES || PPC_BPA
...@@ -350,13 +344,46 @@ config SECCOMP ...@@ -350,13 +344,46 @@ config SECCOMP
If unsure, say Y. Only embedded should say N here. If unsure, say Y. Only embedded should say N here.
source "fs/Kconfig.binfmt"
config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs"
depends on SMP && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC)
select HOTPLUG
---help---
Say Y here to be able to turn CPUs off and on.
Say N if you are unsure.
config PROC_DEVICETREE
bool "Support for Open Firmware device tree in /proc"
depends on !PPC_ISERIES
help
This option adds a device-tree directory under /proc which contains
an image of the device tree that the kernel copies from Open
Firmware. If unsure, say Y here.
config CMDLINE_BOOL
bool "Default bootloader kernel arguments"
depends on !PPC_ISERIES
config CMDLINE
string "Initial kernel command string"
depends on CMDLINE_BOOL
default "console=ttyS0,9600 console=tty0 root=/dev/sda2"
help
On some platforms, there is currently no way for the boot loader to
pass arguments to the kernel. For these platforms, you can supply
some command-line options at build time by entering them here. In
most cases you will need to specify the root device here.
endmenu endmenu
config ISA_DMA_API config ISA_DMA_API
bool bool
default y default y
menu "General setup" menu "Bus Options"
config ISA config ISA
bool bool
...@@ -389,45 +416,12 @@ config PCI_DOMAINS ...@@ -389,45 +416,12 @@ config PCI_DOMAINS
bool bool
default PCI default PCI
source "fs/Kconfig.binfmt"
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs"
depends on SMP && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC)
select HOTPLUG
---help---
Say Y here to be able to turn CPUs off and on.
Say N if you are unsure.
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
source "drivers/pci/hotplug/Kconfig" source "drivers/pci/hotplug/Kconfig"
config PROC_DEVICETREE
bool "Support for Open Firmware device tree in /proc"
depends on !PPC_ISERIES
help
This option adds a device-tree directory under /proc which contains
an image of the device tree that the kernel copies from Open
Firmware. If unsure, say Y here.
config CMDLINE_BOOL
bool "Default bootloader kernel arguments"
depends on !PPC_ISERIES
config CMDLINE
string "Initial kernel command string"
depends on CMDLINE_BOOL
default "console=ttyS0,9600 console=tty0 root=/dev/sda2"
help
On some platforms, there is currently no way for the boot loader to
pass arguments to the kernel. For these platforms, you can supply
some command-line options at build time by entering them here. In
most cases you will need to specify the root device here.
endmenu endmenu
source "net/Kconfig" source "net/Kconfig"
......
arch/ppc64/Makefile
浏览文件 @ ed735ccb
...@@ -55,6 +55,8 @@ LDFLAGS := -m elf64ppc ...@@ -55,6 +55,8 @@ LDFLAGS := -m elf64ppc
LDFLAGS_vmlinux := -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD) LDFLAGS_vmlinux := -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
CFLAGS += -msoft-float -pipe -mminimal-toc -mtraceback=none \ CFLAGS += -msoft-float -pipe -mminimal-toc -mtraceback=none \
-mcall-aixdesc -mcall-aixdesc
# Temporary hack until we have migrated to asm-powerpc
CPPFLAGS += -Iinclude3
GCC_VERSION := $(call cc-version) GCC_VERSION := $(call cc-version)
GCC_BROKEN_VEC := $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi ;) GCC_BROKEN_VEC := $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi ;)
...@@ -112,6 +114,7 @@ all: $(KBUILD_IMAGE) ...@@ -112,6 +114,7 @@ all: $(KBUILD_IMAGE)
archclean: archclean:
$(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)
$(Q)rm -rf include3
prepare: include/asm-ppc64/offsets.h prepare: include/asm-ppc64/offsets.h
...@@ -121,6 +124,12 @@ arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \ ...@@ -121,6 +124,12 @@ arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
$(call filechk,gen-asm-offsets) $(call filechk,gen-asm-offsets)
# Temporary hack until we have migrated to asm-powerpc
include/asm: include3/asm
include3/asm:
$(Q)if [ ! -d include3 ]; then mkdir -p include3; fi;
$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm
define archhelp define archhelp
echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
echo ' zImage.initrd- Compressed kernel image with initrd attached,' echo ' zImage.initrd- Compressed kernel image with initrd attached,'
......
arch/ppc64/boot/Makefile
浏览文件 @ ed735ccb
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
HOSTCC := gcc HOSTCC := gcc
BOOTCFLAGS := $(HOSTCFLAGS) $(LINUXINCLUDE) -fno-builtin BOOTCFLAGS := $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem $(shell $(CROSS32CC) -print-file-name=include)
BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
BOOTLFLAGS := -Ttext 0x00400000 -e _start -T $(srctree)/$(src)/zImage.lds BOOTLFLAGS := -Ttext 0x00400000 -e _start -T $(srctree)/$(src)/zImage.lds
OBJCOPYFLAGS := contents,alloc,load,readonly,data OBJCOPYFLAGS := contents,alloc,load,readonly,data
......
arch/ppc64/boot/addnote.c
浏览文件 @ ed735ccb
...@@ -157,7 +157,7 @@ main(int ac, char **av) ...@@ -157,7 +157,7 @@ main(int ac, char **av)
PUT_32BE(ns, strlen(arch) + 1); PUT_32BE(ns, strlen(arch) + 1);
PUT_32BE(ns + 4, N_DESCR * 4); PUT_32BE(ns + 4, N_DESCR * 4);
PUT_32BE(ns + 8, 0x1275); PUT_32BE(ns + 8, 0x1275);
strcpy(&buf[ns + 12], arch); strcpy((char *) &buf[ns + 12], arch);
ns += 12 + strlen(arch) + 1; ns += 12 + strlen(arch) + 1;
for (i = 0; i < N_DESCR; ++i, ns += 4) for (i = 0; i < N_DESCR; ++i, ns += 4)
PUT_32BE(ns, descr[i]); PUT_32BE(ns, descr[i]);
...@@ -172,7 +172,7 @@ main(int ac, char **av) ...@@ -172,7 +172,7 @@ main(int ac, char **av)
PUT_32BE(ns, strlen(rpaname) + 1); PUT_32BE(ns, strlen(rpaname) + 1);
PUT_32BE(ns + 4, sizeof(rpanote)); PUT_32BE(ns + 4, sizeof(rpanote));
PUT_32BE(ns + 8, 0x12759999); PUT_32BE(ns + 8, 0x12759999);
strcpy(&buf[ns + 12], rpaname); strcpy((char *) &buf[ns + 12], rpaname);
ns += 12 + ROUNDUP(strlen(rpaname) + 1); ns += 12 + ROUNDUP(strlen(rpaname) + 1);
for (i = 0; i < N_RPA_DESCR; ++i, ns += 4) for (i = 0; i < N_RPA_DESCR; ++i, ns += 4)
PUT_32BE(ns, rpanote[i]); PUT_32BE(ns, rpanote[i]);
......
arch/ppc64/boot/crt0.S
浏览文件 @ ed735ccb
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* NOTE: this code runs in 32 bit mode and is packaged as ELF32. * NOTE: this code runs in 32 bit mode and is packaged as ELF32.
*/ */
#include <asm/ppc_asm.h> #include "ppc_asm.h"
.text .text
.globl _start .globl _start
......
arch/ppc64/boot/div64.S
浏览文件 @ ed735ccb
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#include <asm/ppc_asm.h> #include "ppc_asm.h"
.globl __div64_32 .globl __div64_32
__div64_32: __div64_32:
......
arch/ppc64/boot/elf.h 0 → 100644
浏览文件 @ ed735ccb
#ifndef _PPC_BOOT_ELF_H_
#define _PPC_BOOT_ELF_H_
/* 32-bit ELF base types. */
typedef unsigned int Elf32_Addr;
typedef unsigned short Elf32_Half;
typedef unsigned int Elf32_Off;
typedef signed int Elf32_Sword;
typedef unsigned int Elf32_Word;
/* 64-bit ELF base types. */
typedef unsigned long long Elf64_Addr;
typedef unsigned short Elf64_Half;
typedef signed short Elf64_SHalf;
typedef unsigned long long Elf64_Off;
typedef signed int Elf64_Sword;
typedef unsigned int Elf64_Word;
typedef unsigned long long Elf64_Xword;
typedef signed long long Elf64_Sxword;
/* These constants are for the segment types stored in the image headers */
#define PT_NULL 0
#define PT_LOAD 1
#define PT_DYNAMIC 2
#define PT_INTERP 3
#define PT_NOTE 4
#define PT_SHLIB 5
#define PT_PHDR 6
#define PT_TLS 7 /* Thread local storage segment */
#define PT_LOOS 0x60000000 /* OS-specific */
#define PT_HIOS 0x6fffffff /* OS-specific */
#define PT_LOPROC 0x70000000
#define PT_HIPROC 0x7fffffff
#define PT_GNU_EH_FRAME 0x6474e550
#define PT_GNU_STACK (PT_LOOS + 0x474e551)
/* These constants define the different elf file types */
#define ET_NONE 0
#define ET_REL 1
#define ET_EXEC 2
#define ET_DYN 3
#define ET_CORE 4
#define ET_LOPROC 0xff00
#define ET_HIPROC 0xffff
/* These constants define the various ELF target machines */
#define EM_NONE 0
#define EM_PPC 20 /* PowerPC */
#define EM_PPC64 21 /* PowerPC64 */
#define EI_NIDENT 16
typedef struct elf32_hdr {
unsigned char e_ident[EI_NIDENT];
Elf32_Half e_type;
Elf32_Half e_machine;
Elf32_Word e_version;
Elf32_Addr e_entry; /* Entry point */
Elf32_Off e_phoff;
Elf32_Off e_shoff;
Elf32_Word e_flags;
Elf32_Half e_ehsize;
Elf32_Half e_phentsize;
Elf32_Half e_phnum;
Elf32_Half e_shentsize;
Elf32_Half e_shnum;
Elf32_Half e_shstrndx;
} Elf32_Ehdr;
typedef struct elf64_hdr {
unsigned char e_ident[16]; /* ELF "magic number" */
Elf64_Half e_type;
Elf64_Half e_machine;
Elf64_Word e_version;
Elf64_Addr e_entry; /* Entry point virtual address */
Elf64_Off e_phoff; /* Program header table file offset */
Elf64_Off e_shoff; /* Section header table file offset */
Elf64_Word e_flags;
Elf64_Half e_ehsize;
Elf64_Half e_phentsize;
Elf64_Half e_phnum;
Elf64_Half e_shentsize;
Elf64_Half e_shnum;
Elf64_Half e_shstrndx;
} Elf64_Ehdr;
/* These constants define the permissions on sections in the program
header, p_flags. */
#define PF_R 0x4
#define PF_W 0x2
#define PF_X 0x1
typedef struct elf32_phdr {
Elf32_Word p_type;
Elf32_Off p_offset;
Elf32_Addr p_vaddr;
Elf32_Addr p_paddr;
Elf32_Word p_filesz;
Elf32_Word p_memsz;
Elf32_Word p_flags;
Elf32_Word p_align;
} Elf32_Phdr;
typedef struct elf64_phdr {
Elf64_Word p_type;
Elf64_Word p_flags;
Elf64_Off p_offset; /* Segment file offset */
Elf64_Addr p_vaddr; /* Segment virtual address */
Elf64_Addr p_paddr; /* Segment physical address */
Elf64_Xword p_filesz; /* Segment size in file */
Elf64_Xword p_memsz; /* Segment size in memory */
Elf64_Xword p_align; /* Segment alignment, file & memory */
} Elf64_Phdr;
#define EI_MAG0 0 /* e_ident[] indexes */
#define EI_MAG1 1
#define EI_MAG2 2
#define EI_MAG3 3
#define EI_CLASS 4
#define EI_DATA 5
#define EI_VERSION 6
#define EI_OSABI 7
#define EI_PAD 8
#define ELFMAG0 0x7f /* EI_MAG */
#define ELFMAG1 'E'
#define ELFMAG2 'L'
#define ELFMAG3 'F'
#define ELFMAG "\177ELF"
#define SELFMAG 4
#define ELFCLASSNONE 0 /* EI_CLASS */
#define ELFCLASS32 1
#define ELFCLASS64 2
#define ELFCLASSNUM 3
#define ELFDATANONE 0 /* e_ident[EI_DATA] */
#define ELFDATA2LSB 1
#define ELFDATA2MSB 2
#define EV_NONE 0 /* e_version, EI_VERSION */
#define EV_CURRENT 1
#define EV_NUM 2
#define ELFOSABI_NONE 0
#define ELFOSABI_LINUX 3
#endif /* _PPC_BOOT_ELF_H_ */
arch/ppc64/boot/main.c
浏览文件 @ ed735ccb
...@@ -8,36 +8,28 @@ ...@@ -8,36 +8,28 @@
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#include "ppc32-types.h" #include <stdarg.h>
#include <stddef.h>
#include "elf.h"
#include "page.h"
#include "string.h"
#include "stdio.h"
#include "prom.h"
#include "zlib.h" #include "zlib.h"
#include <linux/elf.h>
#include <linux/string.h> static void gunzip(void *, int, unsigned char *, int *);
#include <asm/processor.h> extern void flush_cache(void *, unsigned long);
#include <asm/page.h>
extern void *finddevice(const char *);
extern int getprop(void *, const char *, void *, int);
extern void printf(const char *fmt, ...);
extern int sprintf(char *buf, const char *fmt, ...);
void gunzip(void *, int, unsigned char *, int *);
void *claim(unsigned int, unsigned int, unsigned int);
void flush_cache(void *, unsigned long);
void pause(void);
extern void exit(void);
unsigned long strlen(const char *s);
void *memmove(void *dest, const void *src, unsigned long n);
void *memcpy(void *dest, const void *src, unsigned long n);
/* Value picked to match that used by yaboot */ /* Value picked to match that used by yaboot */
#define PROG_START 0x01400000 #define PROG_START 0x01400000
#define RAM_END (256<<20) // Fixme: use OF */ #define RAM_END (256<<20) // Fixme: use OF */
char *avail_ram; static char *avail_ram;
char *begin_avail, *end_avail; static char *begin_avail, *end_avail;
char *avail_high; static char *avail_high;
unsigned int heap_use; static unsigned int heap_use;
unsigned int heap_max; static unsigned int heap_max;
extern char _start[]; extern char _start[];
extern char _vmlinux_start[]; extern char _vmlinux_start[];
...@@ -52,9 +44,9 @@ struct addr_range { ...@@ -52,9 +44,9 @@ struct addr_range {
unsigned long size; unsigned long size;
unsigned long memsize; unsigned long memsize;
}; };
struct addr_range vmlinux = {0, 0, 0}; static struct addr_range vmlinux = {0, 0, 0};
struct addr_range vmlinuz = {0, 0, 0}; static struct addr_range vmlinuz = {0, 0, 0};
struct addr_range initrd = {0, 0, 0}; static struct addr_range initrd = {0, 0, 0};
static char scratch[128<<10]; /* 128kB of scratch space for gunzip */ static char scratch[128<<10]; /* 128kB of scratch space for gunzip */
...@@ -64,13 +56,6 @@ typedef void (*kernel_entry_t)( unsigned long, ...@@ -64,13 +56,6 @@ typedef void (*kernel_entry_t)( unsigned long,
void *); void *);
int (*prom)(void *);
void *chosen_handle;
void *stdin;
void *stdout;
void *stderr;
#undef DEBUG #undef DEBUG
static unsigned long claim_base = PROG_START; static unsigned long claim_base = PROG_START;
...@@ -277,7 +262,7 @@ void zfree(void *x, void *addr, unsigned nb) ...@@ -277,7 +262,7 @@ void zfree(void *x, void *addr, unsigned nb)
#define DEFLATED 8 #define DEFLATED 8
void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp) static void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
{ {
z_stream s; z_stream s;
int r, i, flags; int r, i, flags;
......
arch/ppc64/boot/page.h 0 → 100644
浏览文件 @ ed735ccb
#ifndef _PPC_BOOT_PAGE_H
#define _PPC_BOOT_PAGE_H
/*
* Copyright (C) 2001 PPC64 Team, IBM Corp
*
* 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.
*/
#ifdef __ASSEMBLY__
#define ASM_CONST(x) x
#else
#define __ASM_CONST(x) x##UL
#define ASM_CONST(x) __ASM_CONST(x)
#endif
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
#define PAGE_SIZE (ASM_CONST(1) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
/* align addr on a size boundary - adjust address up/down if needed */
#define _ALIGN_UP(addr,size) (((addr)+((size)-1))&(~((size)-1)))
#define _ALIGN_DOWN(addr,size) ((addr)&(~((size)-1)))
/* align addr on a size boundary - adjust address up if needed */
#define _ALIGN(addr,size) _ALIGN_UP(addr,size)
/* to align the pointer to the (next) page boundary */
#define PAGE_ALIGN(addr) _ALIGN(addr, PAGE_SIZE)
#endif /* _PPC_BOOT_PAGE_H */
arch/ppc64/boot/ppc32-types.h 已删除 100644 → 0
浏览文件 @ 39fbe473
#ifndef _PPC64_TYPES_H
#define _PPC64_TYPES_H
typedef __signed__ char __s8;
typedef unsigned char __u8;
typedef __signed__ short __s16;
typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
typedef signed char s8;
typedef unsigned char u8;
typedef signed short s16;
typedef unsigned short u16;
typedef signed int s32;
typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
typedef struct {
__u32 u[4];
} __attribute((aligned(16))) __vector128;
#define BITS_PER_LONG 32
typedef __vector128 vector128;
#endif /* _PPC64_TYPES_H */
arch/ppc64/boot/ppc_asm.h 0 → 100644
浏览文件 @ ed735ccb
#ifndef _PPC64_PPC_ASM_H
#define _PPC64_PPC_ASM_H
/*
*
* Definitions used by various bits of low-level assembly code on PowerPC.
*
* Copyright (C) 1995-1999 Gary Thomas, Paul Mackerras, Cort Dougan.
*
* 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.
*/
/* Condition Register Bit Fields */
#define cr0 0
#define cr1 1
#define cr2 2
#define cr3 3
#define cr4 4
#define cr5 5
#define cr6 6
#define cr7 7
/* General Purpose Registers (GPRs) */
#define r0 0
#define r1 1
#define r2 2
#define r3 3
#define r4 4
#define r5 5
#define r6 6
#define r7 7
#define r8 8
#define r9 9
#define r10 10
#define r11 11
#define r12 12
#define r13 13
#define r14 14
#define r15 15
#define r16 16
#define r17 17
#define r18 18
#define r19 19
#define r20 20
#define r21 21
#define r22 22
#define r23 23
#define r24 24
#define r25 25
#define r26 26
#define r27 27
#define r28 28
#define r29 29
#define r30 30
#define r31 31
#endif /* _PPC64_PPC_ASM_H */
arch/ppc64/boot/prom.c
浏览文件 @ ed735ccb
...@@ -7,43 +7,19 @@ ...@@ -7,43 +7,19 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#include <stdarg.h> #include <stdarg.h>
#include <linux/types.h> #include <stddef.h>
#include <linux/string.h> #include "string.h"
#include <linux/ctype.h> #include "stdio.h"
#include "prom.h"
extern __u32 __div64_32(unsigned long long *dividend, __u32 divisor);
/* The unnecessary pointer compare is there
* to check for type safety (n must be 64bit)
*/
# define do_div(n,base) ({ \
__u32 __base = (base); \
__u32 __rem; \
(void)(((typeof((n)) *)0) == ((unsigned long long *)0)); \
if (((n) >> 32) == 0) { \
__rem = (__u32)(n) % __base; \
(n) = (__u32)(n) / __base; \
} else \
__rem = __div64_32(&(n), __base); \
__rem; \
})
int (*prom)(void *); int (*prom)(void *);
void *chosen_handle; void *chosen_handle;
void *stdin; void *stdin;
void *stdout; void *stdout;
void *stderr; void *stderr;
void exit(void);
void *finddevice(const char *name);
int getprop(void *phandle, const char *name, void *buf, int buflen);
void chrpboot(int a1, int a2, void *prom); /* in main.c */
int printf(char *fmt, ...);
/* there is no convenient header to get this from... -- paulus */
extern unsigned long strlen(const char *);
int int
write(void *handle, void *ptr, int nb) write(void *handle, void *ptr, int nb)
...@@ -210,107 +186,6 @@ fputs(char *str, void *f) ...@@ -210,107 +186,6 @@ fputs(char *str, void *f)
return write(f, str, n) == n? 0: -1; return write(f, str, n) == n? 0: -1;
} }
int
readchar(void)
{
char ch;
for (;;) {
switch (read(stdin, &ch, 1)) {
case 1:
return ch;
case -1:
printf("read(stdin) returned -1\r\n");
return -1;
}
}
}
static char line[256];
static char *lineptr;
static int lineleft;
int
getchar(void)
{
int c;
if (lineleft == 0) {
lineptr = line;
for (;;) {
c = readchar();
if (c == -1 || c == 4)
break;
if (c == '\r' || c == '\n') {
*lineptr++ = '\n';
putchar('\n');
break;
}
switch (c) {
case 0177:
case '\b':
if (lineptr > line) {
putchar('\b');
putchar(' ');
putchar('\b');
--lineptr;
}
break;
case 'U' & 0x1F:
while (lineptr > line) {
putchar('\b');
putchar(' ');
putchar('\b');
--lineptr;
}
break;
default:
if (lineptr >= &line[sizeof(line) - 1])
putchar('\a');
else {
putchar(c);
*lineptr++ = c;
}
}
}
lineleft = lineptr - line;
lineptr = line;
}
if (lineleft == 0)
return -1;
--lineleft;
return *lineptr++;
}
/* String functions lifted from lib/vsprintf.c and lib/ctype.c */
unsigned char _ctype[] = {
_C,_C,_C,_C,_C,_C,_C,_C, /* 0-7 */
_C,_C|_S,_C|_S,_C|_S,_C|_S,_C|_S,_C,_C, /* 8-15 */
_C,_C,_C,_C,_C,_C,_C,_C, /* 16-23 */
_C,_C,_C,_C,_C,_C,_C,_C, /* 24-31 */
_S|_SP,_P,_P,_P,_P,_P,_P,_P, /* 32-39 */
_P,_P,_P,_P,_P,_P,_P,_P, /* 40-47 */
_D,_D,_D,_D,_D,_D,_D,_D, /* 48-55 */
_D,_D,_P,_P,_P,_P,_P,_P, /* 56-63 */
_P,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U, /* 64-71 */
_U,_U,_U,_U,_U,_U,_U,_U, /* 72-79 */
_U,_U,_U,_U,_U,_U,_U,_U, /* 80-87 */
_U,_U,_U,_P,_P,_P,_P,_P, /* 88-95 */
_P,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L, /* 96-103 */
_L,_L,_L,_L,_L,_L,_L,_L, /* 104-111 */
_L,_L,_L,_L,_L,_L,_L,_L, /* 112-119 */
_L,_L,_L,_P,_P,_P,_P,_C, /* 120-127 */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 128-143 */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 144-159 */
_S|_SP,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P, /* 160-175 */
_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P, /* 176-191 */
_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U, /* 192-207 */
_U,_U,_U,_U,_U,_U,_U,_P,_U,_U,_U,_U,_U,_U,_U,_L, /* 208-223 */
_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L, /* 224-239 */
_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */
size_t strnlen(const char * s, size_t count) size_t strnlen(const char * s, size_t count)
{ {
const char *sc; const char *sc;
...@@ -320,44 +195,30 @@ size_t strnlen(const char * s, size_t count) ...@@ -320,44 +195,30 @@ size_t strnlen(const char * s, size_t count)
return sc - s; return sc - s;
} }
unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base) extern unsigned int __div64_32(unsigned long long *dividend,
{ unsigned int divisor);
unsigned long result = 0,value;
if (!base) { /* The unnecessary pointer compare is there
base = 10; * to check for type safety (n must be 64bit)
if (*cp == '0') { */
base = 8; # define do_div(n,base) ({ \
cp++; unsigned int __base = (base); \
if ((*cp == 'x') && isxdigit(cp[1])) { unsigned int __rem; \
cp++; (void)(((typeof((n)) *)0) == ((unsigned long long *)0)); \
base = 16; if (((n) >> 32) == 0) { \
} __rem = (unsigned int)(n) % __base; \
} (n) = (unsigned int)(n) / __base; \
} } else \
while (isxdigit(*cp) && __rem = __div64_32(&(n), __base); \
(value = isdigit(*cp) ? *cp-'0' : toupper(*cp)-'A'+10) < base) { __rem; \
result = result*base + value; })
cp++;
}
if (endp)
*endp = (char *)cp;
return result;
}
long simple_strtol(const char *cp,char **endp,unsigned int base)
{
if(*cp=='-')
return -simple_strtoul(cp+1,endp,base);
return simple_strtoul(cp,endp,base);
}
static int skip_atoi(const char **s) static int skip_atoi(const char **s)
{ {
int i=0; int i, c;
while (isdigit(**s)) for (i = 0; '0' <= (c = **s) && c <= '9'; ++*s)
i = i*10 + *((*s)++) - '0'; i = i*10 + c - '0';
return i; return i;
} }
...@@ -436,9 +297,6 @@ static char * number(char * str, unsigned long long num, int base, int size, int ...@@ -436,9 +297,6 @@ static char * number(char * str, unsigned long long num, int base, int size, int
return str; return str;
} }
/* Forward decl. needed for IP address printing stuff... */
int sprintf(char * buf, const char *fmt, ...);
int vsprintf(char *buf, const char *fmt, va_list args) int vsprintf(char *buf, const char *fmt, va_list args)
{ {
int len; int len;
...@@ -477,7 +335,7 @@ int vsprintf(char *buf, const char *fmt, va_list args) ...@@ -477,7 +335,7 @@ int vsprintf(char *buf, const char *fmt, va_list args)
/* get field width */ /* get field width */
field_width = -1; field_width = -1;
if (isdigit(*fmt)) if ('0' <= *fmt && *fmt <= '9')
field_width = skip_atoi(&fmt); field_width = skip_atoi(&fmt);
else if (*fmt == '*') { else if (*fmt == '*') {
++fmt; ++fmt;
...@@ -493,7 +351,7 @@ int vsprintf(char *buf, const char *fmt, va_list args) ...@@ -493,7 +351,7 @@ int vsprintf(char *buf, const char *fmt, va_list args)
precision = -1; precision = -1;
if (*fmt == '.') { if (*fmt == '.') {
++fmt; ++fmt;
if (isdigit(*fmt)) if ('0' <= *fmt && *fmt <= '9')
precision = skip_atoi(&fmt); precision = skip_atoi(&fmt);
else if (*fmt == '*') { else if (*fmt == '*') {
++fmt; ++fmt;
...@@ -628,7 +486,7 @@ int sprintf(char * buf, const char *fmt, ...) ...@@ -628,7 +486,7 @@ int sprintf(char * buf, const char *fmt, ...)
static char sprint_buf[1024]; static char sprint_buf[1024];
int int
printf(char *fmt, ...) printf(const char *fmt, ...)
{ {
va_list args; va_list args;
int n; int n;
......
arch/ppc64/boot/prom.h 0 → 100644
浏览文件 @ ed735ccb
#ifndef _PPC_BOOT_PROM_H_
#define _PPC_BOOT_PROM_H_
extern int (*prom) (void *);
extern void *chosen_handle;
extern void *stdin;
extern void *stdout;
extern void *stderr;
extern int write(void *handle, void *ptr, int nb);
extern int read(void *handle, void *ptr, int nb);
extern void exit(void);
extern void pause(void);
extern void *finddevice(const char *);
extern void *claim(unsigned long virt, unsigned long size, unsigned long align);
extern int getprop(void *phandle, const char *name, void *buf, int buflen);
#endif /* _PPC_BOOT_PROM_H_ */
arch/ppc64/boot/stdio.h 0 → 100644
浏览文件 @ ed735ccb
#ifndef _PPC_BOOT_STDIO_H_
#define _PPC_BOOT_STDIO_H_
extern int printf(const char *fmt, ...);
extern int sprintf(char *buf, const char *fmt, ...);
extern int vsprintf(char *buf, const char *fmt, va_list args);
extern int putc(int c, void *f);
extern int putchar(int c);
extern int getchar(void);
extern int fputs(char *str, void *f);
#endif /* _PPC_BOOT_STDIO_H_ */
arch/ppc64/boot/string.S
浏览文件 @ ed735ccb
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* NOTE: this code runs in 32 bit mode and is packaged as ELF32. * NOTE: this code runs in 32 bit mode and is packaged as ELF32.
*/ */
#include <asm/ppc_asm.h> #include "ppc_asm.h"
.text .text
.globl strcpy .globl strcpy
......
arch/ppc64/boot/string.h 0 → 100644
浏览文件 @ ed735ccb
#ifndef _PPC_BOOT_STRING_H_
#define _PPC_BOOT_STRING_H_
extern char *strcpy(char *dest, const char *src);
extern char *strncpy(char *dest, const char *src, size_t n);
extern char *strcat(char *dest, const char *src);
extern int strcmp(const char *s1, const char *s2);
extern size_t strlen(const char *s);
extern size_t strnlen(const char *s, size_t count);
extern void *memset(void *s, int c, size_t n);
extern void *memmove(void *dest, const void *src, unsigned long n);
extern void *memcpy(void *dest, const void *src, unsigned long n);
extern int memcmp(const void *s1, const void *s2, size_t n);
#endif /* _PPC_BOOT_STRING_H_ */
arch/ppc64/boot/zlib.c
浏览文件 @ ed735ccb
...@@ -107,7 +107,7 @@ extern void *memcpy(void *, const void *, unsigned long); ...@@ -107,7 +107,7 @@ extern void *memcpy(void *, const void *, unsigned long);
/* Diagnostic functions */ /* Diagnostic functions */
#ifdef DEBUG_ZLIB #ifdef DEBUG_ZLIB
# include <stdio.h> # include "stdio.h"
# ifndef verbose # ifndef verbose
# define verbose 0 # define verbose 0
# endif # endif
......
arch/ppc64/configs/g5_defconfig
浏览文件 @ ed735ccb
...@@ -103,10 +103,10 @@ CONFIG_PREEMPT_NONE=y ...@@ -103,10 +103,10 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_BKL is not set # CONFIG_PREEMPT_BKL is not set
CONFIG_HZ_100=y # CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set # CONFIG_HZ_1000 is not set
CONFIG_HZ=100 CONFIG_HZ=250
CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS=y
CONFIG_SECCOMP=y CONFIG_SECCOMP=y
CONFIG_ISA_DMA_API=y CONFIG_ISA_DMA_API=y
......
arch/ppc64/configs/iSeries_defconfig
浏览文件 @ ed735ccb
...@@ -94,12 +94,11 @@ CONFIG_PREEMPT_NONE=y ...@@ -94,12 +94,11 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_BKL is not set # CONFIG_PREEMPT_BKL is not set
CONFIG_HZ_100=y # CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set # CONFIG_HZ_1000 is not set
CONFIG_HZ=100 CONFIG_HZ=250
CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS=y
CONFIG_MSCHUNKS=y
CONFIG_LPARCFG=y CONFIG_LPARCFG=y
CONFIG_SECCOMP=y CONFIG_SECCOMP=y
CONFIG_ISA_DMA_API=y CONFIG_ISA_DMA_API=y
......
arch/ppc64/configs/maple_defconfig
浏览文件 @ ed735ccb
...@@ -103,10 +103,10 @@ CONFIG_PREEMPT_NONE=y ...@@ -103,10 +103,10 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_BKL is not set # CONFIG_PREEMPT_BKL is not set
CONFIG_HZ_100=y # CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set # CONFIG_HZ_1000 is not set
CONFIG_HZ=100 CONFIG_HZ=250
CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS=y
CONFIG_SECCOMP=y CONFIG_SECCOMP=y
CONFIG_ISA_DMA_API=y CONFIG_ISA_DMA_API=y
......
arch/ppc64/configs/pSeries_defconfig
浏览文件 @ ed735ccb
...@@ -112,10 +112,10 @@ CONFIG_PREEMPT_NONE=y ...@@ -112,10 +112,10 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_BKL is not set # CONFIG_PREEMPT_BKL is not set
CONFIG_HZ_100=y # CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set # CONFIG_HZ_1000 is not set
CONFIG_HZ=100 CONFIG_HZ=250
CONFIG_EEH=y CONFIG_EEH=y
CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS=y
CONFIG_PPC_RTAS=y CONFIG_PPC_RTAS=y
......
arch/ppc64/defconfig
浏览文件 @ ed735ccb
...@@ -114,10 +114,10 @@ CONFIG_PREEMPT_NONE=y ...@@ -114,10 +114,10 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_BKL is not set # CONFIG_PREEMPT_BKL is not set
CONFIG_HZ_100=y # CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set # CONFIG_HZ_1000 is not set
CONFIG_HZ=100 CONFIG_HZ=250
CONFIG_EEH=y CONFIG_EEH=y
CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS=y
CONFIG_PPC_RTAS=y CONFIG_PPC_RTAS=y
......
arch/ppc64/kernel/LparData.c
浏览文件 @ ed735ccb
...@@ -51,6 +51,17 @@ struct HvReleaseData hvReleaseData = { ...@@ -51,6 +51,17 @@ struct HvReleaseData hvReleaseData = {
0xf4, 0x4b, 0xf6, 0xf4 }, 0xf4, 0x4b, 0xf6, 0xf4 },
}; };
/*
* The NACA. The first dword of the naca is required by the iSeries
* hypervisor to point to itVpdAreas. The hypervisor finds the NACA
* through the pointer in hvReleaseData.
*/
struct naca_struct naca = {
.xItVpdAreas = &itVpdAreas,
.xRamDisk = 0,
.xRamDiskSize = 0,
};
extern void system_reset_iSeries(void); extern void system_reset_iSeries(void);
extern void machine_check_iSeries(void); extern void machine_check_iSeries(void);
extern void data_access_iSeries(void); extern void data_access_iSeries(void);
...@@ -214,29 +225,3 @@ struct ItVpdAreas itVpdAreas = { ...@@ -214,29 +225,3 @@ struct ItVpdAreas itVpdAreas = {
0,0 0,0
} }
}; };
struct msChunks msChunks;
EXPORT_SYMBOL(msChunks);
/* Depending on whether this is called from iSeries or pSeries setup
* code, the location of the msChunks struct may or may not have
* to be reloc'd, so we force the caller to do that for us by passing
* in a pointer to the structure.
*/
unsigned long
msChunks_alloc(unsigned long mem, unsigned long num_chunks, unsigned long chunk_size)
{
unsigned long offset = reloc_offset();
struct msChunks *_msChunks = PTRRELOC(&msChunks);
_msChunks->num_chunks = num_chunks;
_msChunks->chunk_size = chunk_size;
_msChunks->chunk_shift = __ilog2(chunk_size);
_msChunks->chunk_mask = (1UL<<_msChunks->chunk_shift)-1;
mem = _ALIGN(mem, sizeof(msChunks_entry));
_msChunks->abs = (msChunks_entry *)(mem + offset);
mem += num_chunks * sizeof(msChunks_entry);
return mem;
}
arch/ppc64/kernel/Makefile
浏览文件 @ ed735ccb
...@@ -11,7 +11,7 @@ obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \ ...@@ -11,7 +11,7 @@ obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \
udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \ udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
ptrace32.o signal32.o rtc.o init_task.o \ ptrace32.o signal32.o rtc.o init_task.o \
lmb.o cputable.o cpu_setup_power4.o idle_power4.o \ lmb.o cputable.o cpu_setup_power4.o idle_power4.o \
iommu.o sysfs.o vdso.o pmc.o iommu.o sysfs.o vdso.o pmc.o firmware.o
obj-y += vdso32/ vdso64/ obj-y += vdso32/ vdso64/
obj-$(CONFIG_PPC_OF) += of_device.o obj-$(CONFIG_PPC_OF) += of_device.o
...@@ -50,7 +50,10 @@ obj-$(CONFIG_LPARCFG) += lparcfg.o ...@@ -50,7 +50,10 @@ obj-$(CONFIG_LPARCFG) += lparcfg.o
obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
obj-$(CONFIG_BOOTX_TEXT) += btext.o obj-$(CONFIG_BOOTX_TEXT) += btext.o
obj-$(CONFIG_HVCS) += hvcserver.o obj-$(CONFIG_HVCS) += hvcserver.o
obj-$(CONFIG_IBMVIO) += vio.o
vio-obj-$(CONFIG_PPC_PSERIES) += pSeries_vio.o
vio-obj-$(CONFIG_PPC_ISERIES) += iSeries_vio.o
obj-$(CONFIG_IBMVIO) += vio.o $(vio-obj-y)
obj-$(CONFIG_XICS) += xics.o obj-$(CONFIG_XICS) += xics.o
obj-$(CONFIG_MPIC) += mpic.o obj-$(CONFIG_MPIC) += mpic.o
......
arch/ppc64/kernel/asm-offsets.c
浏览文件 @ ed735ccb
...@@ -94,7 +94,8 @@ int main(void) ...@@ -94,7 +94,8 @@ int main(void)
DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr)); DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id)); DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id));
#ifdef CONFIG_HUGETLB_PAGE #ifdef CONFIG_HUGETLB_PAGE
DEFINE(PACAHTLBSEGS, offsetof(struct paca_struct, context.htlb_segs)); DEFINE(PACALOWHTLBAREAS, offsetof(struct paca_struct, context.low_htlb_areas));
DEFINE(PACAHIGHHTLBAREAS, offsetof(struct paca_struct, context.high_htlb_areas));
#endif /* CONFIG_HUGETLB_PAGE */ #endif /* CONFIG_HUGETLB_PAGE */
DEFINE(PACADEFAULTDECR, offsetof(struct paca_struct, default_decr)); DEFINE(PACADEFAULTDECR, offsetof(struct paca_struct, default_decr));
DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen)); DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));
......
arch/ppc64/kernel/cputable.c
浏览文件 @ ed735ccb
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Modifications for ppc64: * Modifications for ppc64:
* Copyright (C) 2003 Dave Engebretsen <engebret@us.ibm.com> * Copyright (C) 2003 Dave Engebretsen <engebret@us.ibm.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
...@@ -60,7 +60,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -60,7 +60,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power3, .cpu_setup = __setup_cpu_power3,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* Power3+ */ { /* Power3+ */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -73,7 +72,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -73,7 +72,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power3, .cpu_setup = __setup_cpu_power3,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* Northstar */ { /* Northstar */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -86,7 +84,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -86,7 +84,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power3, .cpu_setup = __setup_cpu_power3,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* Pulsar */ { /* Pulsar */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -99,7 +96,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -99,7 +96,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power3, .cpu_setup = __setup_cpu_power3,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* I-star */ { /* I-star */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -112,7 +108,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -112,7 +108,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power3, .cpu_setup = __setup_cpu_power3,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* S-star */ { /* S-star */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -125,7 +120,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -125,7 +120,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power3, .cpu_setup = __setup_cpu_power3,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* Power4 */ { /* Power4 */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -138,7 +132,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -138,7 +132,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power4, .cpu_setup = __setup_cpu_power4,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* Power4+ */ { /* Power4+ */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -151,7 +144,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -151,7 +144,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power4, .cpu_setup = __setup_cpu_power4,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* PPC970 */ { /* PPC970 */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -166,7 +158,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -166,7 +158,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_ppc970, .cpu_setup = __setup_cpu_ppc970,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* PPC970FX */ { /* PPC970FX */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -181,7 +172,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -181,7 +172,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_ppc970, .cpu_setup = __setup_cpu_ppc970,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* PPC970MP */ { /* PPC970MP */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -196,7 +186,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -196,7 +186,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_ppc970, .cpu_setup = __setup_cpu_ppc970,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* Power5 */ { /* Power5 */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -211,7 +200,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -211,7 +200,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power4, .cpu_setup = __setup_cpu_power4,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* Power5 */ { /* Power5 */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -226,7 +214,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -226,7 +214,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power4, .cpu_setup = __setup_cpu_power4,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* BE DD1.x */ { /* BE DD1.x */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
...@@ -241,7 +228,6 @@ struct cpu_spec cpu_specs[] = { ...@@ -241,7 +228,6 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_be, .cpu_setup = __setup_cpu_be,
.firmware_features = COMMON_PPC64_FW,
}, },
{ /* default match */ { /* default match */
.pvr_mask = 0x00000000, .pvr_mask = 0x00000000,
...@@ -254,29 +240,5 @@ struct cpu_spec cpu_specs[] = { ...@@ -254,29 +240,5 @@ struct cpu_spec cpu_specs[] = {
.icache_bsize = 128, .icache_bsize = 128,
.dcache_bsize = 128, .dcache_bsize = 128,
.cpu_setup = __setup_cpu_power4, .cpu_setup = __setup_cpu_power4,
.firmware_features = COMMON_PPC64_FW,
} }
}; };
firmware_feature_t firmware_features_table[FIRMWARE_MAX_FEATURES] = {
{FW_FEATURE_PFT, "hcall-pft"},
{FW_FEATURE_TCE, "hcall-tce"},
{FW_FEATURE_SPRG0, "hcall-sprg0"},
{FW_FEATURE_DABR, "hcall-dabr"},
{FW_FEATURE_COPY, "hcall-copy"},
{FW_FEATURE_ASR, "hcall-asr"},
{FW_FEATURE_DEBUG, "hcall-debug"},
{FW_FEATURE_PERF, "hcall-perf"},
{FW_FEATURE_DUMP, "hcall-dump"},
{FW_FEATURE_INTERRUPT, "hcall-interrupt"},
{FW_FEATURE_MIGRATE, "hcall-migrate"},
{FW_FEATURE_PERFMON, "hcall-perfmon"},
{FW_FEATURE_CRQ, "hcall-crq"},
{FW_FEATURE_VIO, "hcall-vio"},
{FW_FEATURE_RDMA, "hcall-rdma"},
{FW_FEATURE_LLAN, "hcall-lLAN"},
{FW_FEATURE_BULK, "hcall-bulk"},
{FW_FEATURE_XDABR, "hcall-xdabr"},
{FW_FEATURE_MULTITCE, "hcall-multi-tce"},
{FW_FEATURE_SPLPAR, "hcall-splpar"},
};
arch/ppc64/kernel/firmware.c 0 → 100644
浏览文件 @ ed735ccb
/*
* arch/ppc64/kernel/firmware.c
*
* Extracted from cputable.c
*
* Copyright (C) 2001 Ben. Herrenschmidt (benh@kernel.crashing.org)
*
* Modifications for ppc64:
* Copyright (C) 2003 Dave Engebretsen <engebret@us.ibm.com>
* Copyright (C) 2005 Stephen Rothwell, IBM Corporation
*
* 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.
*/
#include <linux/config.h>
#include <asm/firmware.h>
unsigned long ppc64_firmware_features;
#ifdef CONFIG_PPC_PSERIES
firmware_feature_t firmware_features_table[FIRMWARE_MAX_FEATURES] = {
{FW_FEATURE_PFT, "hcall-pft"},
{FW_FEATURE_TCE, "hcall-tce"},
{FW_FEATURE_SPRG0, "hcall-sprg0"},
{FW_FEATURE_DABR, "hcall-dabr"},
{FW_FEATURE_COPY, "hcall-copy"},
{FW_FEATURE_ASR, "hcall-asr"},
{FW_FEATURE_DEBUG, "hcall-debug"},
{FW_FEATURE_PERF, "hcall-perf"},
{FW_FEATURE_DUMP, "hcall-dump"},
{FW_FEATURE_INTERRUPT, "hcall-interrupt"},
{FW_FEATURE_MIGRATE, "hcall-migrate"},
{FW_FEATURE_PERFMON, "hcall-perfmon"},
{FW_FEATURE_CRQ, "hcall-crq"},
{FW_FEATURE_VIO, "hcall-vio"},
{FW_FEATURE_RDMA, "hcall-rdma"},
{FW_FEATURE_LLAN, "hcall-lLAN"},
{FW_FEATURE_BULK, "hcall-bulk"},
{FW_FEATURE_XDABR, "hcall-xdabr"},
{FW_FEATURE_MULTITCE, "hcall-multi-tce"},
{FW_FEATURE_SPLPAR, "hcall-splpar"},
};
#endif
arch/ppc64/kernel/head.S
浏览文件 @ ed735ccb
...@@ -23,14 +23,11 @@ ...@@ -23,14 +23,11 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#define SECONDARY_PROCESSORS
#include <linux/config.h> #include <linux/config.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/naca.h>
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/offsets.h> #include <asm/offsets.h>
...@@ -44,19 +41,14 @@ ...@@ -44,19 +41,14 @@
#define DO_SOFT_DISABLE #define DO_SOFT_DISABLE
#endif #endif
/*
* hcall interface to pSeries LPAR
*/
#define H_SET_ASR 0x30
/* /*
* We layout physical memory as follows: * We layout physical memory as follows:
* 0x0000 - 0x00ff : Secondary processor spin code * 0x0000 - 0x00ff : Secondary processor spin code
* 0x0100 - 0x2fff : pSeries Interrupt prologs * 0x0100 - 0x2fff : pSeries Interrupt prologs
* 0x3000 - 0x3fff : Interrupt support * 0x3000 - 0x5fff : interrupt support, iSeries and common interrupt prologs
* 0x4000 - 0x4fff : NACA * 0x6000 - 0x6fff : Initial (CPU0) segment table
* 0x6000 : iSeries and common interrupt prologs * 0x7000 - 0x7fff : FWNMI data area
* 0x9000 - 0x9fff : Initial segment table * 0x8000 - : Early init and support code
*/ */
/* /*
...@@ -94,6 +86,7 @@ END_FTR_SECTION(0, 1) ...@@ -94,6 +86,7 @@ END_FTR_SECTION(0, 1)
/* Catch branch to 0 in real mode */ /* Catch branch to 0 in real mode */
trap trap
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
/* /*
* At offset 0x20, there is a pointer to iSeries LPAR data. * At offset 0x20, there is a pointer to iSeries LPAR data.
...@@ -103,12 +96,12 @@ END_FTR_SECTION(0, 1) ...@@ -103,12 +96,12 @@ END_FTR_SECTION(0, 1)
.llong hvReleaseData-KERNELBASE .llong hvReleaseData-KERNELBASE
/* /*
* At offset 0x28 and 0x30 are offsets to the msChunks * At offset 0x28 and 0x30 are offsets to the mschunks_map
* array (used by the iSeries LPAR debugger to do translation * array (used by the iSeries LPAR debugger to do translation
* between physical addresses and absolute addresses) and * between physical addresses and absolute addresses) and
* to the pidhash table (also used by the debugger) * to the pidhash table (also used by the debugger)
*/ */
.llong msChunks-KERNELBASE .llong mschunks_map-KERNELBASE
.llong 0 /* pidhash-KERNELBASE SFRXXX */ .llong 0 /* pidhash-KERNELBASE SFRXXX */
/* Offset 0x38 - Pointer to start of embedded System.map */ /* Offset 0x38 - Pointer to start of embedded System.map */
...@@ -120,7 +113,7 @@ embedded_sysmap_start: ...@@ -120,7 +113,7 @@ embedded_sysmap_start:
embedded_sysmap_end: embedded_sysmap_end:
.llong 0 .llong 0
#else /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
/* Secondary processors spin on this value until it goes to 1. */ /* Secondary processors spin on this value until it goes to 1. */
.globl __secondary_hold_spinloop .globl __secondary_hold_spinloop
...@@ -155,7 +148,7 @@ _GLOBAL(__secondary_hold) ...@@ -155,7 +148,7 @@ _GLOBAL(__secondary_hold)
std r24,__secondary_hold_acknowledge@l(0) std r24,__secondary_hold_acknowledge@l(0)
sync sync
/* All secondary cpu's wait here until told to start. */ /* All secondary cpus wait here until told to start. */
100: ld r4,__secondary_hold_spinloop@l(0) 100: ld r4,__secondary_hold_spinloop@l(0)
cmpdi 0,r4,1 cmpdi 0,r4,1
bne 100b bne 100b
...@@ -170,7 +163,6 @@ _GLOBAL(__secondary_hold) ...@@ -170,7 +163,6 @@ _GLOBAL(__secondary_hold)
BUG_OPCODE BUG_OPCODE
#endif #endif
#endif #endif
#endif
/* This value is used to mark exception frames on the stack. */ /* This value is used to mark exception frames on the stack. */
.section ".toc","aw" .section ".toc","aw"
...@@ -502,33 +494,37 @@ system_call_pSeries: ...@@ -502,33 +494,37 @@ system_call_pSeries:
STD_EXCEPTION_PSERIES(0x1300, instruction_breakpoint) STD_EXCEPTION_PSERIES(0x1300, instruction_breakpoint)
STD_EXCEPTION_PSERIES(0x1700, altivec_assist) STD_EXCEPTION_PSERIES(0x1700, altivec_assist)
. = 0x3000
/*** pSeries interrupt support ***/
/* moved from 0xf00 */ /* moved from 0xf00 */
STD_EXCEPTION_PSERIES(0x3000, performance_monitor) STD_EXCEPTION_PSERIES(., performance_monitor)
. = 0x3100 .align 7
_GLOBAL(do_stab_bolted_pSeries) _GLOBAL(do_stab_bolted_pSeries)
mtcrf 0x80,r12 mtcrf 0x80,r12
mfspr r12,SPRG2 mfspr r12,SPRG2
EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted) EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted)
/*
/* Space for the naca. Architected to be located at real address * Vectors for the FWNMI option. Share common code.
* NACA_PHYS_ADDR. Various tools rely on this location being fixed. */
* The first dword of the naca is required by iSeries LPAR to .globl system_reset_fwnmi
* point to itVpdAreas. On pSeries native, this value is not used. system_reset_fwnmi:
*/ HMT_MEDIUM
. = NACA_PHYS_ADDR mtspr SPRG1,r13 /* save r13 */
.globl __end_interrupts RUNLATCH_ON(r13)
__end_interrupts: EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)
#ifdef CONFIG_PPC_ISERIES
.globl naca
naca:
.llong itVpdAreas
.llong 0 /* xRamDisk */
.llong 0 /* xRamDiskSize */
. = 0x6100 .globl machine_check_fwnmi
machine_check_fwnmi:
HMT_MEDIUM
mtspr SPRG1,r13 /* save r13 */
RUNLATCH_ON(r13)
EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
#ifdef CONFIG_PPC_ISERIES
/*** ISeries-LPAR interrupt handlers ***/ /*** ISeries-LPAR interrupt handlers ***/
STD_EXCEPTION_ISERIES(0x200, machine_check, PACA_EXMC) STD_EXCEPTION_ISERIES(0x200, machine_check, PACA_EXMC)
...@@ -626,9 +622,7 @@ system_reset_iSeries: ...@@ -626,9 +622,7 @@ system_reset_iSeries:
cmpwi 0,r23,0 cmpwi 0,r23,0
beq iSeries_secondary_smp_loop /* Loop until told to go */ beq iSeries_secondary_smp_loop /* Loop until told to go */
#ifdef SECONDARY_PROCESSORS
bne .__secondary_start /* Loop until told to go */ bne .__secondary_start /* Loop until told to go */
#endif
iSeries_secondary_smp_loop: iSeries_secondary_smp_loop:
/* Let the Hypervisor know we are alive */ /* Let the Hypervisor know we are alive */
/* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */ /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
...@@ -671,51 +665,8 @@ hardware_interrupt_iSeries_masked: ...@@ -671,51 +665,8 @@ hardware_interrupt_iSeries_masked:
ld r13,PACA_EXGEN+EX_R13(r13) ld r13,PACA_EXGEN+EX_R13(r13)
rfid rfid
b . /* prevent speculative execution */ b . /* prevent speculative execution */
#endif
/*
* Data area reserved for FWNMI option.
*/
.= 0x7000
.globl fwnmi_data_area
fwnmi_data_area:
#ifdef CONFIG_PPC_ISERIES
. = LPARMAP_PHYS
#include "lparmap.s"
#endif /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
/*
* Vectors for the FWNMI option. Share common code.
*/
. = 0x8000
.globl system_reset_fwnmi
system_reset_fwnmi:
HMT_MEDIUM
mtspr SPRG1,r13 /* save r13 */
RUNLATCH_ON(r13)
EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)
.globl machine_check_fwnmi
machine_check_fwnmi:
HMT_MEDIUM
mtspr SPRG1,r13 /* save r13 */
RUNLATCH_ON(r13)
EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
/*
* Space for the initial segment table
* For LPAR, the hypervisor must fill in at least one entry
* before we get control (with relocate on)
*/
. = STAB0_PHYS_ADDR
.globl __start_stab
__start_stab:
. = (STAB0_PHYS_ADDR + PAGE_SIZE)
.globl __end_stab
__end_stab:
/*** Common interrupt handlers ***/ /*** Common interrupt handlers ***/
STD_EXCEPTION_COMMON(0x100, system_reset, .system_reset_exception) STD_EXCEPTION_COMMON(0x100, system_reset, .system_reset_exception)
...@@ -752,8 +703,8 @@ machine_check_common: ...@@ -752,8 +703,8 @@ machine_check_common:
* R9 contains the saved CR, r13 points to the paca, * R9 contains the saved CR, r13 points to the paca,
* r10 contains the (bad) kernel stack pointer, * r10 contains the (bad) kernel stack pointer,
* r11 and r12 contain the saved SRR0 and SRR1. * r11 and r12 contain the saved SRR0 and SRR1.
* We switch to using the paca guard page as an emergency stack, * We switch to using an emergency stack, save the registers there,
* save the registers there, and call kernel_bad_stack(), which panics. * and call kernel_bad_stack(), which panics.
*/ */
bad_stack: bad_stack:
ld r1,PACAEMERGSP(r13) ld r1,PACAEMERGSP(r13)
...@@ -906,6 +857,62 @@ fp_unavailable_common: ...@@ -906,6 +857,62 @@ fp_unavailable_common:
bl .kernel_fp_unavailable_exception bl .kernel_fp_unavailable_exception
BUG_OPCODE BUG_OPCODE
/*
* load_up_fpu(unused, unused, tsk)
* Disable FP for the task which had the FPU previously,
* and save its floating-point registers in its thread_struct.
* Enables the FPU for use in the kernel on return.
* On SMP we know the fpu is free, since we give it up every
* switch (ie, no lazy save of the FP registers).
* On entry: r13 == 'current' && last_task_used_math != 'current'
*/
_STATIC(load_up_fpu)
mfmsr r5 /* grab the current MSR */
ori r5,r5,MSR_FP
mtmsrd r5 /* enable use of fpu now */
isync
/*
* For SMP, we don't do lazy FPU switching because it just gets too
* horrendously complex, especially when a task switches from one CPU
* to another. Instead we call giveup_fpu in switch_to.
*
*/
#ifndef CONFIG_SMP
ld r3,last_task_used_math@got(r2)
ld r4,0(r3)
cmpdi 0,r4,0
beq 1f
/* Save FP state to last_task_used_math's THREAD struct */
addi r4,r4,THREAD
SAVE_32FPRS(0, r4)
mffs fr0
stfd fr0,THREAD_FPSCR(r4)
/* Disable FP for last_task_used_math */
ld r5,PT_REGS(r4)
ld r4,_MSR-STACK_FRAME_OVERHEAD(r5)
li r6,MSR_FP|MSR_FE0|MSR_FE1
andc r4,r4,r6
std r4,_MSR-STACK_FRAME_OVERHEAD(r5)
1:
#endif /* CONFIG_SMP */
/* enable use of FP after return */
ld r4,PACACURRENT(r13)
addi r5,r4,THREAD /* Get THREAD */
ld r4,THREAD_FPEXC_MODE(r5)
ori r12,r12,MSR_FP
or r12,r12,r4
std r12,_MSR(r1)
lfd fr0,THREAD_FPSCR(r5)
mtfsf 0xff,fr0
REST_32FPRS(0, r5)
#ifndef CONFIG_SMP
/* Update last_task_used_math to 'current' */
subi r4,r5,THREAD /* Back to 'current' */
std r4,0(r3)
#endif /* CONFIG_SMP */
/* restore registers and return */
b fast_exception_return
.align 7 .align 7
.globl altivec_unavailable_common .globl altivec_unavailable_common
altivec_unavailable_common: altivec_unavailable_common:
...@@ -921,6 +928,80 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) ...@@ -921,6 +928,80 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
bl .altivec_unavailable_exception bl .altivec_unavailable_exception
b .ret_from_except b .ret_from_except
#ifdef CONFIG_ALTIVEC
/*
* load_up_altivec(unused, unused, tsk)
* Disable VMX for the task which had it previously,
* and save its vector registers in its thread_struct.
* Enables the VMX for use in the kernel on return.
* On SMP we know the VMX is free, since we give it up every
* switch (ie, no lazy save of the vector registers).
* On entry: r13 == 'current' && last_task_used_altivec != 'current'
*/
_STATIC(load_up_altivec)
mfmsr r5 /* grab the current MSR */
oris r5,r5,MSR_VEC@h
mtmsrd r5 /* enable use of VMX now */
isync
/*
* For SMP, we don't do lazy VMX switching because it just gets too
* horrendously complex, especially when a task switches from one CPU
* to another. Instead we call giveup_altvec in switch_to.
* VRSAVE isn't dealt with here, that is done in the normal context
* switch code. Note that we could rely on vrsave value to eventually
* avoid saving all of the VREGs here...
*/
#ifndef CONFIG_SMP
ld r3,last_task_used_altivec@got(r2)
ld r4,0(r3)
cmpdi 0,r4,0
beq 1f
/* Save VMX state to last_task_used_altivec's THREAD struct */
addi r4,r4,THREAD
SAVE_32VRS(0,r5,r4)
mfvscr vr0
li r10,THREAD_VSCR
stvx vr0,r10,r4
/* Disable VMX for last_task_used_altivec */
ld r5,PT_REGS(r4)
ld r4,_MSR-STACK_FRAME_OVERHEAD(r5)
lis r6,MSR_VEC@h
andc r4,r4,r6
std r4,_MSR-STACK_FRAME_OVERHEAD(r5)
1:
#endif /* CONFIG_SMP */
/* Hack: if we get an altivec unavailable trap with VRSAVE
* set to all zeros, we assume this is a broken application
* that fails to set it properly, and thus we switch it to
* all 1's
*/
mfspr r4,SPRN_VRSAVE
cmpdi 0,r4,0
bne+ 1f
li r4,-1
mtspr SPRN_VRSAVE,r4
1:
/* enable use of VMX after return */
ld r4,PACACURRENT(r13)
addi r5,r4,THREAD /* Get THREAD */
oris r12,r12,MSR_VEC@h
std r12,_MSR(r1)
li r4,1
li r10,THREAD_VSCR
stw r4,THREAD_USED_VR(r5)
lvx vr0,r10,r5
mtvscr vr0
REST_32VRS(0,r4,r5)
#ifndef CONFIG_SMP
/* Update last_task_used_math to 'current' */
subi r4,r5,THREAD /* Back to 'current' */
std r4,0(r3)
#endif /* CONFIG_SMP */
/* restore registers and return */
b fast_exception_return
#endif /* CONFIG_ALTIVEC */
/* /*
* Hash table stuff * Hash table stuff
*/ */
...@@ -1167,6 +1248,42 @@ unrecov_slb: ...@@ -1167,6 +1248,42 @@ unrecov_slb:
bl .unrecoverable_exception bl .unrecoverable_exception
b 1b b 1b
/*
* Space for CPU0's segment table.
*
* On iSeries, the hypervisor must fill in at least one entry before
* we get control (with relocate on). The address is give to the hv
* as a page number (see xLparMap in LparData.c), so this must be at a
* fixed address (the linker can't compute (u64)&initial_stab >>
* PAGE_SHIFT).
*/
. = STAB0_PHYS_ADDR /* 0x6000 */
.globl initial_stab
initial_stab:
.space 4096
/*
* Data area reserved for FWNMI option.
* This address (0x7000) is fixed by the RPA.
*/
.= 0x7000
.globl fwnmi_data_area
fwnmi_data_area:
/* iSeries does not use the FWNMI stuff, so it is safe to put
* this here, even if we later allow kernels that will boot on
* both pSeries and iSeries */
#ifdef CONFIG_PPC_ISERIES
. = LPARMAP_PHYS
#include "lparmap.s"
/*
* This ".text" is here for old compilers that generate a trailing
* .note section when compiling .c files to .s
*/
.text
#endif /* CONFIG_PPC_ISERIES */
. = 0x8000
/* /*
* On pSeries, secondary processors spin in the following code. * On pSeries, secondary processors spin in the following code.
...@@ -1200,7 +1317,7 @@ _GLOBAL(pSeries_secondary_smp_init) ...@@ -1200,7 +1317,7 @@ _GLOBAL(pSeries_secondary_smp_init)
b .kexec_wait /* next kernel might do better */ b .kexec_wait /* next kernel might do better */
2: mtspr SPRG3,r13 /* Save vaddr of paca in SPRG3 */ 2: mtspr SPRG3,r13 /* Save vaddr of paca in SPRG3 */
/* From now on, r24 is expected to be logica cpuid */ /* From now on, r24 is expected to be logical cpuid */
mr r24,r5 mr r24,r5
3: HMT_LOW 3: HMT_LOW
lbz r23,PACAPROCSTART(r13) /* Test if this processor should */ lbz r23,PACAPROCSTART(r13) /* Test if this processor should */
...@@ -1213,9 +1330,7 @@ _GLOBAL(pSeries_secondary_smp_init) ...@@ -1213,9 +1330,7 @@ _GLOBAL(pSeries_secondary_smp_init)
cmpwi 0,r23,0 cmpwi 0,r23,0
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#ifdef SECONDARY_PROCESSORS
bne .__secondary_start bne .__secondary_start
#endif
#endif #endif
b 3b /* Loop until told to go */ b 3b /* Loop until told to go */
...@@ -1430,228 +1545,6 @@ _GLOBAL(copy_and_flush) ...@@ -1430,228 +1545,6 @@ _GLOBAL(copy_and_flush)
.align 8 .align 8
copy_to_here: copy_to_here:
/*
* load_up_fpu(unused, unused, tsk)
* Disable FP for the task which had the FPU previously,
* and save its floating-point registers in its thread_struct.
* Enables the FPU for use in the kernel on return.
* On SMP we know the fpu is free, since we give it up every
* switch (ie, no lazy save of the FP registers).
* On entry: r13 == 'current' && last_task_used_math != 'current'
*/
_STATIC(load_up_fpu)
mfmsr r5 /* grab the current MSR */
ori r5,r5,MSR_FP
mtmsrd r5 /* enable use of fpu now */
isync
/*
* For SMP, we don't do lazy FPU switching because it just gets too
* horrendously complex, especially when a task switches from one CPU
* to another. Instead we call giveup_fpu in switch_to.
*
*/
#ifndef CONFIG_SMP
ld r3,last_task_used_math@got(r2)
ld r4,0(r3)
cmpdi 0,r4,0
beq 1f
/* Save FP state to last_task_used_math's THREAD struct */
addi r4,r4,THREAD
SAVE_32FPRS(0, r4)
mffs fr0
stfd fr0,THREAD_FPSCR(r4)
/* Disable FP for last_task_used_math */
ld r5,PT_REGS(r4)
ld r4,_MSR-STACK_FRAME_OVERHEAD(r5)
li r6,MSR_FP|MSR_FE0|MSR_FE1
andc r4,r4,r6
std r4,_MSR-STACK_FRAME_OVERHEAD(r5)
1:
#endif /* CONFIG_SMP */
/* enable use of FP after return */
ld r4,PACACURRENT(r13)
addi r5,r4,THREAD /* Get THREAD */
ld r4,THREAD_FPEXC_MODE(r5)
ori r12,r12,MSR_FP
or r12,r12,r4
std r12,_MSR(r1)
lfd fr0,THREAD_FPSCR(r5)
mtfsf 0xff,fr0
REST_32FPRS(0, r5)
#ifndef CONFIG_SMP
/* Update last_task_used_math to 'current' */
subi r4,r5,THREAD /* Back to 'current' */
std r4,0(r3)
#endif /* CONFIG_SMP */
/* restore registers and return */
b fast_exception_return
/*
* disable_kernel_fp()
* Disable the FPU.
*/
_GLOBAL(disable_kernel_fp)
mfmsr r3
rldicl r0,r3,(63-MSR_FP_LG),1
rldicl r3,r0,(MSR_FP_LG+1),0
mtmsrd r3 /* disable use of fpu now */
isync
blr
/*
* giveup_fpu(tsk)
* Disable FP for the task given as the argument,
* and save the floating-point registers in its thread_struct.
* Enables the FPU for use in the kernel on return.
*/
_GLOBAL(giveup_fpu)
mfmsr r5
ori r5,r5,MSR_FP
mtmsrd r5 /* enable use of fpu now */
isync
cmpdi 0,r3,0
beqlr- /* if no previous owner, done */
addi r3,r3,THREAD /* want THREAD of task */
ld r5,PT_REGS(r3)
cmpdi 0,r5,0
SAVE_32FPRS(0, r3)
mffs fr0
stfd fr0,THREAD_FPSCR(r3)
beq 1f
ld r4,_MSR-STACK_FRAME_OVERHEAD(r5)
li r3,MSR_FP|MSR_FE0|MSR_FE1
andc r4,r4,r3 /* disable FP for previous task */
std r4,_MSR-STACK_FRAME_OVERHEAD(r5)
1:
#ifndef CONFIG_SMP
li r5,0
ld r4,last_task_used_math@got(r2)
std r5,0(r4)
#endif /* CONFIG_SMP */
blr
#ifdef CONFIG_ALTIVEC
/*
* load_up_altivec(unused, unused, tsk)
* Disable VMX for the task which had it previously,
* and save its vector registers in its thread_struct.
* Enables the VMX for use in the kernel on return.
* On SMP we know the VMX is free, since we give it up every
* switch (ie, no lazy save of the vector registers).
* On entry: r13 == 'current' && last_task_used_altivec != 'current'
*/
_STATIC(load_up_altivec)
mfmsr r5 /* grab the current MSR */
oris r5,r5,MSR_VEC@h
mtmsrd r5 /* enable use of VMX now */
isync
/*
* For SMP, we don't do lazy VMX switching because it just gets too
* horrendously complex, especially when a task switches from one CPU
* to another. Instead we call giveup_altvec in switch_to.
* VRSAVE isn't dealt with here, that is done in the normal context
* switch code. Note that we could rely on vrsave value to eventually
* avoid saving all of the VREGs here...
*/
#ifndef CONFIG_SMP
ld r3,last_task_used_altivec@got(r2)
ld r4,0(r3)
cmpdi 0,r4,0
beq 1f
/* Save VMX state to last_task_used_altivec's THREAD struct */
addi r4,r4,THREAD
SAVE_32VRS(0,r5,r4)
mfvscr vr0
li r10,THREAD_VSCR
stvx vr0,r10,r4
/* Disable VMX for last_task_used_altivec */
ld r5,PT_REGS(r4)
ld r4,_MSR-STACK_FRAME_OVERHEAD(r5)
lis r6,MSR_VEC@h
andc r4,r4,r6
std r4,_MSR-STACK_FRAME_OVERHEAD(r5)
1:
#endif /* CONFIG_SMP */
/* Hack: if we get an altivec unavailable trap with VRSAVE
* set to all zeros, we assume this is a broken application
* that fails to set it properly, and thus we switch it to
* all 1's
*/
mfspr r4,SPRN_VRSAVE
cmpdi 0,r4,0
bne+ 1f
li r4,-1
mtspr SPRN_VRSAVE,r4
1:
/* enable use of VMX after return */
ld r4,PACACURRENT(r13)
addi r5,r4,THREAD /* Get THREAD */
oris r12,r12,MSR_VEC@h
std r12,_MSR(r1)
li r4,1
li r10,THREAD_VSCR
stw r4,THREAD_USED_VR(r5)
lvx vr0,r10,r5
mtvscr vr0
REST_32VRS(0,r4,r5)
#ifndef CONFIG_SMP
/* Update last_task_used_math to 'current' */
subi r4,r5,THREAD /* Back to 'current' */
std r4,0(r3)
#endif /* CONFIG_SMP */
/* restore registers and return */
b fast_exception_return
/*
* disable_kernel_altivec()
* Disable the VMX.
*/
_GLOBAL(disable_kernel_altivec)
mfmsr r3
rldicl r0,r3,(63-MSR_VEC_LG),1
rldicl r3,r0,(MSR_VEC_LG+1),0
mtmsrd r3 /* disable use of VMX now */
isync
blr
/*
* giveup_altivec(tsk)
* Disable VMX for the task given as the argument,
* and save the vector registers in its thread_struct.
* Enables the VMX for use in the kernel on return.
*/
_GLOBAL(giveup_altivec)
mfmsr r5
oris r5,r5,MSR_VEC@h
mtmsrd r5 /* enable use of VMX now */
isync
cmpdi 0,r3,0
beqlr- /* if no previous owner, done */
addi r3,r3,THREAD /* want THREAD of task */
ld r5,PT_REGS(r3)
cmpdi 0,r5,0
SAVE_32VRS(0,r4,r3)
mfvscr vr0
li r4,THREAD_VSCR
stvx vr0,r4,r3
beq 1f
ld r4,_MSR-STACK_FRAME_OVERHEAD(r5)
lis r3,MSR_VEC@h
andc r4,r4,r3 /* disable FP for previous task */
std r4,_MSR-STACK_FRAME_OVERHEAD(r5)
1:
#ifndef CONFIG_SMP
li r5,0
ld r4,last_task_used_altivec@got(r2)
std r5,0(r4)
#endif /* CONFIG_SMP */
blr
#endif /* CONFIG_ALTIVEC */
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
/* /*
...@@ -2002,9 +1895,6 @@ _STATIC(start_here_common) ...@@ -2002,9 +1895,6 @@ _STATIC(start_here_common)
bl .start_kernel bl .start_kernel
_GLOBAL(__setup_cpu_power3)
blr
_GLOBAL(hmt_init) _GLOBAL(hmt_init)
#ifdef CONFIG_HMT #ifdef CONFIG_HMT
LOADADDR(r5, hmt_thread_data) LOADADDR(r5, hmt_thread_data)
...@@ -2095,20 +1985,19 @@ _GLOBAL(smp_release_cpus) ...@@ -2095,20 +1985,19 @@ _GLOBAL(smp_release_cpus)
/* /*
* We put a few things here that have to be page-aligned. * We put a few things here that have to be page-aligned.
* This stuff goes at the beginning of the data segment, * This stuff goes at the beginning of the bss, which is page-aligned.
* which is page-aligned.
*/ */
.data .section ".bss"
.align 12 .align 12
.globl sdata
sdata:
.globl empty_zero_page .globl empty_zero_page
empty_zero_page: empty_zero_page:
.space 4096 .space PAGE_SIZE
.globl swapper_pg_dir .globl swapper_pg_dir
swapper_pg_dir: swapper_pg_dir:
.space 4096 .space PAGE_SIZE
/* /*
* This space gets a copy of optional info passed to us by the bootstrap * This space gets a copy of optional info passed to us by the bootstrap
......
arch/ppc64/kernel/iSeries_htab.c
浏览文件 @ ed735ccb
...@@ -41,6 +41,7 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va, ...@@ -41,6 +41,7 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
unsigned long prpn, unsigned long vflags, unsigned long prpn, unsigned long vflags,
unsigned long rflags) unsigned long rflags)
{ {
unsigned long arpn;
long slot; long slot;
hpte_t lhpte; hpte_t lhpte;
int secondary = 0; int secondary = 0;
...@@ -70,8 +71,10 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va, ...@@ -70,8 +71,10 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
slot &= 0x7fffffffffffffff; slot &= 0x7fffffffffffffff;
} }
arpn = phys_to_abs(prpn << PAGE_SHIFT) >> PAGE_SHIFT;
lhpte.v = (va >> 23) << HPTE_V_AVPN_SHIFT | vflags | HPTE_V_VALID; lhpte.v = (va >> 23) << HPTE_V_AVPN_SHIFT | vflags | HPTE_V_VALID;
lhpte.r = (physRpn_to_absRpn(prpn) << HPTE_R_RPN_SHIFT) | rflags; lhpte.r = (arpn << HPTE_R_RPN_SHIFT) | rflags;
/* Now fill in the actual HPTE */ /* Now fill in the actual HPTE */
HvCallHpt_addValidate(slot, secondary, &lhpte); HvCallHpt_addValidate(slot, secondary, &lhpte);
......
arch/ppc64/kernel/iSeries_setup.c
浏览文件 @ ed735ccb
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/firmware.h>
#include <asm/time.h> #include <asm/time.h>
#include "iSeries_setup.h" #include "iSeries_setup.h"
...@@ -314,6 +315,8 @@ static void __init iSeries_init_early(void) ...@@ -314,6 +315,8 @@ static void __init iSeries_init_early(void)
DBG(" -> iSeries_init_early()\n"); DBG(" -> iSeries_init_early()\n");
ppc64_firmware_features = FW_FEATURE_ISERIES;
ppcdbg_initialize(); ppcdbg_initialize();
#if defined(CONFIG_BLK_DEV_INITRD) #if defined(CONFIG_BLK_DEV_INITRD)
...@@ -412,6 +415,22 @@ static void __init iSeries_init_early(void) ...@@ -412,6 +415,22 @@ static void __init iSeries_init_early(void)
DBG(" <- iSeries_init_early()\n"); DBG(" <- iSeries_init_early()\n");
} }
struct mschunks_map mschunks_map = {
/* XXX We don't use these, but Piranha might need them. */
.chunk_size = MSCHUNKS_CHUNK_SIZE,
.chunk_shift = MSCHUNKS_CHUNK_SHIFT,
.chunk_mask = MSCHUNKS_OFFSET_MASK,
};
EXPORT_SYMBOL(mschunks_map);
void mschunks_alloc(unsigned long num_chunks)
{
klimit = _ALIGN(klimit, sizeof(u32));
mschunks_map.mapping = (u32 *)klimit;
klimit += num_chunks * sizeof(u32);
mschunks_map.num_chunks = num_chunks;
}
/* /*
* The iSeries may have very large memories ( > 128 GB ) and a partition * The iSeries may have very large memories ( > 128 GB ) and a partition
* may get memory in "chunks" that may be anywhere in the 2**52 real * may get memory in "chunks" that may be anywhere in the 2**52 real
...@@ -449,7 +468,7 @@ static void __init build_iSeries_Memory_Map(void) ...@@ -449,7 +468,7 @@ static void __init build_iSeries_Memory_Map(void)
/* Chunk size on iSeries is 256K bytes */ /* Chunk size on iSeries is 256K bytes */
totalChunks = (u32)HvLpConfig_getMsChunks(); totalChunks = (u32)HvLpConfig_getMsChunks();
klimit = msChunks_alloc(klimit, totalChunks, 1UL << 18); mschunks_alloc(totalChunks);
/* /*
* Get absolute address of our load area * Get absolute address of our load area
...@@ -486,7 +505,7 @@ static void __init build_iSeries_Memory_Map(void) ...@@ -486,7 +505,7 @@ static void __init build_iSeries_Memory_Map(void)
printk("Load area size %dK\n", loadAreaSize * 256); printk("Load area size %dK\n", loadAreaSize * 256);
for (nextPhysChunk = 0; nextPhysChunk < loadAreaSize; ++nextPhysChunk) for (nextPhysChunk = 0; nextPhysChunk < loadAreaSize; ++nextPhysChunk)
msChunks.abs[nextPhysChunk] = mschunks_map.mapping[nextPhysChunk] =
loadAreaFirstChunk + nextPhysChunk; loadAreaFirstChunk + nextPhysChunk;
/* /*
...@@ -495,7 +514,7 @@ static void __init build_iSeries_Memory_Map(void) ...@@ -495,7 +514,7 @@ static void __init build_iSeries_Memory_Map(void)
*/ */
hptFirstChunk = (u32)addr_to_chunk(HvCallHpt_getHptAddress()); hptFirstChunk = (u32)addr_to_chunk(HvCallHpt_getHptAddress());
hptSizePages = (u32)HvCallHpt_getHptPages(); hptSizePages = (u32)HvCallHpt_getHptPages();
hptSizeChunks = hptSizePages >> (msChunks.chunk_shift - PAGE_SHIFT); hptSizeChunks = hptSizePages >> (MSCHUNKS_CHUNK_SHIFT - PAGE_SHIFT);
hptLastChunk = hptFirstChunk + hptSizeChunks - 1; hptLastChunk = hptFirstChunk + hptSizeChunks - 1;
printk("HPT absolute addr = %016lx, size = %dK\n", printk("HPT absolute addr = %016lx, size = %dK\n",
...@@ -552,7 +571,8 @@ static void __init build_iSeries_Memory_Map(void) ...@@ -552,7 +571,8 @@ static void __init build_iSeries_Memory_Map(void)
(absChunk > hptLastChunk)) && (absChunk > hptLastChunk)) &&
((absChunk < loadAreaFirstChunk) || ((absChunk < loadAreaFirstChunk) ||
(absChunk > loadAreaLastChunk))) { (absChunk > loadAreaLastChunk))) {
msChunks.abs[nextPhysChunk] = absChunk; mschunks_map.mapping[nextPhysChunk] =
absChunk;
++nextPhysChunk; ++nextPhysChunk;
} }
} }
...@@ -944,6 +964,8 @@ void __init iSeries_early_setup(void) ...@@ -944,6 +964,8 @@ void __init iSeries_early_setup(void)
ppc_md.calibrate_decr = iSeries_calibrate_decr; ppc_md.calibrate_decr = iSeries_calibrate_decr;
ppc_md.progress = iSeries_progress; ppc_md.progress = iSeries_progress;
/* XXX Implement enable_pmcs for iSeries */
if (get_paca()->lppaca.shared_proc) { if (get_paca()->lppaca.shared_proc) {
ppc_md.idle_loop = iseries_shared_idle; ppc_md.idle_loop = iseries_shared_idle;
printk(KERN_INFO "Using shared processor idle loop\n"); printk(KERN_INFO "Using shared processor idle loop\n");
......
arch/ppc64/kernel/iSeries_vio.c 0 → 100644
浏览文件 @ ed735ccb
/*
* IBM PowerPC iSeries Virtual I/O Infrastructure Support.
*
* Copyright (c) 2005 Stephen Rothwell, IBM Corp.
*
* 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.
*/
#include <linux/types.h>
#include <linux/device.h>
#include <linux/init.h>
#include <asm/vio.h>
#include <asm/iommu.h>
#include <asm/abs_addr.h>
#include <asm/page.h>
#include <asm/iSeries/vio.h>
#include <asm/iSeries/HvTypes.h>
#include <asm/iSeries/HvLpConfig.h>
#include <asm/iSeries/HvCallXm.h>
struct device *iSeries_vio_dev = &vio_bus_device.dev;
EXPORT_SYMBOL(iSeries_vio_dev);
static struct iommu_table veth_iommu_table;
static struct iommu_table vio_iommu_table;
static void __init iommu_vio_init(void)
{
struct iommu_table *t;
struct iommu_table_cb cb;
unsigned long cbp;
unsigned long itc_entries;
cb.itc_busno = 255; /* Bus 255 is the virtual bus */
cb.itc_virtbus = 0xff; /* Ask for virtual bus */
cbp = virt_to_abs(&cb);
HvCallXm_getTceTableParms(cbp);
itc_entries = cb.itc_size * PAGE_SIZE / sizeof(union tce_entry);
veth_iommu_table.it_size = itc_entries / 2;
veth_iommu_table.it_busno = cb.itc_busno;
veth_iommu_table.it_offset = cb.itc_offset;
veth_iommu_table.it_index = cb.itc_index;
veth_iommu_table.it_type = TCE_VB;
veth_iommu_table.it_blocksize = 1;
t = iommu_init_table(&veth_iommu_table);
if (!t)
printk("Virtual Bus VETH TCE table failed.\n");
vio_iommu_table.it_size = itc_entries - veth_iommu_table.it_size;
vio_iommu_table.it_busno = cb.itc_busno;
vio_iommu_table.it_offset = cb.itc_offset +
veth_iommu_table.it_size;
vio_iommu_table.it_index = cb.itc_index;
vio_iommu_table.it_type = TCE_VB;
vio_iommu_table.it_blocksize = 1;
t = iommu_init_table(&vio_iommu_table);
if (!t)
printk("Virtual Bus VIO TCE table failed.\n");
}
/**
* vio_register_device_iseries: - Register a new iSeries vio device.
* @voidev: The device to register.
*/
static struct vio_dev *__init vio_register_device_iseries(char *type,
uint32_t unit_num)
{
struct vio_dev *viodev;
/* allocate a vio_dev for this device */
viodev = kmalloc(sizeof(struct vio_dev), GFP_KERNEL);
if (!viodev)
return NULL;
memset(viodev, 0, sizeof(struct vio_dev));
snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%s%d", type, unit_num);
viodev->name = viodev->dev.bus_id;
viodev->type = type;
viodev->unit_address = unit_num;
viodev->iommu_table = &vio_iommu_table;
if (vio_register_device(viodev) == NULL) {
kfree(viodev);
return NULL;
}
return viodev;
}
void __init probe_bus_iseries(void)
{
HvLpIndexMap vlan_map;
struct vio_dev *viodev;
int i;
/* there is only one of each of these */
vio_register_device_iseries("viocons", 0);
vio_register_device_iseries("vscsi", 0);
vlan_map = HvLpConfig_getVirtualLanIndexMap();
for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++) {
if ((vlan_map & (0x8000 >> i)) == 0)
continue;
viodev = vio_register_device_iseries("vlan", i);
/* veth is special and has it own iommu_table */
viodev->iommu_table = &veth_iommu_table;
}
for (i = 0; i < HVMAXARCHITECTEDVIRTUALDISKS; i++)
vio_register_device_iseries("viodasd", i);
for (i = 0; i < HVMAXARCHITECTEDVIRTUALCDROMS; i++)
vio_register_device_iseries("viocd", i);
for (i = 0; i < HVMAXARCHITECTEDVIRTUALTAPES; i++)
vio_register_device_iseries("viotape", i);
}
/**
* vio_match_device_iseries: - Tell if a iSeries VIO device matches a
* vio_device_id
*/
static int vio_match_device_iseries(const struct vio_device_id *id,
const struct vio_dev *dev)
{
return strncmp(dev->type, id->type, strlen(id->type)) == 0;
}
static struct vio_bus_ops vio_bus_ops_iseries = {
.match = vio_match_device_iseries,
};
/**
* vio_bus_init_iseries: - Initialize the iSeries virtual IO bus
*/
static int __init vio_bus_init_iseries(void)
{
int err;
err = vio_bus_init(&vio_bus_ops_iseries);
if (err == 0) {
iommu_vio_init();
vio_bus_device.iommu_table = &vio_iommu_table;
iSeries_vio_dev = &vio_bus_device.dev;
probe_bus_iseries();
}
return err;
}
__initcall(vio_bus_init_iseries);
arch/ppc64/kernel/lmb.c
浏览文件 @ ed735ccb
...@@ -28,33 +28,28 @@ void lmb_dump_all(void) ...@@ -28,33 +28,28 @@ void lmb_dump_all(void)
{ {
#ifdef DEBUG #ifdef DEBUG
unsigned long i; unsigned long i;
struct lmb *_lmb = &lmb;
udbg_printf("lmb_dump_all:\n"); udbg_printf("lmb_dump_all:\n");
udbg_printf(" memory.cnt = 0x%lx\n", udbg_printf(" memory.cnt = 0x%lx\n",
_lmb->memory.cnt); lmb.memory.cnt);
udbg_printf(" memory.size = 0x%lx\n", udbg_printf(" memory.size = 0x%lx\n",
_lmb->memory.size); lmb.memory.size);
for (i=0; i < _lmb->memory.cnt ;i++) { for (i=0; i < lmb.memory.cnt ;i++) {
udbg_printf(" memory.region[0x%x].base = 0x%lx\n", udbg_printf(" memory.region[0x%x].base = 0x%lx\n",
i, _lmb->memory.region[i].base); i, lmb.memory.region[i].base);
udbg_printf(" .physbase = 0x%lx\n",
_lmb->memory.region[i].physbase);
udbg_printf(" .size = 0x%lx\n", udbg_printf(" .size = 0x%lx\n",
_lmb->memory.region[i].size); lmb.memory.region[i].size);
} }
udbg_printf("\n reserved.cnt = 0x%lx\n", udbg_printf("\n reserved.cnt = 0x%lx\n",
_lmb->reserved.cnt); lmb.reserved.cnt);
udbg_printf(" reserved.size = 0x%lx\n", udbg_printf(" reserved.size = 0x%lx\n",
_lmb->reserved.size); lmb.reserved.size);
for (i=0; i < _lmb->reserved.cnt ;i++) { for (i=0; i < lmb.reserved.cnt ;i++) {
udbg_printf(" reserved.region[0x%x].base = 0x%lx\n", udbg_printf(" reserved.region[0x%x].base = 0x%lx\n",
i, _lmb->reserved.region[i].base); i, lmb.reserved.region[i].base);
udbg_printf(" .physbase = 0x%lx\n",
_lmb->reserved.region[i].physbase);
udbg_printf(" .size = 0x%lx\n", udbg_printf(" .size = 0x%lx\n",
_lmb->reserved.region[i].size); lmb.reserved.region[i].size);
} }
#endif /* DEBUG */ #endif /* DEBUG */
} }
...@@ -98,7 +93,6 @@ lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1, unsigned long r2) ...@@ -98,7 +93,6 @@ lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1, unsigned long r2)
rgn->region[r1].size += rgn->region[r2].size; rgn->region[r1].size += rgn->region[r2].size;
for (i=r2; i < rgn->cnt-1; i++) { for (i=r2; i < rgn->cnt-1; i++) {
rgn->region[i].base = rgn->region[i+1].base; rgn->region[i].base = rgn->region[i+1].base;
rgn->region[i].physbase = rgn->region[i+1].physbase;
rgn->region[i].size = rgn->region[i+1].size; rgn->region[i].size = rgn->region[i+1].size;
} }
rgn->cnt--; rgn->cnt--;
...@@ -108,49 +102,29 @@ lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1, unsigned long r2) ...@@ -108,49 +102,29 @@ lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1, unsigned long r2)
void __init void __init
lmb_init(void) lmb_init(void)
{ {
struct lmb *_lmb = &lmb;
/* Create a dummy zero size LMB which will get coalesced away later. /* Create a dummy zero size LMB which will get coalesced away later.
* This simplifies the lmb_add() code below... * This simplifies the lmb_add() code below...
*/ */
_lmb->memory.region[0].base = 0; lmb.memory.region[0].base = 0;
_lmb->memory.region[0].size = 0; lmb.memory.region[0].size = 0;
_lmb->memory.cnt = 1; lmb.memory.cnt = 1;
/* Ditto. */ /* Ditto. */
_lmb->reserved.region[0].base = 0; lmb.reserved.region[0].base = 0;
_lmb->reserved.region[0].size = 0; lmb.reserved.region[0].size = 0;
_lmb->reserved.cnt = 1; lmb.reserved.cnt = 1;
} }
/* This routine called with relocation disabled. */ /* This routine called with relocation disabled. */
void __init void __init
lmb_analyze(void) lmb_analyze(void)
{ {
unsigned long i; int i;
unsigned long mem_size = 0;
unsigned long size_mask = 0; lmb.memory.size = 0;
struct lmb *_lmb = &lmb;
#ifdef CONFIG_MSCHUNKS
unsigned long physbase = 0;
#endif
for (i=0; i < _lmb->memory.cnt; i++) {
unsigned long lmb_size;
lmb_size = _lmb->memory.region[i].size;
#ifdef CONFIG_MSCHUNKS
_lmb->memory.region[i].physbase = physbase;
physbase += lmb_size;
#else
_lmb->memory.region[i].physbase = _lmb->memory.region[i].base;
#endif
mem_size += lmb_size;
size_mask |= lmb_size;
}
_lmb->memory.size = mem_size; for (i = 0; i < lmb.memory.cnt; i++)
lmb.memory.size += lmb.memory.region[i].size;
} }
/* This routine called with relocation disabled. */ /* This routine called with relocation disabled. */
...@@ -168,7 +142,6 @@ lmb_add_region(struct lmb_region *rgn, unsigned long base, unsigned long size) ...@@ -168,7 +142,6 @@ lmb_add_region(struct lmb_region *rgn, unsigned long base, unsigned long size)
adjacent = lmb_addrs_adjacent(base,size,rgnbase,rgnsize); adjacent = lmb_addrs_adjacent(base,size,rgnbase,rgnsize);
if ( adjacent > 0 ) { if ( adjacent > 0 ) {
rgn->region[i].base -= size; rgn->region[i].base -= size;
rgn->region[i].physbase -= size;
rgn->region[i].size += size; rgn->region[i].size += size;
coalesced++; coalesced++;
break; break;
...@@ -195,11 +168,9 @@ lmb_add_region(struct lmb_region *rgn, unsigned long base, unsigned long size) ...@@ -195,11 +168,9 @@ lmb_add_region(struct lmb_region *rgn, unsigned long base, unsigned long size)
for (i=rgn->cnt-1; i >= 0; i--) { for (i=rgn->cnt-1; i >= 0; i--) {
if (base < rgn->region[i].base) { if (base < rgn->region[i].base) {
rgn->region[i+1].base = rgn->region[i].base; rgn->region[i+1].base = rgn->region[i].base;
rgn->region[i+1].physbase = rgn->region[i].physbase;
rgn->region[i+1].size = rgn->region[i].size; rgn->region[i+1].size = rgn->region[i].size;
} else { } else {
rgn->region[i+1].base = base; rgn->region[i+1].base = base;
rgn->region[i+1].physbase = lmb_abs_to_phys(base);
rgn->region[i+1].size = size; rgn->region[i+1].size = size;
break; break;
} }
...@@ -213,12 +184,11 @@ lmb_add_region(struct lmb_region *rgn, unsigned long base, unsigned long size) ...@@ -213,12 +184,11 @@ lmb_add_region(struct lmb_region *rgn, unsigned long base, unsigned long size)
long __init long __init
lmb_add(unsigned long base, unsigned long size) lmb_add(unsigned long base, unsigned long size)
{ {
struct lmb *_lmb = &lmb; struct lmb_region *_rgn = &(lmb.memory);
struct lmb_region *_rgn = &(_lmb->memory);
/* On pSeries LPAR systems, the first LMB is our RMO region. */ /* On pSeries LPAR systems, the first LMB is our RMO region. */
if ( base == 0 ) if ( base == 0 )
_lmb->rmo_size = size; lmb.rmo_size = size;
return lmb_add_region(_rgn, base, size); return lmb_add_region(_rgn, base, size);
...@@ -227,8 +197,7 @@ lmb_add(unsigned long base, unsigned long size) ...@@ -227,8 +197,7 @@ lmb_add(unsigned long base, unsigned long size)
long __init long __init
lmb_reserve(unsigned long base, unsigned long size) lmb_reserve(unsigned long base, unsigned long size)
{ {
struct lmb *_lmb = &lmb; struct lmb_region *_rgn = &(lmb.reserved);
struct lmb_region *_rgn = &(_lmb->reserved);
return lmb_add_region(_rgn, base, size); return lmb_add_region(_rgn, base, size);
} }
...@@ -260,13 +229,10 @@ lmb_alloc_base(unsigned long size, unsigned long align, unsigned long max_addr) ...@@ -260,13 +229,10 @@ lmb_alloc_base(unsigned long size, unsigned long align, unsigned long max_addr)
{ {
long i, j; long i, j;
unsigned long base = 0; unsigned long base = 0;
struct lmb *_lmb = &lmb;
struct lmb_region *_mem = &(_lmb->memory);
struct lmb_region *_rsv = &(_lmb->reserved);
for (i=_mem->cnt-1; i >= 0; i--) { for (i=lmb.memory.cnt-1; i >= 0; i--) {
unsigned long lmbbase = _mem->region[i].base; unsigned long lmbbase = lmb.memory.region[i].base;
unsigned long lmbsize = _mem->region[i].size; unsigned long lmbsize = lmb.memory.region[i].size;
if ( max_addr == LMB_ALLOC_ANYWHERE ) if ( max_addr == LMB_ALLOC_ANYWHERE )
base = _ALIGN_DOWN(lmbbase+lmbsize-size, align); base = _ALIGN_DOWN(lmbbase+lmbsize-size, align);
...@@ -276,8 +242,8 @@ lmb_alloc_base(unsigned long size, unsigned long align, unsigned long max_addr) ...@@ -276,8 +242,8 @@ lmb_alloc_base(unsigned long size, unsigned long align, unsigned long max_addr)
continue; continue;
while ( (lmbbase <= base) && while ( (lmbbase <= base) &&
((j = lmb_overlaps_region(_rsv,base,size)) >= 0) ) { ((j = lmb_overlaps_region(&lmb.reserved,base,size)) >= 0) ) {
base = _ALIGN_DOWN(_rsv->region[j].base-size, align); base = _ALIGN_DOWN(lmb.reserved.region[j].base-size, align);
} }
if ( (base != 0) && (lmbbase <= base) ) if ( (base != 0) && (lmbbase <= base) )
...@@ -287,62 +253,24 @@ lmb_alloc_base(unsigned long size, unsigned long align, unsigned long max_addr) ...@@ -287,62 +253,24 @@ lmb_alloc_base(unsigned long size, unsigned long align, unsigned long max_addr)
if ( i < 0 ) if ( i < 0 )
return 0; return 0;
lmb_add_region(_rsv, base, size); lmb_add_region(&lmb.reserved, base, size);
return base; return base;
} }
/* You must call lmb_analyze() before this. */
unsigned long __init unsigned long __init
lmb_phys_mem_size(void) lmb_phys_mem_size(void)
{ {
struct lmb *_lmb = &lmb; return lmb.memory.size;
#ifdef CONFIG_MSCHUNKS
return _lmb->memory.size;
#else
struct lmb_region *_mem = &(_lmb->memory);
unsigned long total = 0;
int i;
/* add all physical memory to the bootmem map */
for (i=0; i < _mem->cnt; i++)
total += _mem->region[i].size;
return total;
#endif /* CONFIG_MSCHUNKS */
} }
unsigned long __init unsigned long __init
lmb_end_of_DRAM(void) lmb_end_of_DRAM(void)
{ {
struct lmb *_lmb = &lmb; int idx = lmb.memory.cnt - 1;
struct lmb_region *_mem = &(_lmb->memory);
int idx = _mem->cnt - 1;
#ifdef CONFIG_MSCHUNKS
return (_mem->region[idx].physbase + _mem->region[idx].size);
#else
return (_mem->region[idx].base + _mem->region[idx].size);
#endif /* CONFIG_MSCHUNKS */
return 0;
}
unsigned long __init
lmb_abs_to_phys(unsigned long aa)
{
unsigned long i, pa = aa;
struct lmb *_lmb = &lmb;
struct lmb_region *_mem = &(_lmb->memory);
for (i=0; i < _mem->cnt; i++) {
unsigned long lmbbase = _mem->region[i].base;
unsigned long lmbsize = _mem->region[i].size;
if ( lmb_addrs_overlap(aa,1,lmbbase,lmbsize) ) {
pa = _mem->region[i].physbase + (aa - lmbbase);
break;
}
}
return pa; return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
} }
/* /*
...@@ -353,20 +281,19 @@ void __init lmb_enforce_memory_limit(void) ...@@ -353,20 +281,19 @@ void __init lmb_enforce_memory_limit(void)
{ {
extern unsigned long memory_limit; extern unsigned long memory_limit;
unsigned long i, limit; unsigned long i, limit;
struct lmb_region *mem = &(lmb.memory);
if (! memory_limit) if (! memory_limit)
return; return;
limit = memory_limit; limit = memory_limit;
for (i = 0; i < mem->cnt; i++) { for (i = 0; i < lmb.memory.cnt; i++) {
if (limit > mem->region[i].size) { if (limit > lmb.memory.region[i].size) {
limit -= mem->region[i].size; limit -= lmb.memory.region[i].size;
continue; continue;
} }
mem->region[i].size = limit; lmb.memory.region[i].size = limit;
mem->cnt = i + 1; lmb.memory.cnt = i + 1;
break; break;
} }
} }
arch/ppc64/kernel/lparcfg.c
浏览文件 @ ed735ccb
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <asm/iSeries/HvLpConfig.h> #include <asm/iSeries/HvLpConfig.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/cputable.h> #include <asm/firmware.h>
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/time.h> #include <asm/time.h>
...@@ -273,6 +273,7 @@ static void parse_system_parameter_string(struct seq_file *m) ...@@ -273,6 +273,7 @@ static void parse_system_parameter_string(struct seq_file *m)
if (!workbuffer) { if (!workbuffer) {
printk(KERN_ERR "%s %s kmalloc failure at line %d \n", printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
__FILE__, __FUNCTION__, __LINE__); __FILE__, __FUNCTION__, __LINE__);
kfree(local_buffer);
return; return;
} }
#ifdef LPARCFG_DEBUG #ifdef LPARCFG_DEBUG
...@@ -377,7 +378,7 @@ static int lparcfg_data(struct seq_file *m, void *v) ...@@ -377,7 +378,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
partition_active_processors = lparcfg_count_active_processors(); partition_active_processors = lparcfg_count_active_processors();
if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) { if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
unsigned long h_entitled, h_unallocated; unsigned long h_entitled, h_unallocated;
unsigned long h_aggregation, h_resource; unsigned long h_aggregation, h_resource;
unsigned long pool_idle_time, pool_procs; unsigned long pool_idle_time, pool_procs;
...@@ -571,7 +572,7 @@ int __init lparcfg_init(void) ...@@ -571,7 +572,7 @@ int __init lparcfg_init(void)
mode_t mode = S_IRUSR; mode_t mode = S_IRUSR;
/* Allow writing if we have FW_FEATURE_SPLPAR */ /* Allow writing if we have FW_FEATURE_SPLPAR */
if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) { if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
lparcfg_fops.write = lparcfg_write; lparcfg_fops.write = lparcfg_write;
mode |= S_IWUSR; mode |= S_IWUSR;
} }
......
arch/ppc64/kernel/misc.S
浏览文件 @ ed735ccb
...@@ -680,6 +680,104 @@ _GLOBAL(kernel_thread) ...@@ -680,6 +680,104 @@ _GLOBAL(kernel_thread)
ld r30,-16(r1) ld r30,-16(r1)
blr blr
/*
* disable_kernel_fp()
* Disable the FPU.
*/
_GLOBAL(disable_kernel_fp)
mfmsr r3
rldicl r0,r3,(63-MSR_FP_LG),1
rldicl r3,r0,(MSR_FP_LG+1),0
mtmsrd r3 /* disable use of fpu now */
isync
blr
/*
* giveup_fpu(tsk)
* Disable FP for the task given as the argument,
* and save the floating-point registers in its thread_struct.
* Enables the FPU for use in the kernel on return.
*/
_GLOBAL(giveup_fpu)
mfmsr r5
ori r5,r5,MSR_FP
mtmsrd r5 /* enable use of fpu now */
isync
cmpdi 0,r3,0
beqlr- /* if no previous owner, done */
addi r3,r3,THREAD /* want THREAD of task */
ld r5,PT_REGS(r3)
cmpdi 0,r5,0
SAVE_32FPRS(0, r3)
mffs fr0
stfd fr0,THREAD_FPSCR(r3)
beq 1f
ld r4,_MSR-STACK_FRAME_OVERHEAD(r5)
li r3,MSR_FP|MSR_FE0|MSR_FE1
andc r4,r4,r3 /* disable FP for previous task */
std r4,_MSR-STACK_FRAME_OVERHEAD(r5)
1:
#ifndef CONFIG_SMP
li r5,0
ld r4,last_task_used_math@got(r2)
std r5,0(r4)
#endif /* CONFIG_SMP */
blr
#ifdef CONFIG_ALTIVEC
#if 0 /* this has no callers for now */
/*
* disable_kernel_altivec()
* Disable the VMX.
*/
_GLOBAL(disable_kernel_altivec)
mfmsr r3
rldicl r0,r3,(63-MSR_VEC_LG),1
rldicl r3,r0,(MSR_VEC_LG+1),0
mtmsrd r3 /* disable use of VMX now */
isync
blr
#endif /* 0 */
/*
* giveup_altivec(tsk)
* Disable VMX for the task given as the argument,
* and save the vector registers in its thread_struct.
* Enables the VMX for use in the kernel on return.
*/
_GLOBAL(giveup_altivec)
mfmsr r5
oris r5,r5,MSR_VEC@h
mtmsrd r5 /* enable use of VMX now */
isync
cmpdi 0,r3,0
beqlr- /* if no previous owner, done */
addi r3,r3,THREAD /* want THREAD of task */
ld r5,PT_REGS(r3)
cmpdi 0,r5,0
SAVE_32VRS(0,r4,r3)
mfvscr vr0
li r4,THREAD_VSCR
stvx vr0,r4,r3
beq 1f
ld r4,_MSR-STACK_FRAME_OVERHEAD(r5)
lis r3,MSR_VEC@h
andc r4,r4,r3 /* disable FP for previous task */
std r4,_MSR-STACK_FRAME_OVERHEAD(r5)
1:
#ifndef CONFIG_SMP
li r5,0
ld r4,last_task_used_altivec@got(r2)
std r5,0(r4)
#endif /* CONFIG_SMP */
blr
#endif /* CONFIG_ALTIVEC */
_GLOBAL(__setup_cpu_power3)
blr
/* kexec_wait(phys_cpu) /* kexec_wait(phys_cpu)
* *
* wait for the flag to change, indicating this kernel is going away but * wait for the flag to change, indicating this kernel is going away but
......
arch/ppc64/kernel/of_device.c
浏览文件 @ ed735ccb
...@@ -236,7 +236,6 @@ void of_device_unregister(struct of_device *ofdev) ...@@ -236,7 +236,6 @@ void of_device_unregister(struct of_device *ofdev)
struct of_device* of_platform_device_create(struct device_node *np, const char *bus_id) struct of_device* of_platform_device_create(struct device_node *np, const char *bus_id)
{ {
struct of_device *dev; struct of_device *dev;
u32 *reg;
dev = kmalloc(sizeof(*dev), GFP_KERNEL); dev = kmalloc(sizeof(*dev), GFP_KERNEL);
if (!dev) if (!dev)
...@@ -250,7 +249,6 @@ struct of_device* of_platform_device_create(struct device_node *np, const char * ...@@ -250,7 +249,6 @@ struct of_device* of_platform_device_create(struct device_node *np, const char *
dev->dev.bus = &of_platform_bus_type; dev->dev.bus = &of_platform_bus_type;
dev->dev.release = of_release_dev; dev->dev.release = of_release_dev;
reg = (u32 *)get_property(np, "reg", NULL);
strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE); strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
if (of_device_register(dev) != 0) { if (of_device_register(dev) != 0) {
......
arch/ppc64/kernel/pSeries_iommu.c
浏览文件 @ ed735ccb
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <asm/plpar_wrappers.h> #include <asm/plpar_wrappers.h>
#include <asm/pSeries_reconfig.h> #include <asm/pSeries_reconfig.h>
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
#include <asm/firmware.h>
#include "pci.h" #include "pci.h"
#define DBG(fmt...) #define DBG(fmt...)
...@@ -546,7 +547,7 @@ void iommu_init_early_pSeries(void) ...@@ -546,7 +547,7 @@ void iommu_init_early_pSeries(void)
} }
if (systemcfg->platform & PLATFORM_LPAR) { if (systemcfg->platform & PLATFORM_LPAR) {
if (cur_cpu_spec->firmware_features & FW_FEATURE_MULTITCE) { if (firmware_has_feature(FW_FEATURE_MULTITCE)) {
ppc_md.tce_build = tce_buildmulti_pSeriesLP; ppc_md.tce_build = tce_buildmulti_pSeriesLP;
ppc_md.tce_free = tce_freemulti_pSeriesLP; ppc_md.tce_free = tce_freemulti_pSeriesLP;
} else { } else {
......
arch/ppc64/kernel/pSeries_lpar.c
浏览文件 @ ed735ccb
...@@ -52,7 +52,6 @@ EXPORT_SYMBOL(plpar_hcall_4out); ...@@ -52,7 +52,6 @@ EXPORT_SYMBOL(plpar_hcall_4out);
EXPORT_SYMBOL(plpar_hcall_norets); EXPORT_SYMBOL(plpar_hcall_norets);
EXPORT_SYMBOL(plpar_hcall_8arg_2ret); EXPORT_SYMBOL(plpar_hcall_8arg_2ret);
extern void fw_feature_init(void);
extern void pSeries_find_serial_port(void); extern void pSeries_find_serial_port(void);
...@@ -279,7 +278,6 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group, ...@@ -279,7 +278,6 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
unsigned long va, unsigned long prpn, unsigned long va, unsigned long prpn,
unsigned long vflags, unsigned long rflags) unsigned long vflags, unsigned long rflags)
{ {
unsigned long arpn = physRpn_to_absRpn(prpn);
unsigned long lpar_rc; unsigned long lpar_rc;
unsigned long flags; unsigned long flags;
unsigned long slot; unsigned long slot;
...@@ -290,7 +288,7 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group, ...@@ -290,7 +288,7 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
if (vflags & HPTE_V_LARGE) if (vflags & HPTE_V_LARGE)
hpte_v &= ~(1UL << HPTE_V_AVPN_SHIFT); hpte_v &= ~(1UL << HPTE_V_AVPN_SHIFT);
hpte_r = (arpn << HPTE_R_RPN_SHIFT) | rflags; hpte_r = (prpn << HPTE_R_RPN_SHIFT) | rflags;
/* Now fill in the actual HPTE */ /* Now fill in the actual HPTE */
/* Set CEC cookie to 0 */ /* Set CEC cookie to 0 */
......
arch/ppc64/kernel/pSeries_setup.c
浏览文件 @ ed735ccb
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
#include <asm/nvram.h> #include <asm/nvram.h>
#include <asm/plpar_wrappers.h> #include <asm/plpar_wrappers.h>
#include <asm/xics.h> #include <asm/xics.h>
#include <asm/cputable.h> #include <asm/firmware.h>
#include <asm/pmc.h>
#include "i8259.h" #include "i8259.h"
#include "mpic.h" #include "mpic.h"
...@@ -187,6 +188,21 @@ static void __init pSeries_setup_mpic(void) ...@@ -187,6 +188,21 @@ static void __init pSeries_setup_mpic(void)
" MPIC "); " MPIC ");
} }
static void pseries_lpar_enable_pmcs(void)
{
unsigned long set, reset;
power4_enable_pmcs();
set = 1UL << 63;
reset = 0;
plpar_hcall_norets(H_PERFMON, set, reset);
/* instruct hypervisor to maintain PMCs */
if (firmware_has_feature(FW_FEATURE_SPLPAR))
get_paca()->lppaca.pmcregs_in_use = 1;
}
static void __init pSeries_setup_arch(void) static void __init pSeries_setup_arch(void)
{ {
/* Fixup ppc_md depending on the type of interrupt controller */ /* Fixup ppc_md depending on the type of interrupt controller */
...@@ -231,11 +247,9 @@ static void __init pSeries_setup_arch(void) ...@@ -231,11 +247,9 @@ static void __init pSeries_setup_arch(void)
pSeries_nvram_init(); pSeries_nvram_init();
if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR)
vpa_init(boot_cpuid);
/* Choose an idle loop */ /* Choose an idle loop */
if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) { if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
vpa_init(boot_cpuid);
if (get_paca()->lppaca.shared_proc) { if (get_paca()->lppaca.shared_proc) {
printk(KERN_INFO "Using shared processor idle loop\n"); printk(KERN_INFO "Using shared processor idle loop\n");
ppc_md.idle_loop = pseries_shared_idle; ppc_md.idle_loop = pseries_shared_idle;
...@@ -247,6 +261,11 @@ static void __init pSeries_setup_arch(void) ...@@ -247,6 +261,11 @@ static void __init pSeries_setup_arch(void)
printk(KERN_INFO "Using default idle loop\n"); printk(KERN_INFO "Using default idle loop\n");
ppc_md.idle_loop = default_idle; ppc_md.idle_loop = default_idle;
} }
if (systemcfg->platform & PLATFORM_LPAR)
ppc_md.enable_pmcs = pseries_lpar_enable_pmcs;
else
ppc_md.enable_pmcs = power4_enable_pmcs;
} }
static int __init pSeries_init_panel(void) static int __init pSeries_init_panel(void)
...@@ -260,11 +279,11 @@ static int __init pSeries_init_panel(void) ...@@ -260,11 +279,11 @@ static int __init pSeries_init_panel(void)
arch_initcall(pSeries_init_panel); arch_initcall(pSeries_init_panel);
/* Build up the firmware_features bitmask field /* Build up the ppc64_firmware_features bitmask field
* using contents of device-tree/ibm,hypertas-functions. * using contents of device-tree/ibm,hypertas-functions.
* Ultimately this functionality may be moved into prom.c prom_init(). * Ultimately this functionality may be moved into prom.c prom_init().
*/ */
void __init fw_feature_init(void) static void __init fw_feature_init(void)
{ {
struct device_node * dn; struct device_node * dn;
char * hypertas; char * hypertas;
...@@ -272,7 +291,7 @@ void __init fw_feature_init(void) ...@@ -272,7 +291,7 @@ void __init fw_feature_init(void)
DBG(" -> fw_feature_init()\n"); DBG(" -> fw_feature_init()\n");
cur_cpu_spec->firmware_features = 0; ppc64_firmware_features = 0;
dn = of_find_node_by_path("/rtas"); dn = of_find_node_by_path("/rtas");
if (dn == NULL) { if (dn == NULL) {
printk(KERN_ERR "WARNING ! Cannot find RTAS in device-tree !\n"); printk(KERN_ERR "WARNING ! Cannot find RTAS in device-tree !\n");
...@@ -288,7 +307,7 @@ void __init fw_feature_init(void) ...@@ -288,7 +307,7 @@ void __init fw_feature_init(void)
if ((firmware_features_table[i].name) && if ((firmware_features_table[i].name) &&
(strcmp(firmware_features_table[i].name,hypertas))==0) { (strcmp(firmware_features_table[i].name,hypertas))==0) {
/* we have a match */ /* we have a match */
cur_cpu_spec->firmware_features |= ppc64_firmware_features |=
(firmware_features_table[i].val); (firmware_features_table[i].val);
break; break;
} }
...@@ -302,7 +321,7 @@ void __init fw_feature_init(void) ...@@ -302,7 +321,7 @@ void __init fw_feature_init(void)
of_node_put(dn); of_node_put(dn);
no_rtas: no_rtas:
printk(KERN_INFO "firmware_features = 0x%lx\n", printk(KERN_INFO "firmware_features = 0x%lx\n",
cur_cpu_spec->firmware_features); ppc64_firmware_features);
DBG(" <- fw_feature_init()\n"); DBG(" <- fw_feature_init()\n");
} }
......
arch/ppc64/kernel/pSeries_smp.c
浏览文件 @ ed735ccb
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/xics.h> #include <asm/xics.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/firmware.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/plpar_wrappers.h> #include <asm/plpar_wrappers.h>
...@@ -326,7 +327,7 @@ static void __devinit smp_xics_setup_cpu(int cpu) ...@@ -326,7 +327,7 @@ static void __devinit smp_xics_setup_cpu(int cpu)
if (cpu != boot_cpuid) if (cpu != boot_cpuid)
xics_setup_cpu(); xics_setup_cpu();
if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) if (firmware_has_feature(FW_FEATURE_SPLPAR))
vpa_init(cpu); vpa_init(cpu);
cpu_clear(cpu, of_spin_map); cpu_clear(cpu, of_spin_map);
......
arch/ppc64/kernel/pSeries_vio.c 0 → 100644
浏览文件 @ ed735ccb
/*
* IBM PowerPC pSeries Virtual I/O Infrastructure Support.
*
* Copyright (c) 2003-2005 IBM Corp.
* Dave Engebretsen engebret@us.ibm.com
* Santiago Leon santil@us.ibm.com
* Hollis Blanchard <hollisb@us.ibm.com>
* Stephen Rothwell
*
* 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.
*/
#include <linux/init.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/kobject.h>
#include <asm/iommu.h>
#include <asm/dma.h>
#include <asm/prom.h>
#include <asm/vio.h>
#include <asm/hvcall.h>
extern struct subsystem devices_subsys; /* needed for vio_find_name() */
static void probe_bus_pseries(void)
{
struct device_node *node_vroot, *of_node;
node_vroot = find_devices("vdevice");
if ((node_vroot == NULL) || (node_vroot->child == NULL))
/* this machine doesn't do virtual IO, and that's ok */
return;
/*
* Create struct vio_devices for each virtual device in the device tree.
* Drivers will associate with them later.
*/
for (of_node = node_vroot->child; of_node != NULL;
of_node = of_node->sibling) {
printk(KERN_DEBUG "%s: processing %p\n", __FUNCTION__, of_node);
vio_register_device_node(of_node);
}
}
/**
* vio_match_device_pseries: - Tell if a pSeries VIO device matches a
* vio_device_id
*/
static int vio_match_device_pseries(const struct vio_device_id *id,
const struct vio_dev *dev)
{
return (strncmp(dev->type, id->type, strlen(id->type)) == 0) &&
device_is_compatible(dev->dev.platform_data, id->compat);
}
static void vio_release_device_pseries(struct device *dev)
{
/* XXX free TCE table */
of_node_put(dev->platform_data);
}
static ssize_t viodev_show_devspec(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct device_node *of_node = dev->platform_data;
return sprintf(buf, "%s\n", of_node->full_name);
}
DEVICE_ATTR(devspec, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_devspec, NULL);
static void vio_unregister_device_pseries(struct vio_dev *viodev)
{
device_remove_file(&viodev->dev, &dev_attr_devspec);
}
static struct vio_bus_ops vio_bus_ops_pseries = {
.match = vio_match_device_pseries,
.unregister_device = vio_unregister_device_pseries,
.release_device = vio_release_device_pseries,
};
/**
* vio_bus_init_pseries: - Initialize the pSeries virtual IO bus
*/
static int __init vio_bus_init_pseries(void)
{
int err;
err = vio_bus_init(&vio_bus_ops_pseries);
if (err == 0)
probe_bus_pseries();
return err;
}
__initcall(vio_bus_init_pseries);
/**
* vio_build_iommu_table: - gets the dma information from OF and
* builds the TCE tree.
* @dev: the virtual device.
*
* Returns a pointer to the built tce tree, or NULL if it can't
* find property.
*/
static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
{
unsigned int *dma_window;
struct iommu_table *newTceTable;
unsigned long offset;
int dma_window_property_size;
dma_window = (unsigned int *) get_property(dev->dev.platform_data, "ibm,my-dma-window", &dma_window_property_size);
if(!dma_window) {
return NULL;
}
newTceTable = (struct iommu_table *) kmalloc(sizeof(struct iommu_table), GFP_KERNEL);
/* There should be some code to extract the phys-encoded offset
using prom_n_addr_cells(). However, according to a comment
on earlier versions, it's always zero, so we don't bother */
offset = dma_window[1] >> PAGE_SHIFT;
/* TCE table size - measured in tce entries */
newTceTable->it_size = dma_window[4] >> PAGE_SHIFT;
/* offset for VIO should always be 0 */
newTceTable->it_offset = offset;
newTceTable->it_busno = 0;
newTceTable->it_index = (unsigned long)dma_window[0];
newTceTable->it_type = TCE_VB;
return iommu_init_table(newTceTable);
}
/**
* vio_register_device_node: - Register a new vio device.
* @of_node: The OF node for this device.
*
* Creates and initializes a vio_dev structure from the data in
* of_node (dev.platform_data) and adds it to the list of virtual devices.
* Returns a pointer to the created vio_dev or NULL if node has
* NULL device_type or compatible fields.
*/
struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)
{
struct vio_dev *viodev;
unsigned int *unit_address;
unsigned int *irq_p;
/* we need the 'device_type' property, in order to match with drivers */
if ((NULL == of_node->type)) {
printk(KERN_WARNING
"%s: node %s missing 'device_type'\n", __FUNCTION__,
of_node->name ? of_node->name : "<unknown>");
return NULL;
}
unit_address = (unsigned int *)get_property(of_node, "reg", NULL);
if (!unit_address) {
printk(KERN_WARNING "%s: node %s missing 'reg'\n", __FUNCTION__,
of_node->name ? of_node->name : "<unknown>");
return NULL;
}
/* allocate a vio_dev for this node */
viodev = kmalloc(sizeof(struct vio_dev), GFP_KERNEL);
if (!viodev) {
return NULL;
}
memset(viodev, 0, sizeof(struct vio_dev));
viodev->dev.platform_data = of_node_get(of_node);
viodev->irq = NO_IRQ;
irq_p = (unsigned int *)get_property(of_node, "interrupts", NULL);
if (irq_p) {
int virq = virt_irq_create_mapping(*irq_p);
if (virq == NO_IRQ) {
printk(KERN_ERR "Unable to allocate interrupt "
"number for %s\n", of_node->full_name);
} else
viodev->irq = irq_offset_up(virq);
}
snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%x", *unit_address);
viodev->name = of_node->name;
viodev->type = of_node->type;
viodev->unit_address = *unit_address;
viodev->iommu_table = vio_build_iommu_table(viodev);
/* register with generic device framework */
if (vio_register_device(viodev) == NULL) {
/* XXX free TCE table */
kfree(viodev);
return NULL;
}
device_create_file(&viodev->dev, &dev_attr_devspec);
return viodev;
}
EXPORT_SYMBOL(vio_register_device_node);
/**
* vio_get_attribute: - get attribute for virtual device
* @vdev: The vio device to get property.
* @which: The property/attribute to be extracted.
* @length: Pointer to length of returned data size (unused if NULL).
*
* Calls prom.c's get_property() to return the value of the
* attribute specified by the preprocessor constant @which
*/
const void * vio_get_attribute(struct vio_dev *vdev, void* which, int* length)
{
return get_property(vdev->dev.platform_data, (char*)which, length);
}
EXPORT_SYMBOL(vio_get_attribute);
/* vio_find_name() - internal because only vio.c knows how we formatted the
* kobject name
* XXX once vio_bus_type.devices is actually used as a kset in
* drivers/base/bus.c, this function should be removed in favor of
* "device_find(kobj_name, &vio_bus_type)"
*/
static struct vio_dev *vio_find_name(const char *kobj_name)
{
struct kobject *found;
found = kset_find_obj(&devices_subsys.kset, kobj_name);
if (!found)
return NULL;
return to_vio_dev(container_of(found, struct device, kobj));
}
/**
* vio_find_node - find an already-registered vio_dev
* @vnode: device_node of the virtual device we're looking for
*/
struct vio_dev *vio_find_node(struct device_node *vnode)
{
uint32_t *unit_address;
char kobj_name[BUS_ID_SIZE];
/* construct the kobject name from the device node */
unit_address = (uint32_t *)get_property(vnode, "reg", NULL);
if (!unit_address)
return NULL;
snprintf(kobj_name, BUS_ID_SIZE, "%x", *unit_address);
return vio_find_name(kobj_name);
}
EXPORT_SYMBOL(vio_find_node);
int vio_enable_interrupts(struct vio_dev *dev)
{
int rc = h_vio_signal(dev->unit_address, VIO_IRQ_ENABLE);
if (rc != H_Success)
printk(KERN_ERR "vio: Error 0x%x enabling interrupts\n", rc);
return rc;
}
EXPORT_SYMBOL(vio_enable_interrupts);
int vio_disable_interrupts(struct vio_dev *dev)
{
int rc = h_vio_signal(dev->unit_address, VIO_IRQ_DISABLE);
if (rc != H_Success)
printk(KERN_ERR "vio: Error 0x%x disabling interrupts\n", rc);
return rc;
}
EXPORT_SYMBOL(vio_disable_interrupts);
arch/ppc64/kernel/pacaData.c
浏览文件 @ ed735ccb
...@@ -78,7 +78,7 @@ extern unsigned long __toc_start; ...@@ -78,7 +78,7 @@ extern unsigned long __toc_start;
#define BOOTCPU_PACA_INIT(number) \ #define BOOTCPU_PACA_INIT(number) \
{ \ { \
PACA_INIT_COMMON(number, 1, 0, STAB0_VIRT_ADDR) \ PACA_INIT_COMMON(number, 1, 0, (u64)&initial_stab) \
PACA_INIT_ISERIES(number) \ PACA_INIT_ISERIES(number) \
} }
...@@ -90,7 +90,7 @@ extern unsigned long __toc_start; ...@@ -90,7 +90,7 @@ extern unsigned long __toc_start;
#define BOOTCPU_PACA_INIT(number) \ #define BOOTCPU_PACA_INIT(number) \
{ \ { \
PACA_INIT_COMMON(number, 1, STAB0_PHYS_ADDR, STAB0_VIRT_ADDR) \ PACA_INIT_COMMON(number, 1, STAB0_PHYS_ADDR, (u64)&initial_stab) \
} }
#endif #endif
......
arch/ppc64/kernel/pmac_setup.c
浏览文件 @ ed735ccb
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
#include <asm/of_device.h> #include <asm/of_device.h>
#include <asm/lmb.h> #include <asm/lmb.h>
#include <asm/smu.h> #include <asm/smu.h>
#include <asm/pmc.h>
#include "pmac.h" #include "pmac.h"
#include "mpic.h" #include "mpic.h"
...@@ -511,4 +512,5 @@ struct machdep_calls __initdata pmac_md = { ...@@ -511,4 +512,5 @@ struct machdep_calls __initdata pmac_md = {
.progress = pmac_progress, .progress = pmac_progress,
.check_legacy_ioport = pmac_check_legacy_ioport, .check_legacy_ioport = pmac_check_legacy_ioport,
.idle_loop = native_idle, .idle_loop = native_idle,
.enable_pmcs = power4_enable_pmcs,
}; };
arch/ppc64/kernel/pmc.c
浏览文件 @ ed735ccb
...@@ -65,3 +65,24 @@ void release_pmc_hardware(void) ...@@ -65,3 +65,24 @@ void release_pmc_hardware(void)
spin_unlock(&pmc_owner_lock); spin_unlock(&pmc_owner_lock);
} }
EXPORT_SYMBOL_GPL(release_pmc_hardware); EXPORT_SYMBOL_GPL(release_pmc_hardware);
void power4_enable_pmcs(void)
{
unsigned long hid0;
hid0 = mfspr(HID0);
hid0 |= 1UL << (63 - 20);
/* POWER4 requires the following sequence */
asm volatile(
"sync\n"
"mtspr %1, %0\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"isync" : "=&r" (hid0) : "i" (HID0), "0" (hid0):
"memory");
}
arch/ppc64/kernel/process.c
浏览文件 @ ed735ccb
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/iSeries/HvCallHpt.h> #include <asm/iSeries/HvCallHpt.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/firmware.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/time.h> #include <asm/time.h>
...@@ -202,11 +203,10 @@ struct task_struct *__switch_to(struct task_struct *prev, ...@@ -202,11 +203,10 @@ struct task_struct *__switch_to(struct task_struct *prev,
new_thread = &new->thread; new_thread = &new->thread;
old_thread = &current->thread; old_thread = &current->thread;
/* Collect purr utilization data per process and per processor wise */ /* Collect purr utilization data per process and per processor
/* purr is nothing but processor time base */ * wise purr is nothing but processor time base
*/
#if defined(CONFIG_PPC_PSERIES) if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) {
struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array); struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array);
long unsigned start_tb, current_tb; long unsigned start_tb, current_tb;
start_tb = old_thread->start_tb; start_tb = old_thread->start_tb;
...@@ -214,8 +214,6 @@ struct task_struct *__switch_to(struct task_struct *prev, ...@@ -214,8 +214,6 @@ struct task_struct *__switch_to(struct task_struct *prev,
old_thread->accum_tb += (current_tb - start_tb); old_thread->accum_tb += (current_tb - start_tb);
new_thread->start_tb = current_tb; new_thread->start_tb = current_tb;
} }
#endif
local_irq_save(flags); local_irq_save(flags);
last = _switch(old_thread, new_thread); last = _switch(old_thread, new_thread);
......
arch/ppc64/kernel/prom.c
浏览文件 @ ed735ccb
...@@ -625,8 +625,8 @@ void __init finish_device_tree(void) ...@@ -625,8 +625,8 @@ void __init finish_device_tree(void)
static inline char *find_flat_dt_string(u32 offset) static inline char *find_flat_dt_string(u32 offset)
{ {
return ((char *)initial_boot_params) + initial_boot_params->off_dt_strings return ((char *)initial_boot_params) +
+ offset; initial_boot_params->off_dt_strings + offset;
} }
/** /**
...@@ -635,26 +635,33 @@ static inline char *find_flat_dt_string(u32 offset) ...@@ -635,26 +635,33 @@ static inline char *find_flat_dt_string(u32 offset)
* unflatten the tree * unflatten the tree
*/ */
static int __init scan_flat_dt(int (*it)(unsigned long node, static int __init scan_flat_dt(int (*it)(unsigned long node,
const char *full_path, void *data), const char *uname, int depth,
void *data),
void *data) void *data)
{ {
unsigned long p = ((unsigned long)initial_boot_params) + unsigned long p = ((unsigned long)initial_boot_params) +
initial_boot_params->off_dt_struct; initial_boot_params->off_dt_struct;
int rc = 0; int rc = 0;
int depth = -1;
do { do {
u32 tag = *((u32 *)p); u32 tag = *((u32 *)p);
char *pathp; char *pathp;
p += 4; p += 4;
if (tag == OF_DT_END_NODE) if (tag == OF_DT_END_NODE) {
depth --;
continue;
}
if (tag == OF_DT_NOP)
continue; continue;
if (tag == OF_DT_END) if (tag == OF_DT_END)
break; break;
if (tag == OF_DT_PROP) { if (tag == OF_DT_PROP) {
u32 sz = *((u32 *)p); u32 sz = *((u32 *)p);
p += 8; p += 8;
p = _ALIGN(p, sz >= 8 ? 8 : 4); if (initial_boot_params->version < 0x10)
p = _ALIGN(p, sz >= 8 ? 8 : 4);
p += sz; p += sz;
p = _ALIGN(p, 4); p = _ALIGN(p, 4);
continue; continue;
...@@ -664,9 +671,18 @@ static int __init scan_flat_dt(int (*it)(unsigned long node, ...@@ -664,9 +671,18 @@ static int __init scan_flat_dt(int (*it)(unsigned long node,
" device tree !\n", tag); " device tree !\n", tag);
return -EINVAL; return -EINVAL;
} }
depth++;
pathp = (char *)p; pathp = (char *)p;
p = _ALIGN(p + strlen(pathp) + 1, 4); p = _ALIGN(p + strlen(pathp) + 1, 4);
rc = it(p, pathp, data); if ((*pathp) == '/') {
char *lp, *np;
for (lp = NULL, np = pathp; *np; np++)
if ((*np) == '/')
lp = np+1;
if (lp != NULL)
pathp = lp;
}
rc = it(p, pathp, depth, data);
if (rc != 0) if (rc != 0)
break; break;
} while(1); } while(1);
...@@ -689,17 +705,21 @@ static void* __init get_flat_dt_prop(unsigned long node, const char *name, ...@@ -689,17 +705,21 @@ static void* __init get_flat_dt_prop(unsigned long node, const char *name,
const char *nstr; const char *nstr;
p += 4; p += 4;
if (tag == OF_DT_NOP)
continue;
if (tag != OF_DT_PROP) if (tag != OF_DT_PROP)
return NULL; return NULL;
sz = *((u32 *)p); sz = *((u32 *)p);
noff = *((u32 *)(p + 4)); noff = *((u32 *)(p + 4));
p += 8; p += 8;
p = _ALIGN(p, sz >= 8 ? 8 : 4); if (initial_boot_params->version < 0x10)
p = _ALIGN(p, sz >= 8 ? 8 : 4);
nstr = find_flat_dt_string(noff); nstr = find_flat_dt_string(noff);
if (nstr == NULL) { if (nstr == NULL) {
printk(KERN_WARNING "Can't find property index name !\n"); printk(KERN_WARNING "Can't find property index"
" name !\n");
return NULL; return NULL;
} }
if (strcmp(name, nstr) == 0) { if (strcmp(name, nstr) == 0) {
...@@ -713,7 +733,7 @@ static void* __init get_flat_dt_prop(unsigned long node, const char *name, ...@@ -713,7 +733,7 @@ static void* __init get_flat_dt_prop(unsigned long node, const char *name,
} }
static void *__init unflatten_dt_alloc(unsigned long *mem, unsigned long size, static void *__init unflatten_dt_alloc(unsigned long *mem, unsigned long size,
unsigned long align) unsigned long align)
{ {
void *res; void *res;
...@@ -727,13 +747,16 @@ static void *__init unflatten_dt_alloc(unsigned long *mem, unsigned long size, ...@@ -727,13 +747,16 @@ static void *__init unflatten_dt_alloc(unsigned long *mem, unsigned long size,
static unsigned long __init unflatten_dt_node(unsigned long mem, static unsigned long __init unflatten_dt_node(unsigned long mem,
unsigned long *p, unsigned long *p,
struct device_node *dad, struct device_node *dad,
struct device_node ***allnextpp) struct device_node ***allnextpp,
unsigned long fpsize)
{ {
struct device_node *np; struct device_node *np;
struct property *pp, **prev_pp = NULL; struct property *pp, **prev_pp = NULL;
char *pathp; char *pathp;
u32 tag; u32 tag;
unsigned int l; unsigned int l, allocl;
int has_name = 0;
int new_format = 0;
tag = *((u32 *)(*p)); tag = *((u32 *)(*p));
if (tag != OF_DT_BEGIN_NODE) { if (tag != OF_DT_BEGIN_NODE) {
...@@ -742,21 +765,62 @@ static unsigned long __init unflatten_dt_node(unsigned long mem, ...@@ -742,21 +765,62 @@ static unsigned long __init unflatten_dt_node(unsigned long mem,
} }
*p += 4; *p += 4;
pathp = (char *)*p; pathp = (char *)*p;
l = strlen(pathp) + 1; l = allocl = strlen(pathp) + 1;
*p = _ALIGN(*p + l, 4); *p = _ALIGN(*p + l, 4);
np = unflatten_dt_alloc(&mem, sizeof(struct device_node) + l, /* version 0x10 has a more compact unit name here instead of the full
* path. we accumulate the full path size using "fpsize", we'll rebuild
* it later. We detect this because the first character of the name is
* not '/'.
*/
if ((*pathp) != '/') {
new_format = 1;
if (fpsize == 0) {
/* root node: special case. fpsize accounts for path
* plus terminating zero. root node only has '/', so
* fpsize should be 2, but we want to avoid the first
* level nodes to have two '/' so we use fpsize 1 here
*/
fpsize = 1;
allocl = 2;
} else {
/* account for '/' and path size minus terminal 0
* already in 'l'
*/
fpsize += l;
allocl = fpsize;
}
}
np = unflatten_dt_alloc(&mem, sizeof(struct device_node) + allocl,
__alignof__(struct device_node)); __alignof__(struct device_node));
if (allnextpp) { if (allnextpp) {
memset(np, 0, sizeof(*np)); memset(np, 0, sizeof(*np));
np->full_name = ((char*)np) + sizeof(struct device_node); np->full_name = ((char*)np) + sizeof(struct device_node);
memcpy(np->full_name, pathp, l); if (new_format) {
char *p = np->full_name;
/* rebuild full path for new format */
if (dad && dad->parent) {
strcpy(p, dad->full_name);
#ifdef DEBUG
if ((strlen(p) + l + 1) != allocl) {
DBG("%s: p: %d, l: %d, a: %d\n",
pathp, strlen(p), l, allocl);
}
#endif
p += strlen(p);
}
*(p++) = '/';
memcpy(p, pathp, l);
} else
memcpy(np->full_name, pathp, l);
prev_pp = &np->properties; prev_pp = &np->properties;
**allnextpp = np; **allnextpp = np;
*allnextpp = &np->allnext; *allnextpp = &np->allnext;
if (dad != NULL) { if (dad != NULL) {
np->parent = dad; np->parent = dad;
/* we temporarily use the `next' field as `last_child'. */ /* we temporarily use the next field as `last_child'*/
if (dad->next == 0) if (dad->next == 0)
dad->child = np; dad->child = np;
else else
...@@ -770,18 +834,26 @@ static unsigned long __init unflatten_dt_node(unsigned long mem, ...@@ -770,18 +834,26 @@ static unsigned long __init unflatten_dt_node(unsigned long mem,
char *pname; char *pname;
tag = *((u32 *)(*p)); tag = *((u32 *)(*p));
if (tag == OF_DT_NOP) {
*p += 4;
continue;
}
if (tag != OF_DT_PROP) if (tag != OF_DT_PROP)
break; break;
*p += 4; *p += 4;
sz = *((u32 *)(*p)); sz = *((u32 *)(*p));
noff = *((u32 *)((*p) + 4)); noff = *((u32 *)((*p) + 4));
*p = _ALIGN((*p) + 8, sz >= 8 ? 8 : 4); *p += 8;
if (initial_boot_params->version < 0x10)
*p = _ALIGN(*p, sz >= 8 ? 8 : 4);
pname = find_flat_dt_string(noff); pname = find_flat_dt_string(noff);
if (pname == NULL) { if (pname == NULL) {
printk("Can't find property name in list !\n"); printk("Can't find property name in list !\n");
break; break;
} }
if (strcmp(pname, "name") == 0)
has_name = 1;
l = strlen(pname) + 1; l = strlen(pname) + 1;
pp = unflatten_dt_alloc(&mem, sizeof(struct property), pp = unflatten_dt_alloc(&mem, sizeof(struct property),
__alignof__(struct property)); __alignof__(struct property));
...@@ -801,6 +873,36 @@ static unsigned long __init unflatten_dt_node(unsigned long mem, ...@@ -801,6 +873,36 @@ static unsigned long __init unflatten_dt_node(unsigned long mem,
} }
*p = _ALIGN((*p) + sz, 4); *p = _ALIGN((*p) + sz, 4);
} }
/* with version 0x10 we may not have the name property, recreate
* it here from the unit name if absent
*/
if (!has_name) {
char *p = pathp, *ps = pathp, *pa = NULL;
int sz;
while (*p) {
if ((*p) == '@')
pa = p;
if ((*p) == '/')
ps = p + 1;
p++;
}
if (pa < ps)
pa = p;
sz = (pa - ps) + 1;
pp = unflatten_dt_alloc(&mem, sizeof(struct property) + sz,
__alignof__(struct property));
if (allnextpp) {
pp->name = "name";
pp->length = sz;
pp->value = (unsigned char *)(pp + 1);
*prev_pp = pp;
prev_pp = &pp->next;
memcpy(pp->value, ps, sz - 1);
((char *)pp->value)[sz - 1] = 0;
DBG("fixed up name for %s -> %s\n", pathp, pp->value);
}
}
if (allnextpp) { if (allnextpp) {
*prev_pp = NULL; *prev_pp = NULL;
np->name = get_property(np, "name", NULL); np->name = get_property(np, "name", NULL);
...@@ -812,11 +914,11 @@ static unsigned long __init unflatten_dt_node(unsigned long mem, ...@@ -812,11 +914,11 @@ static unsigned long __init unflatten_dt_node(unsigned long mem,
np->type = "<NULL>"; np->type = "<NULL>";
} }
while (tag == OF_DT_BEGIN_NODE) { while (tag == OF_DT_BEGIN_NODE) {
mem = unflatten_dt_node(mem, p, np, allnextpp); mem = unflatten_dt_node(mem, p, np, allnextpp, fpsize);
tag = *((u32 *)(*p)); tag = *((u32 *)(*p));
} }
if (tag != OF_DT_END_NODE) { if (tag != OF_DT_END_NODE) {
printk("Weird tag at start of node: %x\n", tag); printk("Weird tag at end of node: %x\n", tag);
return mem; return mem;
} }
*p += 4; *p += 4;
...@@ -842,21 +944,32 @@ void __init unflatten_device_tree(void) ...@@ -842,21 +944,32 @@ void __init unflatten_device_tree(void)
/* First pass, scan for size */ /* First pass, scan for size */
start = ((unsigned long)initial_boot_params) + start = ((unsigned long)initial_boot_params) +
initial_boot_params->off_dt_struct; initial_boot_params->off_dt_struct;
size = unflatten_dt_node(0, &start, NULL, NULL); size = unflatten_dt_node(0, &start, NULL, NULL, 0);
size = (size | 3) + 1;
DBG(" size is %lx, allocating...\n", size); DBG(" size is %lx, allocating...\n", size);
/* Allocate memory for the expanded device tree */ /* Allocate memory for the expanded device tree */
mem = (unsigned long)abs_to_virt(lmb_alloc(size, mem = lmb_alloc(size + 4, __alignof__(struct device_node));
__alignof__(struct device_node))); if (!mem) {
DBG("Couldn't allocate memory with lmb_alloc()!\n");
panic("Couldn't allocate memory with lmb_alloc()!\n");
}
mem = (unsigned long)abs_to_virt(mem);
((u32 *)mem)[size / 4] = 0xdeadbeef;
DBG(" unflattening...\n", mem); DBG(" unflattening...\n", mem);
/* Second pass, do actual unflattening */ /* Second pass, do actual unflattening */
start = ((unsigned long)initial_boot_params) + start = ((unsigned long)initial_boot_params) +
initial_boot_params->off_dt_struct; initial_boot_params->off_dt_struct;
unflatten_dt_node(mem, &start, NULL, &allnextp); unflatten_dt_node(mem, &start, NULL, &allnextp, 0);
if (*((u32 *)start) != OF_DT_END) if (*((u32 *)start) != OF_DT_END)
printk(KERN_WARNING "Weird tag at end of tree: %x\n", *((u32 *)start)); printk(KERN_WARNING "Weird tag at end of tree: %08x\n", *((u32 *)start));
if (((u32 *)mem)[size / 4] != 0xdeadbeef)
printk(KERN_WARNING "End of tree marker overwritten: %08x\n",
((u32 *)mem)[size / 4] );
*allnextp = NULL; *allnextp = NULL;
/* Get pointer to OF "/chosen" node for use everywhere */ /* Get pointer to OF "/chosen" node for use everywhere */
...@@ -880,7 +993,7 @@ void __init unflatten_device_tree(void) ...@@ -880,7 +993,7 @@ void __init unflatten_device_tree(void)
static int __init early_init_dt_scan_cpus(unsigned long node, static int __init early_init_dt_scan_cpus(unsigned long node,
const char *full_path, void *data) const char *uname, int depth, void *data)
{ {
char *type = get_flat_dt_prop(node, "device_type", NULL); char *type = get_flat_dt_prop(node, "device_type", NULL);
u32 *prop; u32 *prop;
...@@ -947,13 +1060,15 @@ static int __init early_init_dt_scan_cpus(unsigned long node, ...@@ -947,13 +1060,15 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
} }
static int __init early_init_dt_scan_chosen(unsigned long node, static int __init early_init_dt_scan_chosen(unsigned long node,
const char *full_path, void *data) const char *uname, int depth, void *data)
{ {
u32 *prop; u32 *prop;
u64 *prop64; u64 *prop64;
extern unsigned long memory_limit, tce_alloc_start, tce_alloc_end; extern unsigned long memory_limit, tce_alloc_start, tce_alloc_end;
if (strcmp(full_path, "/chosen") != 0) DBG("search \"chosen\", depth: %d, uname: %s\n", depth, uname);
if (depth != 1 || strcmp(uname, "chosen") != 0)
return 0; return 0;
/* get platform type */ /* get platform type */
...@@ -1003,18 +1118,20 @@ static int __init early_init_dt_scan_chosen(unsigned long node, ...@@ -1003,18 +1118,20 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
} }
static int __init early_init_dt_scan_root(unsigned long node, static int __init early_init_dt_scan_root(unsigned long node,
const char *full_path, void *data) const char *uname, int depth, void *data)
{ {
u32 *prop; u32 *prop;
if (strcmp(full_path, "/") != 0) if (depth != 0)
return 0; return 0;
prop = (u32 *)get_flat_dt_prop(node, "#size-cells", NULL); prop = (u32 *)get_flat_dt_prop(node, "#size-cells", NULL);
dt_root_size_cells = (prop == NULL) ? 1 : *prop; dt_root_size_cells = (prop == NULL) ? 1 : *prop;
DBG("dt_root_size_cells = %x\n", dt_root_size_cells);
prop = (u32 *)get_flat_dt_prop(node, "#address-cells", NULL); prop = (u32 *)get_flat_dt_prop(node, "#address-cells", NULL);
dt_root_addr_cells = (prop == NULL) ? 2 : *prop; dt_root_addr_cells = (prop == NULL) ? 2 : *prop;
DBG("dt_root_addr_cells = %x\n", dt_root_addr_cells);
/* break now */ /* break now */
return 1; return 1;
...@@ -1042,7 +1159,7 @@ static unsigned long __init dt_mem_next_cell(int s, cell_t **cellp) ...@@ -1042,7 +1159,7 @@ static unsigned long __init dt_mem_next_cell(int s, cell_t **cellp)
static int __init early_init_dt_scan_memory(unsigned long node, static int __init early_init_dt_scan_memory(unsigned long node,
const char *full_path, void *data) const char *uname, int depth, void *data)
{ {
char *type = get_flat_dt_prop(node, "device_type", NULL); char *type = get_flat_dt_prop(node, "device_type", NULL);
cell_t *reg, *endp; cell_t *reg, *endp;
...@@ -1058,7 +1175,9 @@ static int __init early_init_dt_scan_memory(unsigned long node, ...@@ -1058,7 +1175,9 @@ static int __init early_init_dt_scan_memory(unsigned long node,
endp = reg + (l / sizeof(cell_t)); endp = reg + (l / sizeof(cell_t));
DBG("memory scan node %s ...\n", full_path); DBG("memory scan node %s ..., reg size %ld, data: %x %x %x %x, ...\n",
uname, l, reg[0], reg[1], reg[2], reg[3]);
while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) { while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {
unsigned long base, size; unsigned long base, size;
...@@ -1469,10 +1588,11 @@ struct device_node *of_find_node_by_path(const char *path) ...@@ -1469,10 +1588,11 @@ struct device_node *of_find_node_by_path(const char *path)
struct device_node *np = allnodes; struct device_node *np = allnodes;
read_lock(&devtree_lock); read_lock(&devtree_lock);
for (; np != 0; np = np->allnext) for (; np != 0; np = np->allnext) {
if (np->full_name != 0 && strcasecmp(np->full_name, path) == 0 if (np->full_name != 0 && strcasecmp(np->full_name, path) == 0
&& of_node_get(np)) && of_node_get(np))
break; break;
}
read_unlock(&devtree_lock); read_unlock(&devtree_lock);
return np; return np;
} }
......
arch/ppc64/kernel/prom_init.c
浏览文件 @ ed735ccb
...@@ -892,7 +892,10 @@ static void __init prom_init_mem(void) ...@@ -892,7 +892,10 @@ static void __init prom_init_mem(void)
if ( RELOC(of_platform) == PLATFORM_PSERIES_LPAR ) if ( RELOC(of_platform) == PLATFORM_PSERIES_LPAR )
RELOC(alloc_top) = RELOC(rmo_top); RELOC(alloc_top) = RELOC(rmo_top);
else else
RELOC(alloc_top) = RELOC(rmo_top) = min(0x40000000ul, RELOC(ram_top)); /* Some RS64 machines have buggy firmware where claims up at 1GB
* fails. Cap at 768MB as a workaround. Still plenty of room.
*/
RELOC(alloc_top) = RELOC(rmo_top) = min(0x30000000ul, RELOC(ram_top));
prom_printf("memory layout at init:\n"); prom_printf("memory layout at init:\n");
prom_printf(" memory_limit : %x (16 MB aligned)\n", RELOC(prom_memory_limit)); prom_printf(" memory_limit : %x (16 MB aligned)\n", RELOC(prom_memory_limit));
...@@ -1534,7 +1537,8 @@ static unsigned long __init dt_find_string(char *str) ...@@ -1534,7 +1537,8 @@ static unsigned long __init dt_find_string(char *str)
*/ */
#define MAX_PROPERTY_NAME 64 #define MAX_PROPERTY_NAME 64
static void __init scan_dt_build_strings(phandle node, unsigned long *mem_start, static void __init scan_dt_build_strings(phandle node,
unsigned long *mem_start,
unsigned long *mem_end) unsigned long *mem_end)
{ {
unsigned long offset = reloc_offset(); unsigned long offset = reloc_offset();
...@@ -1547,16 +1551,21 @@ static void __init scan_dt_build_strings(phandle node, unsigned long *mem_start, ...@@ -1547,16 +1551,21 @@ static void __init scan_dt_build_strings(phandle node, unsigned long *mem_start,
/* get and store all property names */ /* get and store all property names */
prev_name = RELOC(""); prev_name = RELOC("");
for (;;) { for (;;) {
int rc;
/* 64 is max len of name including nul. */ /* 64 is max len of name including nul. */
namep = make_room(mem_start, mem_end, MAX_PROPERTY_NAME, 1); namep = make_room(mem_start, mem_end, MAX_PROPERTY_NAME, 1);
rc = call_prom("nextprop", 3, 1, node, prev_name, namep); if (call_prom("nextprop", 3, 1, node, prev_name, namep) != 1) {
if (rc != 1) {
/* No more nodes: unwind alloc */ /* No more nodes: unwind alloc */
*mem_start = (unsigned long)namep; *mem_start = (unsigned long)namep;
break; break;
} }
/* skip "name" */
if (strcmp(namep, RELOC("name")) == 0) {
*mem_start = (unsigned long)namep;
prev_name = RELOC("name");
continue;
}
/* get/create string entry */
soff = dt_find_string(namep); soff = dt_find_string(namep);
if (soff != 0) { if (soff != 0) {
*mem_start = (unsigned long)namep; *mem_start = (unsigned long)namep;
...@@ -1571,7 +1580,7 @@ static void __init scan_dt_build_strings(phandle node, unsigned long *mem_start, ...@@ -1571,7 +1580,7 @@ static void __init scan_dt_build_strings(phandle node, unsigned long *mem_start,
/* do all our children */ /* do all our children */
child = call_prom("child", 1, 1, node); child = call_prom("child", 1, 1, node);
while (child != (phandle)0) { while (child != 0) {
scan_dt_build_strings(child, mem_start, mem_end); scan_dt_build_strings(child, mem_start, mem_end);
child = call_prom("peer", 1, 1, child); child = call_prom("peer", 1, 1, child);
} }
...@@ -1580,16 +1589,13 @@ static void __init scan_dt_build_strings(phandle node, unsigned long *mem_start, ...@@ -1580,16 +1589,13 @@ static void __init scan_dt_build_strings(phandle node, unsigned long *mem_start,
static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start, static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
unsigned long *mem_end) unsigned long *mem_end)
{ {
int l, align;
phandle child; phandle child;
char *namep, *prev_name, *sstart, *p, *ep; char *namep, *prev_name, *sstart, *p, *ep, *lp, *path;
unsigned long soff; unsigned long soff;
unsigned char *valp; unsigned char *valp;
unsigned long offset = reloc_offset(); unsigned long offset = reloc_offset();
char pname[MAX_PROPERTY_NAME]; static char pname[MAX_PROPERTY_NAME];
char *path; int l;
path = RELOC(prom_scratch);
dt_push_token(OF_DT_BEGIN_NODE, mem_start, mem_end); dt_push_token(OF_DT_BEGIN_NODE, mem_start, mem_end);
...@@ -1599,23 +1605,33 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start, ...@@ -1599,23 +1605,33 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
namep, *mem_end - *mem_start); namep, *mem_end - *mem_start);
if (l >= 0) { if (l >= 0) {
/* Didn't fit? Get more room. */ /* Didn't fit? Get more room. */
if (l+1 > *mem_end - *mem_start) { if ((l+1) > (*mem_end - *mem_start)) {
namep = make_room(mem_start, mem_end, l+1, 1); namep = make_room(mem_start, mem_end, l+1, 1);
call_prom("package-to-path", 3, 1, node, namep, l); call_prom("package-to-path", 3, 1, node, namep, l);
} }
namep[l] = '\0'; namep[l] = '\0';
/* Fixup an Apple bug where they have bogus \0 chars in the /* Fixup an Apple bug where they have bogus \0 chars in the
* middle of the path in some properties * middle of the path in some properties
*/ */
for (p = namep, ep = namep + l; p < ep; p++) for (p = namep, ep = namep + l; p < ep; p++)
if (*p == '\0') { if (*p == '\0') {
memmove(p, p+1, ep - p); memmove(p, p+1, ep - p);
ep--; l--; ep--; l--; p--;
} }
*mem_start = _ALIGN(((unsigned long) namep) + strlen(namep) + 1, 4);
/* now try to extract the unit name in that mess */
for (p = namep, lp = NULL; *p; p++)
if (*p == '/')
lp = p + 1;
if (lp != NULL)
memmove(namep, lp, strlen(lp) + 1);
*mem_start = _ALIGN(((unsigned long) namep) +
strlen(namep) + 1, 4);
} }
/* get it again for debugging */ /* get it again for debugging */
path = RELOC(prom_scratch);
memset(path, 0, PROM_SCRATCH_SIZE); memset(path, 0, PROM_SCRATCH_SIZE);
call_prom("package-to-path", 3, 1, node, path, PROM_SCRATCH_SIZE-1); call_prom("package-to-path", 3, 1, node, path, PROM_SCRATCH_SIZE-1);
...@@ -1623,23 +1639,27 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start, ...@@ -1623,23 +1639,27 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
prev_name = RELOC(""); prev_name = RELOC("");
sstart = (char *)RELOC(dt_string_start); sstart = (char *)RELOC(dt_string_start);
for (;;) { for (;;) {
int rc; if (call_prom("nextprop", 3, 1, node, prev_name,
RELOC(pname)) != 1)
rc = call_prom("nextprop", 3, 1, node, prev_name, pname);
if (rc != 1)
break; break;
/* skip "name" */
if (strcmp(RELOC(pname), RELOC("name")) == 0) {
prev_name = RELOC("name");
continue;
}
/* find string offset */ /* find string offset */
soff = dt_find_string(pname); soff = dt_find_string(RELOC(pname));
if (soff == 0) { if (soff == 0) {
prom_printf("WARNING: Can't find string index for <%s>, node %s\n", prom_printf("WARNING: Can't find string index for"
pname, path); " <%s>, node %s\n", RELOC(pname), path);
break; break;
} }
prev_name = sstart + soff; prev_name = sstart + soff;
/* get length */ /* get length */
l = call_prom("getproplen", 2, 1, node, pname); l = call_prom("getproplen", 2, 1, node, RELOC(pname));
/* sanity checks */ /* sanity checks */
if (l == PROM_ERROR) if (l == PROM_ERROR)
...@@ -1648,7 +1668,7 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start, ...@@ -1648,7 +1668,7 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
prom_printf("WARNING: ignoring large property "); prom_printf("WARNING: ignoring large property ");
/* It seems OF doesn't null-terminate the path :-( */ /* It seems OF doesn't null-terminate the path :-( */
prom_printf("[%s] ", path); prom_printf("[%s] ", path);
prom_printf("%s length 0x%x\n", pname, l); prom_printf("%s length 0x%x\n", RELOC(pname), l);
continue; continue;
} }
...@@ -1658,17 +1678,16 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start, ...@@ -1658,17 +1678,16 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
dt_push_token(soff, mem_start, mem_end); dt_push_token(soff, mem_start, mem_end);
/* push property content */ /* push property content */
align = (l >= 8) ? 8 : 4; valp = make_room(mem_start, mem_end, l, 4);
valp = make_room(mem_start, mem_end, l, align); call_prom("getprop", 4, 1, node, RELOC(pname), valp, l);
call_prom("getprop", 4, 1, node, pname, valp, l);
*mem_start = _ALIGN(*mem_start, 4); *mem_start = _ALIGN(*mem_start, 4);
} }
/* Add a "linux,phandle" property. */ /* Add a "linux,phandle" property. */
soff = dt_find_string(RELOC("linux,phandle")); soff = dt_find_string(RELOC("linux,phandle"));
if (soff == 0) if (soff == 0)
prom_printf("WARNING: Can't find string index for <linux-phandle>" prom_printf("WARNING: Can't find string index for"
" node %s\n", path); " <linux-phandle> node %s\n", path);
else { else {
dt_push_token(OF_DT_PROP, mem_start, mem_end); dt_push_token(OF_DT_PROP, mem_start, mem_end);
dt_push_token(4, mem_start, mem_end); dt_push_token(4, mem_start, mem_end);
...@@ -1679,7 +1698,7 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start, ...@@ -1679,7 +1698,7 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
/* do all our children */ /* do all our children */
child = call_prom("child", 1, 1, node); child = call_prom("child", 1, 1, node);
while (child != (phandle)0) { while (child != 0) {
scan_dt_build_struct(child, mem_start, mem_end); scan_dt_build_struct(child, mem_start, mem_end);
child = call_prom("peer", 1, 1, child); child = call_prom("peer", 1, 1, child);
} }
...@@ -1718,7 +1737,8 @@ static void __init flatten_device_tree(void) ...@@ -1718,7 +1737,8 @@ static void __init flatten_device_tree(void)
/* Build header and make room for mem rsv map */ /* Build header and make room for mem rsv map */
mem_start = _ALIGN(mem_start, 4); mem_start = _ALIGN(mem_start, 4);
hdr = make_room(&mem_start, &mem_end, sizeof(struct boot_param_header), 4); hdr = make_room(&mem_start, &mem_end,
sizeof(struct boot_param_header), 4);
RELOC(dt_header_start) = (unsigned long)hdr; RELOC(dt_header_start) = (unsigned long)hdr;
rsvmap = make_room(&mem_start, &mem_end, sizeof(mem_reserve_map), 8); rsvmap = make_room(&mem_start, &mem_end, sizeof(mem_reserve_map), 8);
...@@ -1731,11 +1751,11 @@ static void __init flatten_device_tree(void) ...@@ -1731,11 +1751,11 @@ static void __init flatten_device_tree(void)
namep = make_room(&mem_start, &mem_end, 16, 1); namep = make_room(&mem_start, &mem_end, 16, 1);
strcpy(namep, RELOC("linux,phandle")); strcpy(namep, RELOC("linux,phandle"));
mem_start = (unsigned long)namep + strlen(namep) + 1; mem_start = (unsigned long)namep + strlen(namep) + 1;
RELOC(dt_string_end) = mem_start;
/* Build string array */ /* Build string array */
prom_printf("Building dt strings...\n"); prom_printf("Building dt strings...\n");
scan_dt_build_strings(root, &mem_start, &mem_end); scan_dt_build_strings(root, &mem_start, &mem_end);
RELOC(dt_string_end) = mem_start;
/* Build structure */ /* Build structure */
mem_start = PAGE_ALIGN(mem_start); mem_start = PAGE_ALIGN(mem_start);
...@@ -1750,9 +1770,11 @@ static void __init flatten_device_tree(void) ...@@ -1750,9 +1770,11 @@ static void __init flatten_device_tree(void)
hdr->totalsize = RELOC(dt_struct_end) - RELOC(dt_header_start); hdr->totalsize = RELOC(dt_struct_end) - RELOC(dt_header_start);
hdr->off_dt_struct = RELOC(dt_struct_start) - RELOC(dt_header_start); hdr->off_dt_struct = RELOC(dt_struct_start) - RELOC(dt_header_start);
hdr->off_dt_strings = RELOC(dt_string_start) - RELOC(dt_header_start); hdr->off_dt_strings = RELOC(dt_string_start) - RELOC(dt_header_start);
hdr->dt_strings_size = RELOC(dt_string_end) - RELOC(dt_string_start);
hdr->off_mem_rsvmap = ((unsigned long)rsvmap) - RELOC(dt_header_start); hdr->off_mem_rsvmap = ((unsigned long)rsvmap) - RELOC(dt_header_start);
hdr->version = OF_DT_VERSION; hdr->version = OF_DT_VERSION;
hdr->last_comp_version = 1; /* Version 16 is not backward compatible */
hdr->last_comp_version = 0x10;
/* Reserve the whole thing and copy the reserve map in, we /* Reserve the whole thing and copy the reserve map in, we
* also bump mem_reserve_cnt to cause further reservations to * also bump mem_reserve_cnt to cause further reservations to
...@@ -1808,6 +1830,9 @@ static void __init fixup_device_tree(void) ...@@ -1808,6 +1830,9 @@ static void __init fixup_device_tree(void)
/* does it need fixup ? */ /* does it need fixup ? */
if (prom_getproplen(i2c, "interrupts") > 0) if (prom_getproplen(i2c, "interrupts") > 0)
return; return;
prom_printf("fixing up bogus interrupts for u3 i2c...\n");
/* interrupt on this revision of u3 is number 0 and level */ /* interrupt on this revision of u3 is number 0 and level */
interrupts[0] = 0; interrupts[0] = 0;
interrupts[1] = 1; interrupts[1] = 1;
......
arch/ppc64/kernel/rtas_pci.c
浏览文件 @ ed735ccb
...@@ -58,6 +58,21 @@ static int config_access_valid(struct device_node *dn, int where) ...@@ -58,6 +58,21 @@ static int config_access_valid(struct device_node *dn, int where)
return 0; return 0;
} }
static int of_device_available(struct device_node * dn)
{
char * status;
status = get_property(dn, "status", NULL);
if (!status)
return 1;
if (!strcmp(status, "okay"))
return 1;
return 0;
}
static int rtas_read_config(struct device_node *dn, int where, int size, u32 *val) static int rtas_read_config(struct device_node *dn, int where, int size, u32 *val)
{ {
int returnval = -1; int returnval = -1;
...@@ -103,7 +118,7 @@ static int rtas_pci_read_config(struct pci_bus *bus, ...@@ -103,7 +118,7 @@ static int rtas_pci_read_config(struct pci_bus *bus,
/* Search only direct children of the bus */ /* Search only direct children of the bus */
for (dn = busdn->child; dn; dn = dn->sibling) for (dn = busdn->child; dn; dn = dn->sibling)
if (dn->devfn == devfn) if (dn->devfn == devfn && of_device_available(dn))
return rtas_read_config(dn, where, size, val); return rtas_read_config(dn, where, size, val);
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
} }
...@@ -146,7 +161,7 @@ static int rtas_pci_write_config(struct pci_bus *bus, ...@@ -146,7 +161,7 @@ static int rtas_pci_write_config(struct pci_bus *bus,
/* Search only direct children of the bus */ /* Search only direct children of the bus */
for (dn = busdn->child; dn; dn = dn->sibling) for (dn = busdn->child; dn; dn = dn->sibling)
if (dn->devfn == devfn) if (dn->devfn == devfn && of_device_available(dn))
return rtas_write_config(dn, where, size, val); return rtas_write_config(dn, where, size, val);
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
} }
......
arch/ppc64/kernel/setup.c
浏览文件 @ ed735ccb
...@@ -536,15 +536,19 @@ static void __init check_for_initrd(void) ...@@ -536,15 +536,19 @@ static void __init check_for_initrd(void)
DBG(" -> check_for_initrd()\n"); DBG(" -> check_for_initrd()\n");
prop = (u64 *)get_property(of_chosen, "linux,initrd-start", NULL); if (of_chosen) {
if (prop != NULL) { prop = (u64 *)get_property(of_chosen,
initrd_start = (unsigned long)__va(*prop); "linux,initrd-start", NULL);
prop = (u64 *)get_property(of_chosen, "linux,initrd-end", NULL);
if (prop != NULL) { if (prop != NULL) {
initrd_end = (unsigned long)__va(*prop); initrd_start = (unsigned long)__va(*prop);
initrd_below_start_ok = 1; prop = (u64 *)get_property(of_chosen,
} else "linux,initrd-end", NULL);
initrd_start = 0; if (prop != NULL) {
initrd_end = (unsigned long)__va(*prop);
initrd_below_start_ok = 1;
} else
initrd_start = 0;
}
} }
/* If we were passed an initrd, set the ROOT_DEV properly if the values /* If we were passed an initrd, set the ROOT_DEV properly if the values
...@@ -627,7 +631,7 @@ void __init setup_system(void) ...@@ -627,7 +631,7 @@ void __init setup_system(void)
* Initialize xmon * Initialize xmon
*/ */
#ifdef CONFIG_XMON_DEFAULT #ifdef CONFIG_XMON_DEFAULT
xmon_init(); xmon_init(1);
#endif #endif
/* /*
* Register early console * Register early console
...@@ -1343,11 +1347,13 @@ static int __init early_xmon(char *p) ...@@ -1343,11 +1347,13 @@ static int __init early_xmon(char *p)
/* ensure xmon is enabled */ /* ensure xmon is enabled */
if (p) { if (p) {
if (strncmp(p, "on", 2) == 0) if (strncmp(p, "on", 2) == 0)
xmon_init(); xmon_init(1);
if (strncmp(p, "off", 3) == 0)
xmon_init(0);
if (strncmp(p, "early", 5) != 0) if (strncmp(p, "early", 5) != 0)
return 0; return 0;
} }
xmon_init(); xmon_init(1);
debugger(NULL); debugger(NULL);
return 0; return 0;
......
arch/ppc64/kernel/sysfs.c
浏览文件 @ ed735ccb
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <asm/current.h> #include <asm/current.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/firmware.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
...@@ -100,6 +101,8 @@ static int __init setup_smt_snooze_delay(char *str) ...@@ -100,6 +101,8 @@ static int __init setup_smt_snooze_delay(char *str)
} }
__setup("smt-snooze-delay=", setup_smt_snooze_delay); __setup("smt-snooze-delay=", setup_smt_snooze_delay);
#endif /* CONFIG_PPC_MULTIPLATFORM */
/* /*
* Enabling PMCs will slow partition context switch times so we only do * Enabling PMCs will slow partition context switch times so we only do
* it the first time we write to the PMCs. * it the first time we write to the PMCs.
...@@ -109,65 +112,15 @@ static DEFINE_PER_CPU(char, pmcs_enabled); ...@@ -109,65 +112,15 @@ static DEFINE_PER_CPU(char, pmcs_enabled);
void ppc64_enable_pmcs(void) void ppc64_enable_pmcs(void)
{ {
unsigned long hid0;
#ifdef CONFIG_PPC_PSERIES
unsigned long set, reset;
#endif /* CONFIG_PPC_PSERIES */
/* Only need to enable them once */ /* Only need to enable them once */
if (__get_cpu_var(pmcs_enabled)) if (__get_cpu_var(pmcs_enabled))
return; return;
__get_cpu_var(pmcs_enabled) = 1; __get_cpu_var(pmcs_enabled) = 1;
switch (systemcfg->platform) { if (ppc_md.enable_pmcs)
case PLATFORM_PSERIES: ppc_md.enable_pmcs();
case PLATFORM_POWERMAC:
hid0 = mfspr(HID0);
hid0 |= 1UL << (63 - 20);
/* POWER4 requires the following sequence */
asm volatile(
"sync\n"
"mtspr %1, %0\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"mfspr %0, %1\n"
"isync" : "=&r" (hid0) : "i" (HID0), "0" (hid0):
"memory");
break;
#ifdef CONFIG_PPC_PSERIES
case PLATFORM_PSERIES_LPAR:
set = 1UL << 63;
reset = 0;
plpar_hcall_norets(H_PERFMON, set, reset);
break;
#endif /* CONFIG_PPC_PSERIES */
default:
break;
}
#ifdef CONFIG_PPC_PSERIES
/* instruct hypervisor to maintain PMCs */
if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR)
get_paca()->lppaca.pmcregs_in_use = 1;
#endif /* CONFIG_PPC_PSERIES */
} }
#else
/* PMC stuff */
void ppc64_enable_pmcs(void)
{
/* XXX Implement for iseries */
}
#endif /* CONFIG_PPC_MULTIPLATFORM */
EXPORT_SYMBOL(ppc64_enable_pmcs); EXPORT_SYMBOL(ppc64_enable_pmcs);
/* XXX convert to rusty's on_one_cpu */ /* XXX convert to rusty's on_one_cpu */
......
arch/ppc64/kernel/time.c
浏览文件 @ ed735ccb
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
#include <asm/firmware.h>
u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
...@@ -370,13 +371,11 @@ int timer_interrupt(struct pt_regs * regs) ...@@ -370,13 +371,11 @@ int timer_interrupt(struct pt_regs * regs)
process_hvlpevents(regs); process_hvlpevents(regs);
#endif #endif
/* collect purr register values often, for accurate calculations */ /* collect purr register values often, for accurate calculations */
#if defined(CONFIG_PPC_PSERIES) if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) {
struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array); struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array);
cu->current_tb = mfspr(SPRN_PURR); cu->current_tb = mfspr(SPRN_PURR);
} }
#endif
irq_exit(); irq_exit();
......
arch/ppc64/kernel/vio.c
浏览文件 @ ed735ccb
/* /*
* IBM PowerPC Virtual I/O Infrastructure Support. * IBM PowerPC Virtual I/O Infrastructure Support.
* *
* Copyright (c) 2003 IBM Corp. * Copyright (c) 2003-2005 IBM Corp.
* Dave Engebretsen engebret@us.ibm.com * Dave Engebretsen engebret@us.ibm.com
* Santiago Leon santil@us.ibm.com * Santiago Leon santil@us.ibm.com
* Hollis Blanchard <hollisb@us.ibm.com> * Hollis Blanchard <hollisb@us.ibm.com>
* Stephen Rothwell
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -14,61 +15,30 @@ ...@@ -14,61 +15,30 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kobject.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <asm/rtas.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/ppcdebug.h>
#include <asm/vio.h> #include <asm/vio.h>
#include <asm/hvcall.h>
#include <asm/iSeries/vio.h>
#include <asm/iSeries/HvTypes.h>
#include <asm/iSeries/HvCallXm.h>
#include <asm/iSeries/HvLpConfig.h>
#define DBGENTER() pr_debug("%s entered\n", __FUNCTION__)
extern struct subsystem devices_subsys; /* needed for vio_find_name() */
static const struct vio_device_id *vio_match_device( static const struct vio_device_id *vio_match_device(
const struct vio_device_id *, const struct vio_dev *); const struct vio_device_id *, const struct vio_dev *);
#ifdef CONFIG_PPC_PSERIES struct vio_dev vio_bus_device = { /* fake "parent" device */
static struct iommu_table *vio_build_iommu_table(struct vio_dev *);
static int vio_num_address_cells;
#endif
#ifdef CONFIG_PPC_ISERIES
static struct iommu_table veth_iommu_table;
static struct iommu_table vio_iommu_table;
#endif
static struct vio_dev vio_bus_device = { /* fake "parent" device */
.name = vio_bus_device.dev.bus_id, .name = vio_bus_device.dev.bus_id,
.type = "", .type = "",
#ifdef CONFIG_PPC_ISERIES
.iommu_table = &vio_iommu_table,
#endif
.dev.bus_id = "vio", .dev.bus_id = "vio",
.dev.bus = &vio_bus_type, .dev.bus = &vio_bus_type,
}; };
#ifdef CONFIG_PPC_ISERIES static struct vio_bus_ops vio_bus_ops;
static struct vio_dev *__init vio_register_device_iseries(char *type,
uint32_t unit_num);
struct device *iSeries_vio_dev = &vio_bus_device.dev;
EXPORT_SYMBOL(iSeries_vio_dev);
#define device_is_compatible(a, b) 1
#endif /*
* Convert from struct device to struct vio_dev and pass to driver.
/* convert from struct device to struct vio_dev and pass to driver.
* dev->driver has already been set by generic code because vio_bus_match * dev->driver has already been set by generic code because vio_bus_match
* succeeded. */ * succeeded.
*/
static int vio_bus_probe(struct device *dev) static int vio_bus_probe(struct device *dev)
{ {
struct vio_dev *viodev = to_vio_dev(dev); struct vio_dev *viodev = to_vio_dev(dev);
...@@ -76,15 +46,12 @@ static int vio_bus_probe(struct device *dev) ...@@ -76,15 +46,12 @@ static int vio_bus_probe(struct device *dev)
const struct vio_device_id *id; const struct vio_device_id *id;
int error = -ENODEV; int error = -ENODEV;
DBGENTER();
if (!viodrv->probe) if (!viodrv->probe)
return error; return error;
id = vio_match_device(viodrv->id_table, viodev); id = vio_match_device(viodrv->id_table, viodev);
if (id) { if (id)
error = viodrv->probe(viodev, id); error = viodrv->probe(viodev, id);
}
return error; return error;
} }
...@@ -95,11 +62,8 @@ static int vio_bus_remove(struct device *dev) ...@@ -95,11 +62,8 @@ static int vio_bus_remove(struct device *dev)
struct vio_dev *viodev = to_vio_dev(dev); struct vio_dev *viodev = to_vio_dev(dev);
struct vio_driver *viodrv = to_vio_driver(dev->driver); struct vio_driver *viodrv = to_vio_driver(dev->driver);
DBGENTER(); if (viodrv->remove)
if (viodrv->remove) {
return viodrv->remove(viodev); return viodrv->remove(viodev);
}
/* driver can't remove */ /* driver can't remove */
return 1; return 1;
...@@ -135,193 +99,72 @@ void vio_unregister_driver(struct vio_driver *viodrv) ...@@ -135,193 +99,72 @@ void vio_unregister_driver(struct vio_driver *viodrv)
EXPORT_SYMBOL(vio_unregister_driver); EXPORT_SYMBOL(vio_unregister_driver);
/** /**
* vio_match_device: - Tell if a VIO device has a matching VIO device id structure. * vio_match_device: - Tell if a VIO device has a matching
* @ids: array of VIO device id structures to search in * VIO device id structure.
* @dev: the VIO device structure to match against * @ids: array of VIO device id structures to search in
* @dev: the VIO device structure to match against
* *
* Used by a driver to check whether a VIO device present in the * Used by a driver to check whether a VIO device present in the
* system is in its list of supported devices. Returns the matching * system is in its list of supported devices. Returns the matching
* vio_device_id structure or NULL if there is no match. * vio_device_id structure or NULL if there is no match.
*/ */
static const struct vio_device_id * vio_match_device(const struct vio_device_id *ids, static const struct vio_device_id *vio_match_device(
const struct vio_dev *dev) const struct vio_device_id *ids, const struct vio_dev *dev)
{ {
DBGENTER(); while (ids->type[0] != '\0') {
if (vio_bus_ops.match(ids, dev))
while (ids->type) {
if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&
device_is_compatible(dev->dev.platform_data, ids->compat))
return ids; return ids;
ids++; ids++;
} }
return NULL; return NULL;
} }
#ifdef CONFIG_PPC_ISERIES
void __init iommu_vio_init(void)
{
struct iommu_table *t;
struct iommu_table_cb cb;
unsigned long cbp;
unsigned long itc_entries;
cb.itc_busno = 255; /* Bus 255 is the virtual bus */
cb.itc_virtbus = 0xff; /* Ask for virtual bus */
cbp = virt_to_abs(&cb);
HvCallXm_getTceTableParms(cbp);
itc_entries = cb.itc_size * PAGE_SIZE / sizeof(union tce_entry);
veth_iommu_table.it_size = itc_entries / 2;
veth_iommu_table.it_busno = cb.itc_busno;
veth_iommu_table.it_offset = cb.itc_offset;
veth_iommu_table.it_index = cb.itc_index;
veth_iommu_table.it_type = TCE_VB;
veth_iommu_table.it_blocksize = 1;
t = iommu_init_table(&veth_iommu_table);
if (!t)
printk("Virtual Bus VETH TCE table failed.\n");
vio_iommu_table.it_size = itc_entries - veth_iommu_table.it_size;
vio_iommu_table.it_busno = cb.itc_busno;
vio_iommu_table.it_offset = cb.itc_offset +
veth_iommu_table.it_size;
vio_iommu_table.it_index = cb.itc_index;
vio_iommu_table.it_type = TCE_VB;
vio_iommu_table.it_blocksize = 1;
t = iommu_init_table(&vio_iommu_table);
if (!t)
printk("Virtual Bus VIO TCE table failed.\n");
}
#endif
#ifdef CONFIG_PPC_PSERIES
static void probe_bus_pseries(void)
{
struct device_node *node_vroot, *of_node;
node_vroot = find_devices("vdevice");
if ((node_vroot == NULL) || (node_vroot->child == NULL))
/* this machine doesn't do virtual IO, and that's ok */
return;
vio_num_address_cells = prom_n_addr_cells(node_vroot->child);
/*
* Create struct vio_devices for each virtual device in the device tree.
* Drivers will associate with them later.
*/
for (of_node = node_vroot->child; of_node != NULL;
of_node = of_node->sibling) {
printk(KERN_DEBUG "%s: processing %p\n", __FUNCTION__, of_node);
vio_register_device_node(of_node);
}
}
#endif
#ifdef CONFIG_PPC_ISERIES
static void probe_bus_iseries(void)
{
HvLpIndexMap vlan_map = HvLpConfig_getVirtualLanIndexMap();
struct vio_dev *viodev;
int i;
/* there is only one of each of these */
vio_register_device_iseries("viocons", 0);
vio_register_device_iseries("vscsi", 0);
vlan_map = HvLpConfig_getVirtualLanIndexMap();
for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++) {
if ((vlan_map & (0x8000 >> i)) == 0)
continue;
viodev = vio_register_device_iseries("vlan", i);
/* veth is special and has it own iommu_table */
viodev->iommu_table = &veth_iommu_table;
}
for (i = 0; i < HVMAXARCHITECTEDVIRTUALDISKS; i++)
vio_register_device_iseries("viodasd", i);
for (i = 0; i < HVMAXARCHITECTEDVIRTUALCDROMS; i++)
vio_register_device_iseries("viocd", i);
for (i = 0; i < HVMAXARCHITECTEDVIRTUALTAPES; i++)
vio_register_device_iseries("viotape", i);
}
#endif
/** /**
* vio_bus_init: - Initialize the virtual IO bus * vio_bus_init: - Initialize the virtual IO bus
*/ */
static int __init vio_bus_init(void) int __init vio_bus_init(struct vio_bus_ops *ops)
{ {
int err; int err;
vio_bus_ops = *ops;
err = bus_register(&vio_bus_type); err = bus_register(&vio_bus_type);
if (err) { if (err) {
printk(KERN_ERR "failed to register VIO bus\n"); printk(KERN_ERR "failed to register VIO bus\n");
return err; return err;
} }
/* the fake parent of all vio devices, just to give us a nice directory */ /*
* The fake parent of all vio devices, just to give us
* a nice directory
*/
err = device_register(&vio_bus_device.dev); err = device_register(&vio_bus_device.dev);
if (err) { if (err) {
printk(KERN_WARNING "%s: device_register returned %i\n", __FUNCTION__, printk(KERN_WARNING "%s: device_register returned %i\n",
err); __FUNCTION__, err);
return err; return err;
} }
#ifdef CONFIG_PPC_PSERIES
probe_bus_pseries();
#endif
#ifdef CONFIG_PPC_ISERIES
probe_bus_iseries();
#endif
return 0; return 0;
} }
__initcall(vio_bus_init);
/* vio_dev refcount hit 0 */ /* vio_dev refcount hit 0 */
static void __devinit vio_dev_release(struct device *dev) static void __devinit vio_dev_release(struct device *dev)
{ {
DBGENTER(); if (vio_bus_ops.release_device)
vio_bus_ops.release_device(dev);
#ifdef CONFIG_PPC_PSERIES
/* XXX free TCE table */
of_node_put(dev->platform_data);
#endif
kfree(to_vio_dev(dev)); kfree(to_vio_dev(dev));
} }
#ifdef CONFIG_PPC_PSERIES static ssize_t viodev_show_name(struct device *dev,
static ssize_t viodev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{
struct device_node *of_node = dev->platform_data;
return sprintf(buf, "%s\n", of_node->full_name);
}
DEVICE_ATTR(devspec, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_devspec, NULL);
#endif
static ssize_t viodev_show_name(struct device *dev, struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "%s\n", to_vio_dev(dev)->name); return sprintf(buf, "%s\n", to_vio_dev(dev)->name);
} }
DEVICE_ATTR(name, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_name, NULL); DEVICE_ATTR(name, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_name, NULL);
static struct vio_dev * __devinit vio_register_device_common( struct vio_dev * __devinit vio_register_device(struct vio_dev *viodev)
struct vio_dev *viodev, char *name, char *type,
uint32_t unit_address, struct iommu_table *iommu_table)
{ {
DBGENTER();
viodev->name = name;
viodev->type = type;
viodev->unit_address = unit_address;
viodev->iommu_table = iommu_table;
/* init generic 'struct device' fields: */ /* init generic 'struct device' fields: */
viodev->dev.parent = &vio_bus_device.dev; viodev->dev.parent = &vio_bus_device.dev;
viodev->dev.bus = &vio_bus_type; viodev->dev.bus = &vio_bus_type;
...@@ -338,222 +181,15 @@ static struct vio_dev * __devinit vio_register_device_common( ...@@ -338,222 +181,15 @@ static struct vio_dev * __devinit vio_register_device_common(
return viodev; return viodev;
} }
#ifdef CONFIG_PPC_PSERIES
/**
* vio_register_device_node: - Register a new vio device.
* @of_node: The OF node for this device.
*
* Creates and initializes a vio_dev structure from the data in
* of_node (dev.platform_data) and adds it to the list of virtual devices.
* Returns a pointer to the created vio_dev or NULL if node has
* NULL device_type or compatible fields.
*/
struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)
{
struct vio_dev *viodev;
unsigned int *unit_address;
unsigned int *irq_p;
DBGENTER();
/* we need the 'device_type' property, in order to match with drivers */
if ((NULL == of_node->type)) {
printk(KERN_WARNING
"%s: node %s missing 'device_type'\n", __FUNCTION__,
of_node->name ? of_node->name : "<unknown>");
return NULL;
}
unit_address = (unsigned int *)get_property(of_node, "reg", NULL);
if (!unit_address) {
printk(KERN_WARNING "%s: node %s missing 'reg'\n", __FUNCTION__,
of_node->name ? of_node->name : "<unknown>");
return NULL;
}
/* allocate a vio_dev for this node */
viodev = kmalloc(sizeof(struct vio_dev), GFP_KERNEL);
if (!viodev) {
return NULL;
}
memset(viodev, 0, sizeof(struct vio_dev));
viodev->dev.platform_data = of_node_get(of_node);
viodev->irq = NO_IRQ;
irq_p = (unsigned int *)get_property(of_node, "interrupts", NULL);
if (irq_p) {
int virq = virt_irq_create_mapping(*irq_p);
if (virq == NO_IRQ) {
printk(KERN_ERR "Unable to allocate interrupt "
"number for %s\n", of_node->full_name);
} else
viodev->irq = irq_offset_up(virq);
}
snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%x", *unit_address);
/* register with generic device framework */
if (vio_register_device_common(viodev, of_node->name, of_node->type,
*unit_address, vio_build_iommu_table(viodev))
== NULL) {
/* XXX free TCE table */
kfree(viodev);
return NULL;
}
device_create_file(&viodev->dev, &dev_attr_devspec);
return viodev;
}
EXPORT_SYMBOL(vio_register_device_node);
#endif
#ifdef CONFIG_PPC_ISERIES
/**
* vio_register_device: - Register a new vio device.
* @voidev: The device to register.
*/
static struct vio_dev *__init vio_register_device_iseries(char *type,
uint32_t unit_num)
{
struct vio_dev *viodev;
DBGENTER();
/* allocate a vio_dev for this node */
viodev = kmalloc(sizeof(struct vio_dev), GFP_KERNEL);
if (!viodev)
return NULL;
memset(viodev, 0, sizeof(struct vio_dev));
snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%s%d", type, unit_num);
return vio_register_device_common(viodev, viodev->dev.bus_id, type,
unit_num, &vio_iommu_table);
}
#endif
void __devinit vio_unregister_device(struct vio_dev *viodev) void __devinit vio_unregister_device(struct vio_dev *viodev)
{ {
DBGENTER(); if (vio_bus_ops.unregister_device)
#ifdef CONFIG_PPC_PSERIES vio_bus_ops.unregister_device(viodev);
device_remove_file(&viodev->dev, &dev_attr_devspec);
#endif
device_remove_file(&viodev->dev, &dev_attr_name); device_remove_file(&viodev->dev, &dev_attr_name);
device_unregister(&viodev->dev); device_unregister(&viodev->dev);
} }
EXPORT_SYMBOL(vio_unregister_device); EXPORT_SYMBOL(vio_unregister_device);
#ifdef CONFIG_PPC_PSERIES
/**
* vio_get_attribute: - get attribute for virtual device
* @vdev: The vio device to get property.
* @which: The property/attribute to be extracted.
* @length: Pointer to length of returned data size (unused if NULL).
*
* Calls prom.c's get_property() to return the value of the
* attribute specified by the preprocessor constant @which
*/
const void * vio_get_attribute(struct vio_dev *vdev, void* which, int* length)
{
return get_property(vdev->dev.platform_data, (char*)which, length);
}
EXPORT_SYMBOL(vio_get_attribute);
/* vio_find_name() - internal because only vio.c knows how we formatted the
* kobject name
* XXX once vio_bus_type.devices is actually used as a kset in
* drivers/base/bus.c, this function should be removed in favor of
* "device_find(kobj_name, &vio_bus_type)"
*/
static struct vio_dev *vio_find_name(const char *kobj_name)
{
struct kobject *found;
found = kset_find_obj(&devices_subsys.kset, kobj_name);
if (!found)
return NULL;
return to_vio_dev(container_of(found, struct device, kobj));
}
/**
* vio_find_node - find an already-registered vio_dev
* @vnode: device_node of the virtual device we're looking for
*/
struct vio_dev *vio_find_node(struct device_node *vnode)
{
uint32_t *unit_address;
char kobj_name[BUS_ID_SIZE];
/* construct the kobject name from the device node */
unit_address = (uint32_t *)get_property(vnode, "reg", NULL);
if (!unit_address)
return NULL;
snprintf(kobj_name, BUS_ID_SIZE, "%x", *unit_address);
return vio_find_name(kobj_name);
}
EXPORT_SYMBOL(vio_find_node);
/**
* vio_build_iommu_table: - gets the dma information from OF and builds the TCE tree.
* @dev: the virtual device.
*
* Returns a pointer to the built tce tree, or NULL if it can't
* find property.
*/
static struct iommu_table * vio_build_iommu_table(struct vio_dev *dev)
{
unsigned int *dma_window;
struct iommu_table *newTceTable;
unsigned long offset;
int dma_window_property_size;
dma_window = (unsigned int *) get_property(dev->dev.platform_data, "ibm,my-dma-window", &dma_window_property_size);
if(!dma_window) {
return NULL;
}
newTceTable = (struct iommu_table *) kmalloc(sizeof(struct iommu_table), GFP_KERNEL);
/* There should be some code to extract the phys-encoded offset
using prom_n_addr_cells(). However, according to a comment
on earlier versions, it's always zero, so we don't bother */
offset = dma_window[1] >> PAGE_SHIFT;
/* TCE table size - measured in tce entries */
newTceTable->it_size = dma_window[4] >> PAGE_SHIFT;
/* offset for VIO should always be 0 */
newTceTable->it_offset = offset;
newTceTable->it_busno = 0;
newTceTable->it_index = (unsigned long)dma_window[0];
newTceTable->it_type = TCE_VB;
return iommu_init_table(newTceTable);
}
int vio_enable_interrupts(struct vio_dev *dev)
{
int rc = h_vio_signal(dev->unit_address, VIO_IRQ_ENABLE);
if (rc != H_Success) {
printk(KERN_ERR "vio: Error 0x%x enabling interrupts\n", rc);
}
return rc;
}
EXPORT_SYMBOL(vio_enable_interrupts);
int vio_disable_interrupts(struct vio_dev *dev)
{
int rc = h_vio_signal(dev->unit_address, VIO_IRQ_DISABLE);
if (rc != H_Success) {
printk(KERN_ERR "vio: Error 0x%x disabling interrupts\n", rc);
}
return rc;
}
EXPORT_SYMBOL(vio_disable_interrupts);
#endif
static dma_addr_t vio_map_single(struct device *dev, void *vaddr, static dma_addr_t vio_map_single(struct device *dev, void *vaddr,
size_t size, enum dma_data_direction direction) size_t size, enum dma_data_direction direction)
{ {
...@@ -615,18 +251,8 @@ static int vio_bus_match(struct device *dev, struct device_driver *drv) ...@@ -615,18 +251,8 @@ static int vio_bus_match(struct device *dev, struct device_driver *drv)
const struct vio_dev *vio_dev = to_vio_dev(dev); const struct vio_dev *vio_dev = to_vio_dev(dev);
struct vio_driver *vio_drv = to_vio_driver(drv); struct vio_driver *vio_drv = to_vio_driver(drv);
const struct vio_device_id *ids = vio_drv->id_table; const struct vio_device_id *ids = vio_drv->id_table;
const struct vio_device_id *found_id;
DBGENTER();
if (!ids) return (ids != NULL) && (vio_match_device(ids, vio_dev) != NULL);
return 0;
found_id = vio_match_device(ids, vio_dev);
if (found_id)
return 1;
return 0;
} }
struct bus_type vio_bus_type = { struct bus_type vio_bus_type = {
......
arch/ppc64/mm/hash_low.S
浏览文件 @ ed735ccb
...@@ -128,13 +128,11 @@ _GLOBAL(__hash_page) ...@@ -128,13 +128,11 @@ _GLOBAL(__hash_page)
/* We eventually do the icache sync here (maybe inline that /* We eventually do the icache sync here (maybe inline that
* code rather than call a C function...) * code rather than call a C function...)
*/ */
BEGIN_FTR_SECTION
BEGIN_FTR_SECTION BEGIN_FTR_SECTION
mr r4,r30 mr r4,r30
mr r5,r7 mr r5,r7
bl .hash_page_do_lazy_icache bl .hash_page_do_lazy_icache
END_FTR_SECTION_IFSET(CPU_FTR_NOEXECUTE) END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE)
END_FTR_SECTION_IFCLR(CPU_FTR_COHERENT_ICACHE)
/* At this point, r3 contains new PP bits, save them in /* At this point, r3 contains new PP bits, save them in
* place of "access" in the param area (sic) * place of "access" in the param area (sic)
......
arch/ppc64/mm/hash_native.c
浏览文件 @ ed735ccb
...@@ -51,7 +51,6 @@ long native_hpte_insert(unsigned long hpte_group, unsigned long va, ...@@ -51,7 +51,6 @@ long native_hpte_insert(unsigned long hpte_group, unsigned long va,
unsigned long prpn, unsigned long vflags, unsigned long prpn, unsigned long vflags,
unsigned long rflags) unsigned long rflags)
{ {
unsigned long arpn = physRpn_to_absRpn(prpn);
hpte_t *hptep = htab_address + hpte_group; hpte_t *hptep = htab_address + hpte_group;
unsigned long hpte_v, hpte_r; unsigned long hpte_v, hpte_r;
int i; int i;
...@@ -74,7 +73,7 @@ long native_hpte_insert(unsigned long hpte_group, unsigned long va, ...@@ -74,7 +73,7 @@ long native_hpte_insert(unsigned long hpte_group, unsigned long va,
hpte_v = (va >> 23) << HPTE_V_AVPN_SHIFT | vflags | HPTE_V_VALID; hpte_v = (va >> 23) << HPTE_V_AVPN_SHIFT | vflags | HPTE_V_VALID;
if (vflags & HPTE_V_LARGE) if (vflags & HPTE_V_LARGE)
va &= ~(1UL << HPTE_V_AVPN_SHIFT); va &= ~(1UL << HPTE_V_AVPN_SHIFT);
hpte_r = (arpn << HPTE_R_RPN_SHIFT) | rflags; hpte_r = (prpn << HPTE_R_RPN_SHIFT) | rflags;
hptep->r = hpte_r; hptep->r = hpte_r;
/* Guarantee the second dword is visible before the valid bit */ /* Guarantee the second dword is visible before the valid bit */
......
arch/ppc64/mm/hash_utils.c
浏览文件 @ ed735ccb
...@@ -210,7 +210,7 @@ void __init htab_initialize(void) ...@@ -210,7 +210,7 @@ void __init htab_initialize(void)
/* create bolted the linear mapping in the hash table */ /* create bolted the linear mapping in the hash table */
for (i=0; i < lmb.memory.cnt; i++) { for (i=0; i < lmb.memory.cnt; i++) {
base = lmb.memory.region[i].physbase + KERNELBASE; base = lmb.memory.region[i].base + KERNELBASE;
size = lmb.memory.region[i].size; size = lmb.memory.region[i].size;
DBG("creating mapping for region: %lx : %lx\n", base, size); DBG("creating mapping for region: %lx : %lx\n", base, size);
...@@ -302,7 +302,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap) ...@@ -302,7 +302,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
int local = 0; int local = 0;
cpumask_t tmp; cpumask_t tmp;
if ((ea & ~REGION_MASK) > EADDR_MASK) if ((ea & ~REGION_MASK) >= PGTABLE_RANGE)
return 1; return 1;
switch (REGION_ID(ea)) { switch (REGION_ID(ea)) {
......
arch/ppc64/mm/hugetlbpage.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/ppc64/mm/imalloc.c
浏览文件 @ ed735ccb
...@@ -31,7 +31,7 @@ static int get_free_im_addr(unsigned long size, unsigned long *im_addr) ...@@ -31,7 +31,7 @@ static int get_free_im_addr(unsigned long size, unsigned long *im_addr)
break; break;
if ((unsigned long)tmp->addr >= ioremap_bot) if ((unsigned long)tmp->addr >= ioremap_bot)
addr = tmp->size + (unsigned long) tmp->addr; addr = tmp->size + (unsigned long) tmp->addr;
if (addr > IMALLOC_END-size) if (addr >= IMALLOC_END-size)
return 1; return 1;
} }
*im_addr = addr; *im_addr = addr;
......
arch/ppc64/mm/init.c
浏览文件 @ ed735ccb
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/abs_addr.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/lmb.h> #include <asm/lmb.h>
#include <asm/rtas.h> #include <asm/rtas.h>
...@@ -66,6 +65,14 @@ ...@@ -66,6 +65,14 @@
#include <asm/vdso.h> #include <asm/vdso.h>
#include <asm/imalloc.h> #include <asm/imalloc.h>
#if PGTABLE_RANGE > USER_VSID_RANGE
#warning Limited user VSID range means pagetable space is wasted
#endif
#if (TASK_SIZE_USER64 < PGTABLE_RANGE) && (TASK_SIZE_USER64 < USER_VSID_RANGE)
#warning TASK_SIZE is smaller than it needs to be.
#endif
int mem_init_done; int mem_init_done;
unsigned long ioremap_bot = IMALLOC_BASE; unsigned long ioremap_bot = IMALLOC_BASE;
static unsigned long phbs_io_bot = PHBS_IO_BASE; static unsigned long phbs_io_bot = PHBS_IO_BASE;
...@@ -159,7 +166,6 @@ static int map_io_page(unsigned long ea, unsigned long pa, int flags) ...@@ -159,7 +166,6 @@ static int map_io_page(unsigned long ea, unsigned long pa, int flags)
ptep = pte_alloc_kernel(&init_mm, pmdp, ea); ptep = pte_alloc_kernel(&init_mm, pmdp, ea);
if (!ptep) if (!ptep)
return -ENOMEM; return -ENOMEM;
pa = abs_to_phys(pa);
set_pte_at(&init_mm, ea, ptep, pfn_pte(pa >> PAGE_SHIFT, set_pte_at(&init_mm, ea, ptep, pfn_pte(pa >> PAGE_SHIFT,
__pgprot(flags))); __pgprot(flags)));
spin_unlock(&init_mm.page_table_lock); spin_unlock(&init_mm.page_table_lock);
...@@ -226,7 +232,7 @@ void __iomem * __ioremap(unsigned long addr, unsigned long size, ...@@ -226,7 +232,7 @@ void __iomem * __ioremap(unsigned long addr, unsigned long size,
* Before that, we map using addresses going * Before that, we map using addresses going
* up from ioremap_bot. imalloc will use * up from ioremap_bot. imalloc will use
* the addresses from ioremap_bot through * the addresses from ioremap_bot through
* IMALLOC_END (0xE000001fffffffff) * IMALLOC_END
* *
*/ */
pa = addr & PAGE_MASK; pa = addr & PAGE_MASK;
...@@ -417,12 +423,6 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm) ...@@ -417,12 +423,6 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
int index; int index;
int err; int err;
#ifdef CONFIG_HUGETLB_PAGE
/* We leave htlb_segs as it was, but for a fork, we need to
* clear the huge_pgdir. */
mm->context.huge_pgdir = NULL;
#endif
again: again:
if (!idr_pre_get(&mmu_context_idr, GFP_KERNEL)) if (!idr_pre_get(&mmu_context_idr, GFP_KERNEL))
return -ENOMEM; return -ENOMEM;
...@@ -453,8 +453,6 @@ void destroy_context(struct mm_struct *mm) ...@@ -453,8 +453,6 @@ void destroy_context(struct mm_struct *mm)
spin_unlock(&mmu_context_lock); spin_unlock(&mmu_context_lock);
mm->context.id = NO_CONTEXT; mm->context.id = NO_CONTEXT;
hugetlb_mm_free_pgd(mm);
} }
/* /*
...@@ -484,9 +482,9 @@ void __init mm_init_ppc64(void) ...@@ -484,9 +482,9 @@ void __init mm_init_ppc64(void)
for (i = 1; i < lmb.memory.cnt; i++) { for (i = 1; i < lmb.memory.cnt; i++) {
unsigned long base, prevbase, prevsize; unsigned long base, prevbase, prevsize;
prevbase = lmb.memory.region[i-1].physbase; prevbase = lmb.memory.region[i-1].base;
prevsize = lmb.memory.region[i-1].size; prevsize = lmb.memory.region[i-1].size;
base = lmb.memory.region[i].physbase; base = lmb.memory.region[i].base;
if (base > (prevbase + prevsize)) { if (base > (prevbase + prevsize)) {
io_hole_start = prevbase + prevsize; io_hole_start = prevbase + prevsize;
io_hole_size = base - (prevbase + prevsize); io_hole_size = base - (prevbase + prevsize);
...@@ -513,11 +511,8 @@ int page_is_ram(unsigned long pfn) ...@@ -513,11 +511,8 @@ int page_is_ram(unsigned long pfn)
for (i=0; i < lmb.memory.cnt; i++) { for (i=0; i < lmb.memory.cnt; i++) {
unsigned long base; unsigned long base;
#ifdef CONFIG_MSCHUNKS
base = lmb.memory.region[i].physbase;
#else
base = lmb.memory.region[i].base; base = lmb.memory.region[i].base;
#endif
if ((paddr >= base) && if ((paddr >= base) &&
(paddr < (base + lmb.memory.region[i].size))) { (paddr < (base + lmb.memory.region[i].size))) {
return 1; return 1;
...@@ -547,7 +542,7 @@ void __init do_init_bootmem(void) ...@@ -547,7 +542,7 @@ void __init do_init_bootmem(void)
*/ */
bootmap_pages = bootmem_bootmap_pages(total_pages); bootmap_pages = bootmem_bootmap_pages(total_pages);
start = abs_to_phys(lmb_alloc(bootmap_pages<<PAGE_SHIFT, PAGE_SIZE)); start = lmb_alloc(bootmap_pages<<PAGE_SHIFT, PAGE_SIZE);
BUG_ON(!start); BUG_ON(!start);
boot_mapsize = init_bootmem(start >> PAGE_SHIFT, total_pages); boot_mapsize = init_bootmem(start >> PAGE_SHIFT, total_pages);
...@@ -558,25 +553,25 @@ void __init do_init_bootmem(void) ...@@ -558,25 +553,25 @@ void __init do_init_bootmem(void)
* present. * present.
*/ */
for (i=0; i < lmb.memory.cnt; i++) { for (i=0; i < lmb.memory.cnt; i++) {
unsigned long physbase, size; unsigned long base, size;
unsigned long start_pfn, end_pfn; unsigned long start_pfn, end_pfn;
physbase = lmb.memory.region[i].physbase; base = lmb.memory.region[i].base;
size = lmb.memory.region[i].size; size = lmb.memory.region[i].size;
start_pfn = physbase >> PAGE_SHIFT; start_pfn = base >> PAGE_SHIFT;
end_pfn = start_pfn + (size >> PAGE_SHIFT); end_pfn = start_pfn + (size >> PAGE_SHIFT);
memory_present(0, start_pfn, end_pfn); memory_present(0, start_pfn, end_pfn);
free_bootmem(physbase, size); free_bootmem(base, size);
} }
/* reserve the sections we're already using */ /* reserve the sections we're already using */
for (i=0; i < lmb.reserved.cnt; i++) { for (i=0; i < lmb.reserved.cnt; i++) {
unsigned long physbase = lmb.reserved.region[i].physbase; unsigned long base = lmb.reserved.region[i].base;
unsigned long size = lmb.reserved.region[i].size; unsigned long size = lmb.reserved.region[i].size;
reserve_bootmem(physbase, size); reserve_bootmem(base, size);
} }
} }
...@@ -615,10 +610,10 @@ static int __init setup_kcore(void) ...@@ -615,10 +610,10 @@ static int __init setup_kcore(void)
int i; int i;
for (i=0; i < lmb.memory.cnt; i++) { for (i=0; i < lmb.memory.cnt; i++) {
unsigned long physbase, size; unsigned long base, size;
struct kcore_list *kcore_mem; struct kcore_list *kcore_mem;
physbase = lmb.memory.region[i].physbase; base = lmb.memory.region[i].base;
size = lmb.memory.region[i].size; size = lmb.memory.region[i].size;
/* GFP_ATOMIC to avoid might_sleep warnings during boot */ /* GFP_ATOMIC to avoid might_sleep warnings during boot */
...@@ -626,7 +621,7 @@ static int __init setup_kcore(void) ...@@ -626,7 +621,7 @@ static int __init setup_kcore(void)
if (!kcore_mem) if (!kcore_mem)
panic("mem_init: kmalloc failed\n"); panic("mem_init: kmalloc failed\n");
kclist_add(kcore_mem, __va(physbase), size); kclist_add(kcore_mem, __va(base), size);
} }
kclist_add(&kcore_vmem, (void *)VMALLOC_START, VMALLOC_END-VMALLOC_START); kclist_add(&kcore_vmem, (void *)VMALLOC_START, VMALLOC_END-VMALLOC_START);
...@@ -686,9 +681,6 @@ void __init mem_init(void) ...@@ -686,9 +681,6 @@ void __init mem_init(void)
mem_init_done = 1; mem_init_done = 1;
#ifdef CONFIG_PPC_ISERIES
iommu_vio_init();
#endif
/* Initialize the vDSO */ /* Initialize the vDSO */
vdso_init(); vdso_init();
} }
...@@ -833,23 +825,43 @@ void __iomem * reserve_phb_iospace(unsigned long size) ...@@ -833,23 +825,43 @@ void __iomem * reserve_phb_iospace(unsigned long size)
return virt_addr; return virt_addr;
} }
kmem_cache_t *zero_cache; static void zero_ctor(void *addr, kmem_cache_t *cache, unsigned long flags)
static void zero_ctor(void *pte, kmem_cache_t *cache, unsigned long flags)
{ {
memset(pte, 0, PAGE_SIZE); memset(addr, 0, kmem_cache_size(cache));
} }
static const int pgtable_cache_size[2] = {
PTE_TABLE_SIZE, PMD_TABLE_SIZE
};
static const char *pgtable_cache_name[ARRAY_SIZE(pgtable_cache_size)] = {
"pgd_pte_cache", "pud_pmd_cache",
};
kmem_cache_t *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)];
void pgtable_cache_init(void) void pgtable_cache_init(void)
{ {
zero_cache = kmem_cache_create("zero", int i;
PAGE_SIZE,
0, BUILD_BUG_ON(PTE_TABLE_SIZE != pgtable_cache_size[PTE_CACHE_NUM]);
SLAB_HWCACHE_ALIGN | SLAB_MUST_HWCACHE_ALIGN, BUILD_BUG_ON(PMD_TABLE_SIZE != pgtable_cache_size[PMD_CACHE_NUM]);
zero_ctor, BUILD_BUG_ON(PUD_TABLE_SIZE != pgtable_cache_size[PUD_CACHE_NUM]);
NULL); BUILD_BUG_ON(PGD_TABLE_SIZE != pgtable_cache_size[PGD_CACHE_NUM]);
if (!zero_cache)
panic("pgtable_cache_init(): could not create zero_cache!\n"); for (i = 0; i < ARRAY_SIZE(pgtable_cache_size); i++) {
int size = pgtable_cache_size[i];
const char *name = pgtable_cache_name[i];
pgtable_cache[i] = kmem_cache_create(name,
size, size,
SLAB_HWCACHE_ALIGN
| SLAB_MUST_HWCACHE_ALIGN,
zero_ctor,
NULL);
if (! pgtable_cache[i])
panic("pgtable_cache_init(): could not create %s!\n",
name);
}
} }
pgprot_t phys_mem_access_prot(struct file *file, unsigned long addr, pgprot_t phys_mem_access_prot(struct file *file, unsigned long addr,
......
arch/ppc64/mm/numa.c
浏览文件 @ ed735ccb
...@@ -671,7 +671,7 @@ void __init do_init_bootmem(void) ...@@ -671,7 +671,7 @@ void __init do_init_bootmem(void)
* Mark reserved regions on this node * Mark reserved regions on this node
*/ */
for (i = 0; i < lmb.reserved.cnt; i++) { for (i = 0; i < lmb.reserved.cnt; i++) {
unsigned long physbase = lmb.reserved.region[i].physbase; unsigned long physbase = lmb.reserved.region[i].base;
unsigned long size = lmb.reserved.region[i].size; unsigned long size = lmb.reserved.region[i].size;
if (pa_to_nid(physbase) != nid && if (pa_to_nid(physbase) != nid &&
......
arch/ppc64/mm/slb_low.S
浏览文件 @ ed735ccb
...@@ -89,28 +89,29 @@ END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE) ...@@ -89,28 +89,29 @@ END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE)
b 9f b 9f
0: /* user address: proto-VSID = context<<15 | ESID */ 0: /* user address: proto-VSID = context<<15 | ESID */
li r11,SLB_VSID_USER srdi. r9,r3,USER_ESID_BITS
srdi. r9,r3,13
bne- 8f /* invalid ea bits set */ bne- 8f /* invalid ea bits set */
#ifdef CONFIG_HUGETLB_PAGE #ifdef CONFIG_HUGETLB_PAGE
BEGIN_FTR_SECTION BEGIN_FTR_SECTION
/* check against the hugepage ranges */ lhz r9,PACAHIGHHTLBAREAS(r13)
cmpldi r3,(TASK_HPAGE_END>>SID_SHIFT) srdi r11,r3,(HTLB_AREA_SHIFT-SID_SHIFT)
bge 6f /* >= TASK_HPAGE_END */ srd r9,r9,r11
cmpldi r3,(TASK_HPAGE_BASE>>SID_SHIFT) andi. r9,r9,1
bge 5f /* TASK_HPAGE_BASE..TASK_HPAGE_END */ bne 5f
li r11,SLB_VSID_USER
cmpldi r3,16 cmpldi r3,16
bge 6f /* 4GB..TASK_HPAGE_BASE */ bge 6f
lhz r9,PACAHTLBSEGS(r13) lhz r9,PACALOWHTLBAREAS(r13)
srd r9,r9,r3 srd r9,r9,r3
andi. r9,r9,1 andi. r9,r9,1
beq 6f beq 6f
5: /* this is a hugepage user address */ 5: li r11,SLB_VSID_USER|SLB_VSID_L
li r11,(SLB_VSID_USER|SLB_VSID_L)
END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE) END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE)
#endif /* CONFIG_HUGETLB_PAGE */ #endif /* CONFIG_HUGETLB_PAGE */
......
arch/ppc64/mm/tlb.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/ppc64/oprofile/common.c
浏览文件 @ ed735ccb
...@@ -153,6 +153,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ...@@ -153,6 +153,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
case PV_970: case PV_970:
case PV_970FX: case PV_970FX:
case PV_970MP:
model = &op_model_power4; model = &op_model_power4;
model->num_counters = 8; model->num_counters = 8;
ops->cpu_type = "ppc64/970"; ops->cpu_type = "ppc64/970";
......
arch/ppc64/xmon/start.c
浏览文件 @ ed735ccb
...@@ -27,7 +27,7 @@ static void sysrq_handle_xmon(int key, struct pt_regs *pt_regs, ...@@ -27,7 +27,7 @@ static void sysrq_handle_xmon(int key, struct pt_regs *pt_regs,
struct tty_struct *tty) struct tty_struct *tty)
{ {
/* ensure xmon is enabled */ /* ensure xmon is enabled */
xmon_init(); xmon_init(1);
debugger(pt_regs); debugger(pt_regs);
} }
......
arch/ppc64/xmon/xmon.c
浏览文件 @ ed735ccb
...@@ -2496,15 +2496,25 @@ static void dump_stab(void) ...@@ -2496,15 +2496,25 @@ static void dump_stab(void)
} }
} }
void xmon_init(void) void xmon_init(int enable)
{ {
__debugger = xmon; if (enable) {
__debugger_ipi = xmon_ipi; __debugger = xmon;
__debugger_bpt = xmon_bpt; __debugger_ipi = xmon_ipi;
__debugger_sstep = xmon_sstep; __debugger_bpt = xmon_bpt;
__debugger_iabr_match = xmon_iabr_match; __debugger_sstep = xmon_sstep;
__debugger_dabr_match = xmon_dabr_match; __debugger_iabr_match = xmon_iabr_match;
__debugger_fault_handler = xmon_fault_handler; __debugger_dabr_match = xmon_dabr_match;
__debugger_fault_handler = xmon_fault_handler;
} else {
__debugger = NULL;
__debugger_ipi = NULL;
__debugger_bpt = NULL;
__debugger_sstep = NULL;
__debugger_iabr_match = NULL;
__debugger_dabr_match = NULL;
__debugger_fault_handler = NULL;
}
} }
void dump_segments(void) void dump_segments(void)
......
arch/sparc/kernel/setup.c
浏览文件 @ ed735ccb
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/root_dev.h> #include <linux/root_dev.h>
#include <asm/segment.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/processor.h> #include <asm/processor.h>
......
arch/sparc/kernel/tick14.c
浏览文件 @ ed735ccb
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/segment.h>
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/mostek.h> #include <asm/mostek.h>
#include <asm/system.h> #include <asm/system.h>
......
arch/sparc/kernel/time.c
浏览文件 @ ed735ccb
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/profile.h> #include <linux/profile.h>
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/segment.h>
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/mostek.h> #include <asm/mostek.h>
#include <asm/system.h> #include <asm/system.h>
......
arch/sparc/mm/fault.c
浏览文件 @ ed735ccb
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/segment.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/memreg.h> #include <asm/memreg.h>
......
arch/sparc/mm/init.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/entry.S
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/pci_iommu.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/process.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/sbus.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/setup.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/signal32.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/smp.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/sparc64_ksyms.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/traps.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/ttable.S
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/unaligned.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/kernel/winfixup.S
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/lib/Makefile
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/lib/debuglocks.c
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/lib/mb.S 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
arch/sparc64/solaris/misc.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/ambassador.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/atmtcp.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/eni.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/firestream.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/fore200e.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/he.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/horizon.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/idt77252.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/lanai.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/nicstar.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/nicstar.h
浏览文件 @ ed735ccb
此差异已折叠。
drivers/atm/zatm.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/block/aoe/aoenet.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/block/viodasd.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/bfusb.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/bluecard_cs.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/bpa10x.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/bt3c_cs.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/btuart_cs.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/dtl1_cs.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/hci_bcsp.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/hci_h4.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/hci_ldisc.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/hci_usb.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/hci_vhci.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/bluetooth/hci_vhci.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
drivers/cdrom/viocd.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/char/hvc_vio.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/char/hvcs.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/char/random.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/char/viotape.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/ieee1394/ieee1394_core.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/isdn/act2000/capi.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/isdn/i4l/isdn_net.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/isdn/i4l/isdn_ppp.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/bnx2.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/bnx2.h
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/bonding/bond_3ad.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/bonding/bond_3ad.h
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/bonding/bond_alb.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/hamradio/bpqether.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/ibmveth.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/iseries_veth.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/ppp_generic.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/pppoe.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/rrunner.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/s2io.h
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/shaper.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/tg3.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/tg3.h
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/wan/hdlc_generic.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/wan/lapbether.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/wan/sdla_fr.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/net/wan/syncppp.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/ahci.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/ata_piix.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/ibmvscsi/ibmvscsi.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/ibmvscsi/rpa_vscsi.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/libata-core.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/libata-scsi.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/libata.h
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_nv.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_promise.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_promise.h
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_qstor.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_sil.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_sis.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_svw.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_sx4.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_uli.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_via.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/scsi/sata_vsc.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/usb/net/usbnet.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/w1/w1_int.c
浏览文件 @ ed735ccb
此差异已折叠。
drivers/w1/w1_netlink.c
浏览文件 @ ed735ccb
此差异已折叠。
fs/smbfs/sock.c
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-alpha/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-arm/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-arm26/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-cris/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-frv/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-h8300/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-i386/checksum.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-i386/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ia64/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-m32r/checksum.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-m32r/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-m68k/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-mips/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-parisc/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-powerpc/cputime.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-powerpc/emergency-restart.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-powerpc/percpu.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc/8253pit.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc/cputime.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc/emergency-restart.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc/hdreg.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc/local.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc/percpu.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/abs_addr.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/agp.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/cputable.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/cputime.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/div64.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/emergency-restart.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/errno.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/firmware.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/hdreg.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/imalloc.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/ioctl.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/ioctls.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/iommu.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/ipc.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/linkage.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/lmb.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/machdep.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/mmu.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/naca.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/namei.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/page.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/param.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/percpu.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/pgalloc.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/pgtable.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/pmc.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/poll.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/processor.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/prom.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/resource.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/shmparam.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/string.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/system.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/unaligned.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-ppc64/vio.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-ppc64/xor.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-s390/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sh/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc/processor.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc/segment.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-sparc/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc/system.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc64/atomic.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc64/bitops.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc64/processor.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc64/segment.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/asm-sparc64/sfafsr.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc64/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc64/spinlock.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-sparc64/system.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-v850/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-x86_64/checksum.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-x86_64/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/asm-xtensa/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/ata.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/dccp.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/ethtool.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/hippidevice.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/if_ether.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/if_fc.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/if_fddi.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/if_frad.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/if_hippi.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/if_tr.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/if_vlan.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/igmp.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/in.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/inet_diag.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/ip.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/ipv6.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/libata.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/list.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/mod_devicetable.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/net.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netdevice.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter/nfnetlink.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter/nfnetlink_conntrack.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter/nfnetlink_log.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter/nfnetlink_queue.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_decnet.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_ipv4.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_ipv4/ip_logging.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/linux/netfilter_ipv4/ipt_NFQUEUE.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_ipv4/ipt_TTL.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_ipv4/ipt_connbytes.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_ipv4/ipt_dccp.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_ipv4/ipt_string.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_ipv6.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_ipv6/ip6_logging.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/linux/netfilter_ipv6/ip6t_HL.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netfilter_ipv6/ip6t_REJECT.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/netlink.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/random.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/rtnetlink.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/security.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/selinux_netlink.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/skbuff.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/socket.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/tcp.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/tcp_diag.h 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
include/linux/types.h
浏览文件 @ ed735ccb
此差异已折叠。
include/linux/xfrm.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/act_api.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/addrconf.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/af_unix.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/arp.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/ax25.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/bluetooth/bluetooth.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/bluetooth/hci.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/bluetooth/hci_core.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/bluetooth/rfcomm.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/datalink.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/dn.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/icmp.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/inet6_hashtables.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/net/inet_common.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/inet_connection_sock.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/net/inet_hashtables.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/net/inet_timewait_sock.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/net/ip.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/ip6_route.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/ip_fib.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/ip_vs.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/ipv6.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/llc.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/neighbour.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/p8022.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/pkt_cls.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/psnap.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/raw.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/rawv6.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/request_sock.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/route.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/sctp/constants.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/sock.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/tcp.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/tcp_ecn.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/tcp_states.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
include/net/udp.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/x25.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/x25device.h
浏览文件 @ ed735ccb
此差异已折叠。
include/net/xfrm.h
浏览文件 @ ed735ccb
此差异已折叠。
init/main.c
浏览文件 @ ed735ccb
此差异已折叠。
kernel/audit.c
浏览文件 @ ed735ccb
此差异已折叠。
kernel/sysctl.c
浏览文件 @ ed735ccb
此差异已折叠。
lib/Kconfig
浏览文件 @ ed735ccb
此差异已折叠。
lib/Makefile
浏览文件 @ ed735ccb
此差异已折叠。
lib/kobject_uevent.c
浏览文件 @ ed735ccb
此差异已折叠。
lib/ts_bm.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
mm/memory.c
浏览文件 @ ed735ccb
此差异已折叠。
net/802/fc.c
浏览文件 @ ed735ccb
此差异已折叠。
net/802/fddi.c
浏览文件 @ ed735ccb
此差异已折叠。
net/802/hippi.c
浏览文件 @ ed735ccb
此差异已折叠。
net/802/p8022.c
浏览文件 @ ed735ccb
此差异已折叠。
net/802/p8023.c
浏览文件 @ ed735ccb
此差异已折叠。
net/802/psnap.c
浏览文件 @ ed735ccb
此差异已折叠。
net/802/sysctl_net_802.c
浏览文件 @ ed735ccb
此差异已折叠。
net/8021q/vlan.h
浏览文件 @ ed735ccb
此差异已折叠。
net/8021q/vlan_dev.c
浏览文件 @ ed735ccb
此差异已折叠。
net/Kconfig
浏览文件 @ ed735ccb
此差异已折叠。
net/Makefile
浏览文件 @ ed735ccb
此差异已折叠。
net/appletalk/aarp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/appletalk/ddp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/atm/ipcommon.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ax25/af_ax25.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ax25/ax25_ds_in.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ax25/ax25_ds_timer.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ax25/ax25_in.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ax25/ax25_std_in.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ax25/ax25_std_timer.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ax25/ax25_subr.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bluetooth/hci_core.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bluetooth/hci_event.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bluetooth/hci_sock.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bluetooth/l2cap.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bluetooth/rfcomm/core.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bluetooth/rfcomm/sock.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bluetooth/rfcomm/tty.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bluetooth/sco.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bridge/br_fdb.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bridge/netfilter/ebt_mark.c
浏览文件 @ ed735ccb
此差异已折叠。
net/bridge/netfilter/ebt_ulog.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/Makefile
浏览文件 @ ed735ccb
此差异已折叠。
net/core/datagram.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/dev.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/ethtool.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/flow.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/neighbour.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/netfilter.c 已删除 100644 → 0
浏览文件 @ 39fbe473
此差异已折叠。
net/core/request_sock.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/rtnetlink.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/skbuff.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/sock.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/sysctl_net_core.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/utils.c
浏览文件 @ ed735ccb
此差异已折叠。
net/core/wireless.c
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/Kconfig 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/Makefile 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccid.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccid.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/Kconfig 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/Makefile 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/ccid3.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/ccid3.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/lib/Makefile 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/lib/loss_interval.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/lib/loss_interval.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/lib/packet_history.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/lib/packet_history.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/lib/tfrc.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ccids/lib/tfrc_equation.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/dccp.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/diag.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/input.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/ipv4.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/minisocks.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/options.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/output.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/proto.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/dccp/timer.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/decnet/af_decnet.c
浏览文件 @ ed735ccb
此差异已折叠。
net/decnet/dn_dev.c
浏览文件 @ ed735ccb
此差异已折叠。
net/decnet/dn_nsp_in.c
浏览文件 @ ed735ccb
此差异已折叠。
net/decnet/dn_nsp_out.c
浏览文件 @ ed735ccb
此差异已折叠。
net/decnet/dn_route.c
浏览文件 @ ed735ccb
此差异已折叠。
net/decnet/dn_table.c
浏览文件 @ ed735ccb
此差异已折叠。
net/decnet/netfilter/dn_rtmsg.c
浏览文件 @ ed735ccb
此差异已折叠。
net/econet/af_econet.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ethernet/eth.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ethernet/sysctl_net_ether.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/Kconfig
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/Makefile
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/af_inet.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/arp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/datagram.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/devinet.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/esp4.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/fib_frontend.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/fib_hash.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/fib_lookup.h
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/fib_semantics.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/fib_trie.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/icmp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/igmp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/inet_connection_sock.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/inet_diag.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/inet_hashtables.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/inet_timewait_sock.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/inetpeer.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ip_forward.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ip_fragment.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ip_input.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ip_options.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ip_output.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ip_sockglue.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipcomp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipconfig.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipmr.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipvs/ip_vs_app.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipvs/ip_vs_conn.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipvs/ip_vs_core.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipvs/ip_vs_ctl.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipvs/ip_vs_lblc.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipvs/ip_vs_lblcr.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipvs/ip_vs_proto_tcp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/ipvs/ip_vs_xmit.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/multipath_drr.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/Kconfig
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/Makefile
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ip_conntrack_netlink.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ip_nat_core.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ip_nat_helper.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ip_queue.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ip_tables.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_CLASSIFY.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_CLUSTERIP.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_CONNMARK.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_DSCP.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_ECN.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_LOG.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_MARK.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_MASQUERADE.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_NETMAP.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_NFQUEUE.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_REJECT.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_TCPMSS.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_TOS.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_TTL.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_ULOG.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_connbytes.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_connmark.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_dccp.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_hashlimit.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_mark.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_owner.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/netfilter/ipt_string.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/proc.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/protocol.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/raw.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/route.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/syncookies.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/sysctl_net_ipv4.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_bic.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_cong.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_diag.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_highspeed.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_htcp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_hybla.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_input.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_ipv4.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_minisocks.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_output.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_scalable.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_timer.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_vegas.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/tcp_westwood.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/udp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv4/xfrm4_state.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/Makefile
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/addrconf.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/af_inet6.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/ah6.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/datagram.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/esp6.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/exthdrs.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/icmp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/inet6_hashtables.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/ip6_fib.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/ip6_input.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/ip6_output.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/ipv6_sockglue.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/ipv6_syms.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/ndisc.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/Kconfig
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/Makefile
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/ip6_queue.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/ip6_tables.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/ip6t_HL.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/ip6t_LOG.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/ip6t_MARK.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/ip6t_NFQUEUE.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/ip6t_REJECT.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/netfilter/ip6t_owner.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/raw.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/reassembly.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/route.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/sit.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/sysctl_net_ipv6.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/tcp_ipv6.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/udp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipv6/xfrm6_tunnel.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipx/af_ipx.c
浏览文件 @ ed735ccb
此差异已折叠。
net/ipx/ipx_proc.c
浏览文件 @ ed735ccb
此差异已折叠。
net/irda/af_irda.c
浏览文件 @ ed735ccb
此差异已折叠。
net/irda/irlap_frame.c
浏览文件 @ ed735ccb
此差异已折叠。
net/irda/irlmp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/irda/irmod.c
浏览文件 @ ed735ccb
此差异已折叠。
net/irda/irnet/irnet.h
浏览文件 @ ed735ccb
此差异已折叠。
net/irda/irnet/irnet_ppp.c
浏览文件 @ ed735ccb
此差异已折叠。
net/irda/irqueue.c
浏览文件 @ ed735ccb
此差异已折叠。
net/lapb/lapb_subr.c
浏览文件 @ ed735ccb
此差异已折叠。
net/llc/af_llc.c
浏览文件 @ ed735ccb
此差异已折叠。
net/llc/llc_conn.c
浏览文件 @ ed735ccb
此差异已折叠。
net/llc/llc_core.c
浏览文件 @ ed735ccb
此差异已折叠。
net/llc/llc_if.c
浏览文件 @ ed735ccb
此差异已折叠。
net/llc/llc_input.c
浏览文件 @ ed735ccb
此差异已折叠。
net/llc/llc_sap.c
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/Kconfig 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/Makefile 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/core.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/nf_internals.h 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/nf_log.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/nf_queue.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/nf_sockopt.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/nfnetlink.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/nfnetlink_log.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netfilter/nfnetlink_queue.c 0 → 100644
浏览文件 @ ed735ccb
此差异已折叠。
net/netlink/af_netlink.c
浏览文件 @ ed735ccb
此差异已折叠。
net/netrom/af_netrom.c
浏览文件 @ ed735ccb
此差异已折叠。
net/netrom/nr_dev.c
浏览文件 @ ed735ccb
此差异已折叠。
net/netrom/nr_in.c
浏览文件 @ ed735ccb
此差异已折叠。
net/netrom/nr_subr.c
浏览文件 @ ed735ccb
此差异已折叠。
net/netrom/nr_timer.c
浏览文件 @ ed735ccb
此差异已折叠。
net/packet/af_packet.c
浏览文件 @ ed735ccb
此差异已折叠。
net/rose/af_rose.c
浏览文件 @ ed735ccb
此差异已折叠。
net/rose/rose_in.c
浏览文件 @ ed735ccb
此差异已折叠。
net/rose/rose_route.c
浏览文件 @ ed735ccb
此差异已折叠。
net/rose/rose_subr.c
浏览文件 @ ed735ccb
此差异已折叠。
net/rose/rose_timer.c
浏览文件 @ ed735ccb
此差异已折叠。
net/rxrpc/transport.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/Kconfig
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/act_api.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/cls_api.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/gact.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/ipt.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/mirred.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/pedit.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/police.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/sch_api.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/sch_generic.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sched/simple.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sctp/input.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sctp/ipv6.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sctp/protocol.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sctp/sm_make_chunk.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sctp/socket.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sctp/ulpqueue.c
浏览文件 @ ed735ccb
此差异已折叠。
net/socket.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sunrpc/rpc_pipe.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sunrpc/sched.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sunrpc/svcsock.c
浏览文件 @ ed735ccb
此差异已折叠。
net/sysctl_net.c
浏览文件 @ ed735ccb
此差异已折叠。
net/unix/af_unix.c
浏览文件 @ ed735ccb
此差异已折叠。
net/unix/garbage.c
浏览文件 @ ed735ccb
此差异已折叠。
net/unix/sysctl_net_unix.c
浏览文件 @ ed735ccb
此差异已折叠。
net/wanrouter/af_wanpipe.c
浏览文件 @ ed735ccb
此差异已折叠。
net/x25/af_x25.c
浏览文件 @ ed735ccb
此差异已折叠。
net/x25/x25_dev.c
浏览文件 @ ed735ccb
此差异已折叠。
net/x25/x25_in.c
浏览文件 @ ed735ccb
此差异已折叠。
net/x25/x25_subr.c
浏览文件 @ ed735ccb
此差异已折叠。
net/x25/x25_timer.c
浏览文件 @ ed735ccb
此差异已折叠。
net/xfrm/xfrm_input.c
浏览文件 @ ed735ccb
此差异已折叠。
net/xfrm/xfrm_policy.c
浏览文件 @ ed735ccb
此差异已折叠。
net/xfrm/xfrm_user.c
浏览文件 @ ed735ccb
此差异已折叠。
scripts/mod/file2alias.c
浏览文件 @ ed735ccb
此差异已折叠。
security/selinux/hooks.c
浏览文件 @ ed735ccb
此差异已折叠。
security/selinux/netlink.c
浏览文件 @ ed735ccb
此差异已折叠。
security/selinux/nlmsgtab.c
浏览文件 @ ed735ccb
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或