Commit a580e5b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge 

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
  powerpc: Fix define_machine so machine_is() works from modules
  powerpc/ppc: export strncasecmp
  [PATCH] powerpc: fix oops in alsa powermac driver
  [PATCH] powerpc: update {g5,iseries,pseries}_defconfigs
  [PATCH] ppc: Fix powersave code on arch/ppc
  [PATCH] powerpc/cell: remove BUILD_BUG_ON and add sys_tee to spu_syscall_table
  [PATCH] powermac: Fix i2c on keywest based chips
  [PATCH] powerpc: Lower threshold for DART enablement to 1GB
  [PATCH] powerpc: IOMMU support for honoring dma_mask
parents 93e1b7d4 d0e15bed

arch/powerpc/configs/g5_defconfig

+28 −30
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-rc2

# Fri Feb 10 17:33:08 2006

# Linux kernel version: 2.6.17-rc1

# Wed Apr 19 13:24:37 2006

#

CONFIG_PPC64=y

CONFIG_64BIT=y
@@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y 
CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_PPC=y

CONFIG_EARLY_PRINTK=y
@@ -29,6 +30,7 @@ CONFIG_POWER4=y 
CONFIG_PPC_FPU=y

CONFIG_ALTIVEC=y

CONFIG_PPC_STD_MMU=y

CONFIG_VIRT_CPU_ACCOUNTING=y

CONFIG_SMP=y

CONFIG_NR_CPUS=4
@@ -53,6 +55,7 @@ CONFIG_SYSCTL=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_CPUSETS is not set

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_EMBEDDED is not set
@@ -67,10 +70,6 @@ CONFIG_BASE_FULL=y 
CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -82,7 +81,6 @@ CONFIG_BASE_SMALL=0 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_KMOD=y
@@ -91,6 +89,7 @@ CONFIG_STOP_MACHINE=y 
#

# Block layer

#

# CONFIG_BLK_DEV_IO_TRACE is not set



#

# IO Schedulers
@@ -185,7 +184,6 @@ CONFIG_GENERIC_ISA_DMA=y 
# CONFIG_PPC_INDIRECT_PCI is not set

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

CONFIG_PCI_LEGACY_PROC=y

# CONFIG_PCI_DEBUG is not set



#
@@ -227,6 +225,7 @@ CONFIG_SYN_COOKIES=y 
CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

CONFIG_INET_XFRM_TUNNEL=m

CONFIG_INET_TUNNEL=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y
@@ -238,6 +237,8 @@ CONFIG_TCP_CONG_BIC=y 
#

# CONFIG_IP_VS is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_DEBUG is not set
@@ -261,6 +262,7 @@ CONFIG_IP_NF_IRC=m 
CONFIG_IP_NF_TFTP=m

CONFIG_IP_NF_AMANDA=m

# CONFIG_IP_NF_PPTP is not set

# CONFIG_IP_NF_H323 is not set

CONFIG_IP_NF_QUEUE=m



#
@@ -513,6 +515,7 @@ CONFIG_MD_RAID0=y 
CONFIG_MD_RAID1=y

CONFIG_MD_RAID10=m

CONFIG_MD_RAID5=y

# CONFIG_MD_RAID5_RESHAPE is not set

CONFIG_MD_RAID6=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m
@@ -761,7 +764,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_DTLK is not set
@@ -772,6 +774,7 @@ CONFIG_GEN_RTC=y 
# Ftape, the floppy tape device driver

#

CONFIG_AGP=m

# CONFIG_AGP_VIA is not set

CONFIG_AGP_UNINORTH=m

# CONFIG_DRM is not set

CONFIG_RAW_DRIVER=y
@@ -813,7 +816,6 @@ CONFIG_I2C_POWERMAC=y 
# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_SCx200_ACB is not set

# CONFIG_I2C_SIS5595 is not set

# CONFIG_I2C_SIS630 is not set

# CONFIG_I2C_SIS96X is not set
@@ -832,9 +834,7 @@ CONFIG_I2C_POWERMAC=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_RTC_X1205_I2C is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -861,10 +861,6 @@ CONFIG_I2C_POWERMAC=y 
# Misc devices

#



#

# Multimedia Capabilities Port drivers

#



#

# Multimedia devices

#
@@ -874,6 +870,7 @@ CONFIG_I2C_POWERMAC=y 
# Digital Video Broadcasting Devices

#

# CONFIG_DVB is not set

# CONFIG_USB_DABUSB is not set



#

# Graphics support
@@ -883,6 +880,7 @@ CONFIG_FB_CFB_FILLRECT=y 
CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_MACMODES=y

CONFIG_FB_FIRMWARE_EDID=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

# CONFIG_FB_CIRRUS is not set
@@ -901,7 +899,6 @@ CONFIG_FB_NVIDIA=y 
CONFIG_FB_NVIDIA_I2C=y

# CONFIG_FB_RIVA is not set

# CONFIG_FB_MATROX is not set

# CONFIG_FB_RADEON_OLD is not set

CONFIG_FB_RADEON=y

CONFIG_FB_RADEON_I2C=y

# CONFIG_FB_RADEON_DEBUG is not set
@@ -958,9 +955,11 @@ CONFIG_SND_SEQUENCER=m 
CONFIG_SND_OSSEMUL=y

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_PCM_OSS_PLUGINS=y

CONFIG_SND_SEQUENCER_OSS=y

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_SUPPORT_OLD_API=y

CONFIG_SND_VERBOSE_PROCFS=y

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set
@@ -977,6 +976,7 @@ CONFIG_SND_SUPPORT_OLD_API=y 
# PCI devices

#

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_ALS300 is not set

# CONFIG_SND_ALS4000 is not set

# CONFIG_SND_ALI5451 is not set

# CONFIG_SND_ATIIXP is not set
@@ -1009,6 +1009,7 @@ CONFIG_SND_SUPPORT_OLD_API=y 
# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_PCXHR is not set

# CONFIG_SND_RIPTIDE is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set
@@ -1041,6 +1042,7 @@ CONFIG_SND_USB_AUDIO=m 
#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set
@@ -1068,7 +1070,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
#

# USB Device Class drivers

#

# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=y
@@ -1125,15 +1126,6 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set



#

# USB Multimedia devices

#

# CONFIG_USB_DABUSB is not set



#

# Video4Linux support is needed for USB Multimedia device support

#



#

# USB Network Adapters

#
@@ -1194,6 +1186,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y 
CONFIG_USB_SERIAL_KLSI=m

CONFIG_USB_SERIAL_KOBIL_SCT=m

CONFIG_USB_SERIAL_MCT_U232=m

# CONFIG_USB_SERIAL_NAVMAN is not set

CONFIG_USB_SERIAL_PL2303=m

# CONFIG_USB_SERIAL_HP4X is not set

CONFIG_USB_SERIAL_SAFE=m
@@ -1236,18 +1229,24 @@ CONFIG_USB_EZUSB=y 
#

# CONFIG_MMC is not set



#

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# InfiniBand support

#

# CONFIG_INFINIBAND is not set



#

# SN Devices

# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

#



#

# EDAC - error detection and reporting (RAS)

# Real Time Clock

#

# CONFIG_RTC_CLASS is not set



#

# File systems
@@ -1319,7 +1318,6 @@ CONFIG_TMPFS=y 
CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#

arch/powerpc/configs/iseries_defconfig

+26 −17
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-rc6

# Wed Mar 15 16:19:52 2006

# Linux kernel version: 2.6.17-rc1

# Wed Apr 19 11:46:44 2006

#

CONFIG_PPC64=y

CONFIG_64BIT=y
@@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y 
CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_PPC=y

CONFIG_EARLY_PRINTK=y
@@ -30,6 +31,7 @@ CONFIG_POWER4=y 
CONFIG_PPC_FPU=y

# CONFIG_ALTIVEC is not set

CONFIG_PPC_STD_MMU=y

CONFIG_VIRT_CPU_ACCOUNTING=y

CONFIG_SMP=y

CONFIG_NR_CPUS=32
@@ -55,6 +57,7 @@ CONFIG_AUDITSYSCALL=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_CPUSETS is not set

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_EMBEDDED is not set
@@ -69,10 +72,6 @@ CONFIG_BASE_FULL=y 
CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -84,7 +83,6 @@ CONFIG_BASE_SMALL=0 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_KMOD=y
@@ -93,6 +91,7 @@ CONFIG_STOP_MACHINE=y 
#

# Block layer

#

# CONFIG_BLK_DEV_IO_TRACE is not set



#

# IO Schedulers
@@ -165,7 +164,6 @@ CONFIG_GENERIC_ISA_DMA=y 
# CONFIG_PPC_INDIRECT_PCI is not set

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

CONFIG_PCI_LEGACY_PROC=y

# CONFIG_PCI_DEBUG is not set



#
@@ -207,6 +205,7 @@ CONFIG_SYN_COOKIES=y 
CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

CONFIG_INET_XFRM_TUNNEL=m

CONFIG_INET_TUNNEL=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y
@@ -218,6 +217,8 @@ CONFIG_TCP_CONG_BIC=y 
#

# CONFIG_IP_VS is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_DEBUG is not set
@@ -236,11 +237,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m

# CONFIG_NETFILTER_XT_MATCH_DCCP is not set

# CONFIG_NETFILTER_XT_MATCH_ESP is not set

CONFIG_NETFILTER_XT_MATCH_HELPER=m

CONFIG_NETFILTER_XT_MATCH_LENGTH=m

CONFIG_NETFILTER_XT_MATCH_LIMIT=m

CONFIG_NETFILTER_XT_MATCH_MAC=m

CONFIG_NETFILTER_XT_MATCH_MARK=m

# CONFIG_NETFILTER_XT_MATCH_POLICY is not set

# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -262,20 +266,19 @@ CONFIG_IP_NF_IRC=m 
CONFIG_IP_NF_TFTP=m

CONFIG_IP_NF_AMANDA=m

# CONFIG_IP_NF_PPTP is not set

# CONFIG_IP_NF_H323 is not set

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_IPRANGE=m

CONFIG_IP_NF_MATCH_MULTIPORT=m

CONFIG_IP_NF_MATCH_TOS=m

CONFIG_IP_NF_MATCH_RECENT=m

CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_DSCP=m

CONFIG_IP_NF_MATCH_AH_ESP=m

# CONFIG_IP_NF_MATCH_AH is not set

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_MATCH_OWNER=m

CONFIG_IP_NF_MATCH_ADDRTYPE=m

CONFIG_IP_NF_MATCH_HASHLIMIT=m

CONFIG_IP_NF_MATCH_POLICY=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_LOG=m
@@ -479,6 +482,7 @@ CONFIG_MD_RAID0=y 
CONFIG_MD_RAID1=y

CONFIG_MD_RAID10=m

CONFIG_MD_RAID5=y

# CONFIG_MD_RAID5_RESHAPE is not set

CONFIG_MD_RAID6=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m
@@ -702,7 +706,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_DTLK is not set
@@ -750,10 +753,6 @@ CONFIG_MAX_RAW_DEVS=256 
# Misc devices

#



#

# Multimedia Capabilities Port drivers

#



#

# Multimedia devices

#
@@ -779,6 +778,7 @@ CONFIG_MAX_RAW_DEVS=256 
#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y

# CONFIG_USB is not set



#
@@ -795,6 +795,11 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
#

# CONFIG_MMC is not set



#

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# InfiniBand support

#
@@ -804,6 +809,11 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

#



#

# Real Time Clock

#

# CONFIG_RTC_CLASS is not set



#

# File systems

#
@@ -878,7 +888,6 @@ CONFIG_TMPFS=y 
# CONFIG_HUGETLBFS is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#

arch/powerpc/configs/pseries_defconfig

+25 −29
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-rc2

# Fri Feb 10 17:33:32 2006

# Linux kernel version: 2.6.17-rc1

# Wed Apr 19 11:48:00 2006

#

CONFIG_PPC64=y

CONFIG_64BIT=y
@@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y 
CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_PPC=y

CONFIG_EARLY_PRINTK=y
@@ -30,6 +31,7 @@ CONFIG_POWER4=y 
CONFIG_PPC_FPU=y

CONFIG_ALTIVEC=y

CONFIG_PPC_STD_MMU=y

CONFIG_VIRT_CPU_ACCOUNTING=y

CONFIG_SMP=y

CONFIG_NR_CPUS=128
@@ -55,6 +57,7 @@ CONFIG_AUDITSYSCALL=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CPUSETS=y

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_EMBEDDED is not set
@@ -69,10 +72,6 @@ CONFIG_BASE_FULL=y 
CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -84,7 +83,6 @@ CONFIG_BASE_SMALL=0 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_KMOD=y
@@ -93,6 +91,7 @@ CONFIG_STOP_MACHINE=y 
#

# Block layer

#

# CONFIG_BLK_DEV_IO_TRACE is not set



#

# IO Schedulers
@@ -188,7 +187,6 @@ CONFIG_PPC_I8259=y 
# CONFIG_PPC_INDIRECT_PCI is not set

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

CONFIG_PCI_LEGACY_PROC=y

# CONFIG_PCI_DEBUG is not set



#
@@ -235,6 +233,7 @@ CONFIG_SYN_COOKIES=y 
CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

CONFIG_INET_XFRM_TUNNEL=m

CONFIG_INET_TUNNEL=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y
@@ -246,6 +245,8 @@ CONFIG_TCP_CONG_BIC=y 
#

# CONFIG_IP_VS is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_DEBUG is not set
@@ -272,6 +273,7 @@ CONFIG_IP_NF_IRC=m 
CONFIG_IP_NF_TFTP=m

CONFIG_IP_NF_AMANDA=m

# CONFIG_IP_NF_PPTP is not set

# CONFIG_IP_NF_H323 is not set

CONFIG_IP_NF_QUEUE=m



#
@@ -519,6 +521,7 @@ CONFIG_MD_RAID0=y 
CONFIG_MD_RAID1=y

CONFIG_MD_RAID10=m

CONFIG_MD_RAID5=y

# CONFIG_MD_RAID5_RESHAPE is not set

CONFIG_MD_RAID6=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m
@@ -750,6 +753,7 @@ CONFIG_HW_CONSOLE=y 
#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_PCI=y

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -767,7 +771,9 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_PRINTER is not set

# CONFIG_PPDEV is not set

# CONFIG_TIPAR is not set

CONFIG_HVC_DRIVER=y

CONFIG_HVC_CONSOLE=y

# CONFIG_HVC_RTAS is not set

CONFIG_HVCS=m



#
@@ -779,7 +785,6 @@ CONFIG_HVCS=m 
# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_DTLK is not set
@@ -830,7 +835,6 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_SCx200_ACB is not set

# CONFIG_I2C_SIS5595 is not set

# CONFIG_I2C_SIS630 is not set

# CONFIG_I2C_SIS96X is not set
@@ -849,9 +853,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_RTC_X1205_I2C is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -878,10 +880,6 @@ CONFIG_I2C_ALGOBIT=y 
# Misc devices

#



#

# Multimedia Capabilities Port drivers

#



#

# Multimedia devices

#
@@ -891,6 +889,7 @@ CONFIG_I2C_ALGOBIT=y 
# Digital Video Broadcasting Devices

#

# CONFIG_DVB is not set

# CONFIG_USB_DABUSB is not set



#

# Graphics support
@@ -900,6 +899,7 @@ CONFIG_FB_CFB_FILLRECT=y 
CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_MACMODES=y

CONFIG_FB_FIRMWARE_EDID=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

# CONFIG_FB_CIRRUS is not set
@@ -919,7 +919,6 @@ CONFIG_FB_MATROX_MYSTIQUE=y 
CONFIG_FB_MATROX_G=y

# CONFIG_FB_MATROX_I2C is not set

CONFIG_FB_MATROX_MULTIHEAD=y

# CONFIG_FB_RADEON_OLD is not set

CONFIG_FB_RADEON=y

CONFIG_FB_RADEON_I2C=y

# CONFIG_FB_RADEON_DEBUG is not set
@@ -968,6 +967,7 @@ CONFIG_LCD_DEVICE=y 
#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set
@@ -1047,15 +1047,6 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set



#

# USB Multimedia devices

#

# CONFIG_USB_DABUSB is not set



#

# Video4Linux support is needed for USB Multimedia device support

#



#

# USB Network Adapters

#
@@ -1108,6 +1099,11 @@ CONFIG_USB_MON=y 
#

# CONFIG_MMC is not set



#

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# InfiniBand support

#
@@ -1121,12 +1117,13 @@ CONFIG_INFINIBAND_IPOIB=m 
# CONFIG_INFINIBAND_SRP is not set



#

# SN Devices

# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

#



#

# EDAC - error detection and reporting (RAS)

# Real Time Clock

#

# CONFIG_RTC_CLASS is not set



#

# File systems
@@ -1202,7 +1199,6 @@ CONFIG_TMPFS=y 
CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#

arch/powerpc/kernel/iommu.c

+26 −10
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ __setup("iommu=", setup_iommu); 
static unsigned long iommu_range_alloc(struct iommu_table *tbl,

                                       unsigned long npages,

                                       unsigned long *handle,

                                       unsigned long mask,

                                       unsigned int align_order)

{ 

	unsigned long n, end, i, start;
@@ -100,6 +101,18 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl, 


 again:



	if (limit + tbl->it_offset > mask) {

		limit = mask - tbl->it_offset + 1;

		/* If we're constrained on address range, first try

		 * at the masked hint to avoid O(n) search complexity,

		 * but on second pass, start at 0.

		 */

		if ((start & mask) >= limit || pass > 0)

			start = 0;

		else

			start &= mask;

	}



	n = find_next_zero_bit(tbl->it_map, limit, start);



	/* Align allocation */
@@ -150,14 +163,14 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl, 


static dma_addr_t iommu_alloc(struct iommu_table *tbl, void *page,

		       unsigned int npages, enum dma_data_direction direction,

		       unsigned int align_order)

		       unsigned long mask, unsigned int align_order)

{

	unsigned long entry, flags;

	dma_addr_t ret = DMA_ERROR_CODE;



	spin_lock_irqsave(&(tbl->it_lock), flags);



	entry = iommu_range_alloc(tbl, npages, NULL, align_order);

	entry = iommu_range_alloc(tbl, npages, NULL, mask, align_order);



	if (unlikely(entry == DMA_ERROR_CODE)) {

		spin_unlock_irqrestore(&(tbl->it_lock), flags);
@@ -236,7 +249,7 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, 


int iommu_map_sg(struct device *dev, struct iommu_table *tbl,

		struct scatterlist *sglist, int nelems,

		enum dma_data_direction direction)

		unsigned long mask, enum dma_data_direction direction)

{

	dma_addr_t dma_next = 0, dma_addr;

	unsigned long flags;
@@ -274,7 +287,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl, 
		vaddr = (unsigned long)page_address(s->page) + s->offset;

		npages = PAGE_ALIGN(vaddr + slen) - (vaddr & PAGE_MASK);

		npages >>= PAGE_SHIFT;

		entry = iommu_range_alloc(tbl, npages, &handle, 0);

		entry = iommu_range_alloc(tbl, npages, &handle, mask >> PAGE_SHIFT, 0);



		DBG("  - vaddr: %lx, size: %lx\n", vaddr, slen);
@@ -479,7 +492,8 @@ void iommu_free_table(struct device_node *dn) 
 * byte within the page as vaddr.

 */

dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr,

		size_t size, enum dma_data_direction direction)

		size_t size, unsigned long mask,

		enum dma_data_direction direction)

{

	dma_addr_t dma_handle = DMA_ERROR_CODE;

	unsigned long uaddr;
@@ -492,7 +506,8 @@ dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr, 
	npages >>= PAGE_SHIFT;



	if (tbl) {

		dma_handle = iommu_alloc(tbl, vaddr, npages, direction, 0);

		dma_handle = iommu_alloc(tbl, vaddr, npages, direction,

					 mask >> PAGE_SHIFT, 0);

		if (dma_handle == DMA_ERROR_CODE) {

			if (printk_ratelimit())  {

				printk(KERN_INFO "iommu_alloc failed, "
@@ -521,7 +536,7 @@ void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle, 
 * to the dma address (mapping) of the first page.

 */

void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size,

		dma_addr_t *dma_handle, gfp_t flag)

		dma_addr_t *dma_handle, unsigned long mask, gfp_t flag)

{

	void *ret = NULL;

	dma_addr_t mapping;
@@ -551,7 +566,8 @@ void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size, 
	memset(ret, 0, size);



	/* Set up tces to cover the allocated range */

	mapping = iommu_alloc(tbl, ret, npages, DMA_BIDIRECTIONAL, order);

	mapping = iommu_alloc(tbl, ret, npages, DMA_BIDIRECTIONAL,

			      mask >> PAGE_SHIFT, order);

	if (mapping == DMA_ERROR_CODE) {

		free_pages((unsigned long)ret, order);

		ret = NULL;

arch/powerpc/kernel/pci_iommu.c

+36 −4
Original line number Diff line number Diff line
@@ -59,6 +59,25 @@ static inline struct iommu_table *devnode_table(struct device *dev) 
}





static inline unsigned long device_to_mask(struct device *hwdev)

{

	struct pci_dev *pdev;



	if (!hwdev) {

		pdev = ppc64_isabridge_dev;

		if (!pdev) /* This is the best guess we can do */

			return 0xfffffffful;

	} else

		pdev = to_pci_dev(hwdev);



	if (pdev->dma_mask)

		return pdev->dma_mask;



	/* Assume devices without mask can take 32 bit addresses */

	return 0xfffffffful;

}





/* Allocates a contiguous real buffer and creates mappings over it.

 * Returns the virtual address of the buffer and sets dma_handle

 * to the dma address (mapping) of the first page.
@@ -67,7 +86,7 @@ static void *pci_iommu_alloc_coherent(struct device *hwdev, size_t size, 
			   dma_addr_t *dma_handle, gfp_t flag)

{

	return iommu_alloc_coherent(devnode_table(hwdev), size, dma_handle,

			flag);

			device_to_mask(hwdev), flag);

}



static void pci_iommu_free_coherent(struct device *hwdev, size_t size,
@@ -85,7 +104,8 @@ static void pci_iommu_free_coherent(struct device *hwdev, size_t size, 
static dma_addr_t pci_iommu_map_single(struct device *hwdev, void *vaddr,

		size_t size, enum dma_data_direction direction)

{

	return iommu_map_single(devnode_table(hwdev), vaddr, size, direction);

	return iommu_map_single(devnode_table(hwdev), vaddr, size,

			        device_to_mask(hwdev), direction);

}
@@ -100,7 +120,7 @@ static int pci_iommu_map_sg(struct device *pdev, struct scatterlist *sglist, 
		int nelems, enum dma_data_direction direction)

{

	return iommu_map_sg(pdev, devnode_table(pdev), sglist,

			nelems, direction);

			nelems, device_to_mask(pdev), direction);

}



static void pci_iommu_unmap_sg(struct device *pdev, struct scatterlist *sglist,
@@ -112,6 +132,18 @@ static void pci_iommu_unmap_sg(struct device *pdev, struct scatterlist *sglist, 
/* We support DMA to/from any memory page via the iommu */

static int pci_iommu_dma_supported(struct device *dev, u64 mask)

{

	struct iommu_table *tbl = devnode_table(dev);



	if (!tbl || tbl->it_offset > mask) {

		printk(KERN_INFO "Warning: IOMMU table offset too big for device mask\n");

		if (tbl)

			printk(KERN_INFO "mask: 0x%08lx, table offset: 0x%08lx\n",

				mask, tbl->it_offset);

		else

			printk(KERN_INFO "mask: 0x%08lx, table unavailable\n",

				mask);

		return 0;

	} else

		return 1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE