13 Apr, 2007
11 commits
-
Remove unneeded inclusion of linux/ide.h
It does not compile with CONFIG_BLOCK=n.Remove asm/ide.h from ksyms file, it gets included earlier via
linux/ide.h.Compile tested with all defconfig files.
Signed-off-by: Olaf Hering
Signed-off-by: Paul Mackerras -
This allows the PMU LED on both a PowerMac 7,2 (Dual G5 2.0GHz, June 2003)
and a PowerMac 7,3 (Dual G5 2.0GHz, June 2004) to be controlled.
The physical LED is never off, unlike an iBook/PowerBook LED.
It is rather dim ("off") or very bright ("on").Signed-off-by: Tony Vroon
Signed-off-by: Paul Mackerras -
Fix link errors with CONFIG_EEH=n:
arch/powerpc/platforms/built-in.o: In function `.pcibios_fixup_new_pci_devices':
(.text+0x41c8): undefined reference to `.eeh_add_device_tree_late'
arch/powerpc/platforms/built-in.o: In function `.init_phb_dynamic':
(.text+0x4280): undefined reference to `.eeh_add_device_tree_early'
arch/powerpc/platforms/built-in.o: In function `.pcibios_remove_pci_devices':
(.text+0x42fc): undefined reference to `.eeh_remove_bus_device'
arch/powerpc/platforms/built-in.o: In function `.pcibios_add_pci_devices':
(.text+0x43c0): undefined reference to `.eeh_add_device_tree_early'
arch/powerpc/platforms/built-in.o: In function `.pSeries_final_fixup':
(.init.text+0xb4): undefined reference to `.pci_addr_cache_build'
make[1]: *** [.tmp_vmlinux1] Error 1Signed-off-by: Olaf Hering
Signed-off-by: Paul Mackerras -
This cleans up how the zImage code manipulates the kernel
command line. Notable improvements from the old handling:
- Command line manipulation is consolidated into a new
prep_cmdline() function, rather than being scattered across start()
and some helper functions
- Less stack space use: we use just a single global command
line buffer, which can be initialized by an external tool as before,
we no longer need another command line sized buffer on the stack.
- Easier to support platforms whose firmware passes a
commandline, but not a device tree. Platform code can now point new
loader_info fields to the firmware's command line, rather than having
to do early manipulation of the /chosen bootargs property which may
then be rewritten again by the core.Signed-off-by: David Gibson
Signed-off-by: Paul Mackerras -
This patch adds a library of useful device tree manipulation functions
to the zImage library, for use by platform code. These functions are
based on the hooks already in dt_ops, so they're not dependent on a
particular device tree implementation. This patch also slightly
streamlines the code in main.c using these new functions.This is a consolidation of my work in this area with Scott Wood's
patches to a very similar end.Signed-off-by: David Gibson
Signed-off-by: Paul Mackerras -
mtocrf is a faster single-field mtcrf (move to condition register
fields) instruction available in POWER4 and later processors. It can
make quite a difference in performance on some implementations, so use
it for CONFIG_POWER4_ONLY builds.Signed-off-by: Olof Johansson
Signed-off-by: Paul Mackerras -
There are many adapters which cannot handle DMAing across any 4 GB
boundary. For instance, the latest Emulex adapters.This normally is not an issue as firmware gives dma-windows under
4gigs. However, some of the new System-P boxes have dma-windows above
4gigs, and this present a problem.During initialization of the IOMMU tables, the last entry at each 4GB
boundary is marked as used. Thus no mappings can cross the boundary.
If a table ends at a 4GB boundary, the entry is not marked as used.A boot option to remove this 4GB protection is given w/ protect4gb=off.
This exposes the potential issue for driver and hardware development
purposes.Signed-off-by: Jake Moilanen
Acked-by: Olof Johansson
Signed-off-by: Paul Mackerras -
Adding this handler allow userspace to properly handle the module
autoloading. The generation of the uevent itself is now common to
all bus using of_device, so not much code here.Signed-off-by: Sylvain Munaut
Signed-off-by: Paul Mackerras -
The generation of the uevent is now common to all bus using
of_device.Signed-off-by: Sylvain Munaut
Signed-off-by: Paul Mackerras -
This common uevent handler allow the several bus types based on
of_device to generate the uevent properly and avoiding
code duplication.This handlers take a struct device as argument and can therefore
be used as the uevent call directly if no special treatment is
needed for the bus.Signed-off-by: Sylvain Munaut
Signed-off-by: Paul Mackerras
12 Apr, 2007
7 commits
-
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] mpc52xx_pic: fix main interrupt masking -
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
myri10ge: update driver version to 1.3.0-1.233
myri10ge: more Intel chipsets providing aligned PCIe completions
myri10ge: fix management of the firmware 4KB boundary crossing restriction
cxgb3 - missing CPL hanler and register setting.
cxgb3 - MAC watchdog update
cxgb3 - avoid deadlock with mac watchdog
skge: fix wake on lan
sky2: phy workarounds for Yukon EC-U A1
sky2: turn on clocks when doing resume
sky2: turn carrier off when down
skge: turn carrier off when down
[PATCH] bcm43xx: Fix PPC machine checks and match loopback gain specs
[PATCH] bcm43xx: Fix 802.11b/g scan limits to match regulatory reqs
[PATCH] zd1211rw: Fix E2P_PHY_REG patching
[PATCH] zd1211rw: Reject AL2230S devices -
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: Nikon D80 unusual device patch
EHCI: fix remote wakeup regression in 2.6.21-rc -
Noone should use kobj.name directly since it may contain garbage.
Objects with longer names have them stored in separately allocated
memory pointed to by kobj->k_name.Signed-off-by: Dmitry Torokhov
Signed-off-by: Linus Torvalds -
the Nikon D80 camera will not work without an UNUSUAL_DEV entry embodied
in the attached patch (made against 2.6.20.3). Hope you find it helpful,
or if not, pass it along to someone who does.From: Emil Larsson
Signed-off-by: Phil Dibowitz
Signed-off-by: Greg Kroah-Hartman -
There is one significant difference between the behavior of root hubs
(as embodied in host controller hardware) and external hubs: When a
remote-wakeup signal is received, an external hub sends an interrupt
message at the _end_ of the resume sequence but a root hub generates
and interrupt at the _beginning_ of the resume sequence. The host
system must poll for the end of the sequence.When ehci-hcd was converted to interrupt-driven operation instead of
using polling, the remaining need for this particular poll was
overlooked. This patch (as894) fixes the problem.Signed-off-by: Alan Stern
Signed-off-by: Greg Kroah-Hartman -
The bit setting was off by one.
Tested with RTC and GPIO_WKUP interrupts.Signed-off-by: Domen Puncer
Signed-off-by: Sylvain Munaut
Signed-off-by: Paul Mackerras
11 Apr, 2007
22 commits
-
…inville/wireless-2.6 into upstream-fixes
-
Update the myri10ge driver version number to 1.3.0-1.233.
Signed-off-by: Brice Goglin
Signed-off-by: Jeff Garzik -
Add the Intel 5000 southbridge (aka Intel 6310/6311/6321ESB) PCIe ports
and the Intel E30x0 chipsets to the whitelist of aligned PCIe completion.Signed-off-by: Brice Goglin
Signed-off-by: Jeff Garzik -
Simpler way of dealing with the firmware 4KB boundary crossing
restriction for rx buffers. This fixes a variety of memory
corruption issues when using an "uncommon" MTU with a 16KB
page size.Signed-off-by: Brice Goglin
Signed-off-by: Jeff Garzik -
Remove specific CPL handler.
Add missing CPL handler.
Add missing register setting when the interface is brought up.Signed-off-by: Divy Le Ray
Signed-off-by: Jeff Garzik -
The MAC watchdog was failing if the peer interface was brought down.
Signed-off-by: Divy Le Ray
Signed-off-by: Jeff Garzik -
Fix a deadlock when the interface s configured down and
the watchdog tack is sleeping on rtnl_lock.Signed-off-by: Divy Le Ray
Signed-off-by: Jeff Garzik -
Need to rework wake on lan code to setup properly and get activated
on shutdown (and suspend), not when ethtool is run.This does not need to go to stable queue because wake on lan
was not even included in 2.6.20 (or earlier versions).Signed-off-by: Stephen Hemminger
Signed-off-by: Jeff Garzik -
The workaround Yukon EC-U wasn't comparing with correct
version and wasn't doing correct setup. Without it, 88e8056
throws all sorts of errors.Signed-off-by: Stephen Hemminger
Signed-off-by: Jeff Garzik -
Some of these chips are disabled until clock is enabled.
This fixes:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=404107Signed-off-by: Stephen Hemminger
Signed-off-by: Jeff Garzik -
Driver needs to turn off carrier when down.
Signed-off-by: Stephen Hemminger
Signed-off-by: Jeff Garzik -
Driver needs to turn off carrier when down, otherwise it can
confuse bonding and bridging and looks like carrier is on immediately
when it is brought back up.Signed-off-by: Stephen Hemminger
Signed-off-by: Jeff Garzik -
Update the FRV arch MAINTAINER record to get a hit on "grep -i frv". Whilst
FR-V is technically correct, it's normally thought of as FRV.Signed-off-by: David Howells
Signed-off-by: Linus Torvalds -
The UCB1400 is missing a name parameter in the device_driver struct.
This causes missing information in the /sys tree and seems to cause
other problems with the AC97 functionality. This was tested on a PXA270
system.Signed-off-by: Cliff Brake
Signed-off-by: Dmitry Torokhov
Signed-off-by: Linus Torvalds -
* 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] intel_agp: fix G965 GTT size detect -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: change deprecation status of dv1394 -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB/cm: Fix DMA direction typo
IB/iser: Don't defer connection failure notification to workqueue -
* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Do not discard truncated input reports -
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: add "optical" to sysfs "media" attribute
ide: ugly messages trying to open CD drive with no media present
ide: correctly prevent IDE timer expiry function to run if request was already handled -
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function
[TCP]: slow_start_after_idle should influence cwnd validation too
[SC92031]: Fix priv->lock context
[NET_SCHED]: cls_tcindex: fix compatibility breakage -
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] SGI Altix : fix pcibr_dmamap_ate32() bug
[IA64] Fix CPU freq displayed in /proc/cpuinfo
[IA64] Fix wrong assumption about irq and vector in msi_ia64.c
[IA64] BTE error timer fix -
Add "optical" to sysfs "media" attribute as already in /proc
Signed-off-by: Danny Kukawka
Signed-off-by: Bartlomiej Zolnierkiewicz