21 Dec, 2006
7 commits
-
if CONFIG_CALGARY_IOMMU is built into the kernel via
CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT, or is enabled via the
iommu=calgary boot option, then the detect_calgary() function runs to
detect the presence of a Calgary IOMMU.detect_calgary() first searches the BIOS EBDA area for a "rio_table_hdr"
BIOS table. It has this parsing algorithm for the EBDA:while (offset) {
...
/* The next offset is stored in the 1st word. 0 means no more */
offset = *((unsigned short *)(ptr + offset));
}got that? Lets repeat it slowly: we've got a BIOS-supplied data
structure, plus Linux kernel code that will only break out of an
infinite parsing loop once the BIOS gives a zero offset. Ok?Translation: what an excellent opportunity for BIOS writers to lock up
the Linux boot process in an utterly hard to debug place! Indeed the
BIOS jumped on that opportunity on my box, which has the following EBDA
chaining layout:384, 65282, 65535, 65535, 65535, 65535, 65535, 65535 ...
see the pattern? So my, definitely non-Calgary system happily locks up
in detect_calgary()!the patch below fixes the boot hang by trusting the BIOS-supplied data
structure a bit less: the parser always has to make forward progress,
and if it doesnt, we break out of the loop and i get the expected kernel
message:Calgary: Unable to locate Rio Grande Table in EBDA - bailing!
Signed-off-by: Ingo Molnar
Acked-by: Muli Ben-Yehuda
Signed-off-by: Linus Torvalds -
one of my boxes didnt boot the 2.6.20-rc1-rt0 kernel rpm, it hung during
early bootup. After an hour or two of happy debugging i narrowed it down
to the CALGARY_IOMMU_ENABLED_BY_DEFAULT option, which was freshly added
to 2.6.20 via the x86_64 tree and /enabled by default/.commit bff6547bb6a4e82c399d74e7fba78b12d2f162ed claims:
[PATCH] Calgary: allow compiling Calgary in but not using it by default
This patch makes it possible to compile Calgary in but not use it by
default. In this mode, use 'iommu=calgary' to activate it.but the change does not actually practice it:
config CALGARY_IOMMU_ENABLED_BY_DEFAULT
bool "Should Calgary be enabled by default?"
default y
depends on CALGARY_IOMMU
help
Should Calgary be enabled by default? if you choose 'y', Calgary
will be used (if it exists). If you choose 'n', Calgary will not be
used even if it exists. If you choose 'n' and would like to use
Calgary anyway, pass 'iommu=calgary' on the kernel command line.
If unsure, say Y.it's both 'default y', and says "If unsure, say Y". Clearly not a typo.
disabling this option makes my box boot again. The patch below fixes the
Kconfig entry. Grumble.Signed-off-by: Ingo Molnar
Signed-off-by: Linus Torvalds -
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (22 commits)
acpiphp: Link-time error for PCI Hotplug
shpchp: cleanup shpchp.h
shpchp: remove shpchprm_get_physical_slot_number
shpchp: cleanup struct controller
shpchp: remove unnecessary struct php_ctlr
PCI: ATI sb600 sata quirk
PCI legacy resource fix
PCI: don't export device IDs to userspace
PCI: Be a bit defensive in quirk_nvidia_ck804() so we don't risk dereferencing a NULL pdev.
PCI: Fix multiple problems with VIA hardware
PCI: Only check the HT capability bits in mpic.c
PCI: Use pci_find_ht_capability() in drivers/pci/quirks.c
PCI: Add #defines for Hypertransport MSI fields
PCI: Use pci_find_ht_capability() in drivers/pci/htirq.c
PCI: Add pci_find_ht_capability() for finding Hypertransport capabilities
PCI: Create __pci_bus_find_cap_start() from __pci_bus_find_cap()
pci: Introduce pci_find_present
PCI: pcieport-driver: remove invalid warning message
rpaphp: compiler warning cleanup
PCI quirks: remove redundant check
... -
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix register save area alignment for swapcontext syscall
[POWERPC] Fix PCI device channel state initialization
[POWERPC] Update MTD OF documentation
[POWERPC] Probe Efika platform before CHRP.
[POWERPC] Fix build of cell zImage.initrd
[POWERPC] iSeries: fix CONFIG_VIOPATH dependency
[POWERPC] iSeries: fix viocons init
[POWERPC] iSeries: fix viocd init
[POWERPC] iSeries: fix iseries_veth init
[POWERPC] iSeries: fix viotape init
[POWERPC] iSeries: fix viodasd init
[POWERPC] Workaround oldworld OF bug with IRQs & P2P bridges
[POWERPC] powerpc: add scanning of ebc bus to of_platform
[POWERPC] spufs: fix assignment of node numbers
[POWERPC] cell: Fix spufs with "new style" device-tree
[POWERPC] cell: Enable spider workarounds on all PCI buses
[POWERPC] cell: add forward struct declarations to spu.h
[POWERPC] cell: update cell_defconfig -
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (29 commits)
[ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC
[ARM] 4060/1: update several ARM defconfigs
[ARM] 4061/1: xsc3: change of maintainer
[ARM] 4059/1: VR1000: fix LED3's platform device number
[ARM] 4022/1: iop13xx: generic irq fixups
[ARM] 4015/1: s3c2410 cpu ifdefs
[ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency
[ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup
[ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc
[ARM] 4054/1: ep93xx: add HWCAP_CRUNCH
[ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig
[ARM] Fix warnings from asm/system.h
[ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support
[ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410
[ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h
[ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static
[ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410
[ARM] 4045/1: S3C24XX: remove old VA for non-shared areas
[ARM] 4044/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2442-clock.c
[ARM] 4043/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2440-clock.c
... -
This patch is designed to fix:
- Disk eating corruptor on KT7 after resume from RAM
- VIA IRQ handling
- VIA fixups for bus lockups after resume from RAMThe core of this is to add a table of resume fixups run at resume time.
We need to do this for a variety of boards and features, but particularly
we need to do this to get various critical VIA fixups done on resume.The second part of the problem is to handle VIA IRQ number rules which
are a bit odd and need special handling for PIC interrupts. Various
patches broke various boxes and while this one may not be perfect
(hopefully it is) it ensures the workaround is applied to the right
devices only.From: Jean Delvare
Now that PCI quirks are replayed on software resume, we can safely
re-enable the Asus SMBus unhiding quirk even when software suspend support
is enabled.[akpm@osdl.org: fix const warning]
Signed-off-by: Alan Cox
Cc: Jean Delvare
Signed-off-by: Andrew Morton
Signed-off-by: Greg Kroah-Hartman -
Only compare the exact HT capability bits against HT_CAPTYPE_IRQ,
this is a little paranoid, but doesn't hurt.Signed-off-by: Michael Ellerman
Signed-off-by: Greg Kroah-Hartman
20 Dec, 2006
12 commits
-
For 32-bit processes, the getcontext side of the swapcontext system
call (i.e. the saving of the context when the first argument is
non-NULL) has to set the ctx->uc_mcontext.uc_regs pointer to the place
where it saves the registers. Which it does, but it doesn't ensure
that the pointer is 16-byte aligned. 16-byte alignment is needed
because the Altivec/VMX registers are saved in there, and they need to
be on a 16-byte boundary.This fixes it by ensuring the appropriate alignment of the pointer.
This issue was pointed out by Jakub Jelinek.Signed-off-by: Paul Mackerras
-
Initialize the pci device pci channel state. This is critical
for having the pci_channel_offline() routine (in pci.h) to
function correctly.Signed-off-by: Linas Vepstas
Signed-off-by: Paul Mackerras -
The Efika matches chrp_probe() too, so put its own probe first to make
sure we get it right in a multiplatform build.Signed-off-by: David Woodhouse
Signed-off-by: Paul Mackerras -
The patch adding support for zImage.ps3 didn't add a zImage.initrd.ps3
target causing builds of zImage.initrd to fail when ps3 is included in
the .config. The current method of generating ps3 images doesn't support
initrd's yet, so we create a dummy target that only displays a warning
message instead.Signed-off-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras -
This is a long standing typo.
Signed-off-by: Stephen Rothwell
Signed-off-by: Paul Mackerras -
On some oldworld PowerMacs, OF doesn't assign interrupts properly
beyond P2P bridges. Fortunately, the fix is easy as all those machines
just wire all IRQ lines together to one IRQ which is assigned to the
bridge itself. We already have a special function for parsing Apple
OldWorld interrupts which are special, so let's add to it the ability
to walk up the PCI tree to find interrupts.This fixes irqs on the lower slots of s900 clones among others.
Signed-off-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras -
Both CONFIG_MACH_OSIRIS and CONFIG_MACH_ANUBIS
should select CONFIG_PM_SIMTEC.This patch moves the selection of CONFIG_PM_SIMTEC
to the machines that require it, as currently done
with other machines in the S3C2410 architecture.Signed-off-by: Ben Dooks
Signed-off-by: Russell King -
Update the ep93xx, iop13xx, iop32x, iop33x, ixp2000, ixp23xx,
lpd270 and onearm defconfigs to 2.6.20-rc1.Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King -
Deepak Saxena has agreed to hand xsc3 maintainership over to me.
Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King -
LED 3 should have been registered with the
platform deviceid of 3, instead of 1 (which
was used for LED 1).Signed-off-by: Ben Dooks
Signed-off-by: Russell King -
* use irq_chip
* use handle_level_irqSigned-off-by: Dan Williams
Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King
19 Dec, 2006
5 commits
-
This patch add scanning of ebc bus to of_platform, which is needed
to recognize devices located on that bus.Signed-off-by: Christian Krafft
Signed-off-by: Arnd Bergmann -
The difference between 'nid' and 'node' fields in an
spu structure was used incorrectly. The common 'node'
number now reflects the NUMA node, and it is used
in other places in the code as well.The 'nid' value is meaningful only in one place, namely
the computation of the interrupt numbers based on the
physical location of an spu. Consequently, we look it
up directly in the place where it is used now.Signed-off-by: Arnd Bergmann
-
Some SPU code was a bit too convoluted and broke when adding support for
the new style device-tree, most notably the struct pages for SPEs no
longer get created. oops...Signed-off-by: Benjamin Herrenschmidt
Signed-off-by: Arnd Bergmann -
Don't limit spider I/O workarounds to the first two buses.
The IBM Cell blade has three of them (one PCI, two PCIe)
and we want to handle them all.Signed-off-by: Jens Osterkamp
Signed-off-by: Arnd Bergmann -
New options appeared in the kernel, and new hardware became
available for us to use.Signed-off-by: Arnd Bergmann
18 Dec, 2006
16 commits
-
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] longhaul compile fix.
[CPUFREQ] Advise not to use longhaul on VIA C7.
[CPUFREQ] set policy->curfreq on initialization
[CPUFREQ] Trivial cleanup for acpi read/write port in acpi-cpufreq.c
[CPUFREQ] fixes typo in cpufreq.c -
Recent workqueue changes basically make this a formal requirement.
Also, move atomic32.o from lib-y to obj-y since it exports symbols
to modules.Signed-off-by: David S. Miller
-
The patch adds ifdefs around per cpu definitions. Otherwise, if
not all cpu types are selected, the kernel does not link.Signed-off-by: Krzysztof Helt
Signed-off-by: Ben Dooks
Signed-off-by: Russell King -
The struct resource 'end' field is inclusive, the iop13xx flash
setup code got this wrong.Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King -
The phys_io/io_pg_offst machine record variables were being set
to bogus values, causing problems when enabling DEBUG_LL.Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King -
Add HWCAP_CRUNCH so that the dynamic linker knows whether it can
use Crunch-optimised libraries or not.Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King -
Fix up the CONFIG_PM mixups in arch/arm/mach-s3c2410/Kconfig
causing CONFIG_S3C2410_PM and CONFIG_PM_H1940 to get enabled
permanently.Signed-off-by: Ben Dooks
Signed-off-by: Russell King -
Move adjust_cr() into arch/arm/mm/mmu.c, and move irqflags.h to
a more appropriate place in the header file.Signed-off-by: Russell King
-
Some gcc's are more anal than others about empty switch labels.
error: label at end of compound statementSigned-off-by: Dave Jones
-
C7's are centrino speedstep-alike.
Signed-off-by: Dave Jones
-
Clean the includes in arch/arm/mach-s3c2410/s3c2440.c
and arch/arm/mach-s3c2410/s3c2442.c which should have
been pruned when these where split and updated.Signed-off-by: Ben Dooks
Signed-off-by: Russell King -
Remove old changelog entries in arch/arm/mach-s3c2410
which should be available from the version control
system.Signed-off-by: Ben Dooks
Signed-off-by: Russell King -
Change the include/asm-arm/arch-s3c2410/regs-serial.h
platform data to use the prorper type (upf_t) for the
uart_flags.Fix all the other parts of arch/arm/mach-s3c2410 to
include and all other uses of
the include file.mach-rx3715.c:101:18: warning: incorrect type in initializer (different base types)
mach-rx3715.c:101:18: expected unsigned long [unsigned] uart_flags
mach-rx3715.c:101:18: got restricted unsigned int [usertype] [force]Signed-off-by: Ben Dooks
Signed-off-by: Russell King -
Remove warning from s3c2410_pm_resume() not being
declared by making it static.Signed-off-by: Ben Dooks
Signed-off-by: Russell King -
Fix the following sparse errors in arch/arm/mach-s3c2410
by fixing the include paths and making un-exported items
static.s3c2410-clock.c:206:12: warning: symbol 's3c2410_baseclk_add' was not declared. Should it be static?
s3c2412-clock.c:559:17: warning: symbol 'clks_src' was not declared. Should it be static?
s3c2412-clock.c:622:12: warning: symbol 'clks' was not declared. Should it be static?
s3c2412-clock.c:630:12: warning: symbol 's3c2412_baseclk_add' was not declared. Should it be static?Signed-off-by: Ben Dooks
Signed-off-by: Russell King -
Remove old (and non-shared) VA addresses from the mappings
in arch/arm/mach-s3c2410/map.h and anywhere they are being
mapped in arch/arm/mach-s3c2410Signed-off-by: Ben Dooks
Signed-off-by: Russell King
