summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [POWERPC] Constify & voidify get_property()Jeremy Kerr2006-07-3124-238/+239
| | | | | | | | | | | Now that get_property() returns a void *, there's no need to cast its return value. Also, treat the return value as const, so we can constify get_property later. powerpc core changes. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] briq_panel Kconfig fixAndrew Morton2006-07-311-0/+1
| | | | | | | | | drivers/char/briq_panel.c:28:22: error: asm/prom.h: No such file or directory Cc: Jeremy Kerr <jk@ozlabs.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Merge branch 'mpe'Stephen Rothwell2006-07-1418-184/+113
|\
| * [POWERPC] iseries: Move iommu_table_cb into platforms/iseriesMichael Ellerman2006-07-142-17/+17
| | | | | | | | | | | | | | | | | | Although we pass the address of an iommu_table_cb to HvCallXm_getTceTableParms, we don't actually need the structure definition anywhere except in the iseries iommu code, so move the struct in there. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] Fix a compiler warning in mm/tlb_64.cMichael Ellerman2006-07-131-0/+1
| | | | | | | | | | | | | | | | | | The compiler doesn't understand that BUG() never returns, so complains that psize isn't set. Just set it to the normal value, which seems to produce nice code and keeps gcc happy. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] iseries: Fix a compiler warning in platforms/iseries/vpdinfo.cMichael Ellerman2006-07-131-1/+1
| | | | | | | | | | | | | | PhbId might be used unitialised, so set it to 0xff (nothing) always. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] iseries: Fix a compiler warning in platforms/iseries/vpdinfo.cMichael Ellerman2006-07-131-8/+12
| | | | | | | | | | | | | | | | | | iSeries_Get_Location_Code() has error paths, but currently returns void, so give it a return code and only print the output if it returns successfully. Gcc isn't smart enough to be quiet though, so set frame to 0 to shut it up. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] iseries: Move ItLpNaca into platforms/iseriesMichael Ellerman2006-07-136-9/+7
| | | | | | | | | | | | | | Move ItLpNaca into platforms/iseries now that it's not used elsewhere. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] iseries: Make HvLpConfig_get(Primary)LpIndex functionsMichael Ellerman2006-07-133-11/+16
| | | | | | | | | | | | | | | | | | HvLpConfig_get(Primary)LpIndex are currently static inlines that return fields from the itLpNaca, if we make them real functions we can make the itLpNaca private to iSeries. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] iseries: Make ItExtVpdPanel private to iSeriesMichael Ellerman2006-07-134-7/+5
| | | | | | | | | | | | | | | | | | No one outside platforms/iseries needs ItExtVpdPanel anymore, so move it in there. It used to be needed by lparcfg, and so was exported, but isn't needed anymore, so unexport it. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] iseries: Cleanup e2a() and strne2a()Michael Ellerman2006-07-131-75/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | e2a() was formally used by lparcfg, and so had to be exported, but isn't anymore, so don't. e2a() and strne2a() can both be static, and __init. And e2a can be made much more concise if we use x ... y case labels, while we're there add support for lower case letters. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] iseries: Move e2a()/strne2a() into their only callerMichael Ellerman2006-07-134-123/+97
| | | | | | | | | | | | | | | | The ASCII -> EBCDIC functions, e2a() and strne2a() are now only used in dt.c, so move them in there. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] iseries: Use device tree /system-id in /proc/iSeries/configMichael Ellerman2006-07-131-10/+17
| | | | | | | | | | | | | | | | | | We export a bunch of info in /proc/iSeries/config. Currently we pull it directly out of some iSeries specific structs, but we could use the device tree instead, this saves decoding it twice and is a little neater. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | Merge branch 'hvc_iseries'Stephen Rothwell2006-07-1311-41/+652
|\ \
| * | [POWERPC] Make the hvc_console output buffer size settableStephen Rothwell2006-07-135-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | So the iSeries console will be faster since it can send up to 200 bytes at a time to the Hypervisor. This only affects the tty part of the console, the console writes are still in 16 byte lots. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | [POWERPC] iseries: A new iSeries consoleStephen Rothwell2006-07-137-33/+638
| |/ | | | | | | | | | | | | | | | | This driver uses the hvc_console.c infrastructure that is used by the pSeries virtual and RTAS consoles. This will allow us to make viocons.c obsolete and is another step along the way to a combined kernel (as viocons could not coexist with CONFIG_VT). Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | [POWERPC] iseries: Remove unnecessary include of iseries/hv_lp_event.hStephen Rothwell2006-07-132-3/+0
| | | | | | | | | | | | Also remove unnecessary reference to struct HvLpEvent. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | [POWERPC] iseries: Small viotape cleanup allowed by devfs removalStephen Rothwell2006-07-131-4/+2
|/ | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* [POWERPC] Remove linux,pci-domain propertiesJeremy Kerr2006-07-071-38/+1
| | | | | | | | | | The linux,pci-domain property is no longer used by DLPAR/PCI Hotplug utilites, or LSVPD. This change removes it. Built for ppc64_defconfig. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Use const qualifiers for prom parsing utilitesJeremy Kerr2006-07-072-11/+13
| | | | | | | | | | | The of_bus callbacks map and get_flags can be constified, as they don't alter the range or addr arguments. of_dump_addr and of_read_addr can also be constified. Built for 32- and 64-bit powerpc Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Remove linux,device propertiesJeremy Kerr2006-07-071-24/+0
| | | | | | | | | | | | | The linux,device property isn't used anywhere within the kernel, and since it's a kernel pointer, it's a little useless for userspace. This change removes the code to create this property in of_device_register. Built for pmac32. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Add cpufreq support for Xserve G5Benjamin Herrenschmidt2006-07-072-30/+50
| | | | | | | | | | | The Xserve G5 are capable of frequency switching like other desktop G5s. This enables it. It also fix a Kconfig issue which prevented from building the G5 cpufreq support if CONFIG_PMAC_SMU was not set (the first version of that driver only worked with SMU based macs, but this isn't the case anymore). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Xserve G5 thermal control fixesBenjamin Herrenschmidt2006-07-072-17/+234
| | | | | | | | | | | | | | The thermal control for the Xserve G5s had a few issues. For one, the way to program the RPM fans speeds into the FCU is different between it and the desktop models, which I didn't figure out until recently, and it was missing a control loop for the slots fan, running it too fast. Both of those problems were causing the machine to be much more noisy than necessary. This patch also changes the fixed value of the slots fan for desktop G5s to 40% instead of 50%. It seems to still have a pretty good airflow that way and is much less noisy. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Fix mem= handling when the memory limit is > RMO sizeMichael Ellerman2006-07-071-1/+2
| | | | | | | | | | | There's a bug in my cleaned up mem= handling, if the memory limit is larger than the RMO size we'll erroneously enlarge the RMO size. Fix is to only change the RMO size if the memory limit is less than the current RMO value. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] More offb/bootx fixesBenjamin Herrenschmidt2006-07-072-157/+185
| | | | | | | | | | | There were still some issues with offb when BootX doesn't provide a proper display node, this fixes them. This also re-instates the palette hacks that were disabled a couple of kernel versions ago when I converted to the new OF parsing, and shuffles some functions around to avoid prototypes. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Add support for briq front panelBenjamin Herrenschmidt2006-07-073-0/+283
| | | | | | | | | | | This adds the driver for the Briq front panel. This is a cleaned up version of a driver that has been floating around for some time now, initially written by Karsten Jeppesen <karsten@jeppesens.com> and cleaned up by jk and myself. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Add briq support to CHRPBenjamin Herrenschmidt2006-07-074-7/+73
| | | | | | | | | | | The support for Briq machines has been floating around as patches for ages. This cleans it up and adds it once for all. Some of this is based on initial code provided by Karsten Jeppesen <karsten@jeppesens.com> and mostly rewritten from scratch by me. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Fix legacy_serial.c error handling on 32 bitsBenjamin Herrenschmidt2006-07-071-5/+8
| | | | | | | | | | | | | The code in legacy_serial.c wouldn't properly compare OF translation results against OF_BAD_ADDR as it's using a phys_addr_t which is 32 bits on some 32-bit powerpc platforms. This fixes it by always using a u64 which is what is returned by the OF parsing routines. It also makes translation failure harmless for ISA serial ports. If they can't translate, we can't use the UART early, but we can still let the 8250 driver use it later on by using IO port accessors. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Fix default clock for udbg_16550Benjamin Herrenschmidt2006-07-071-1/+5
| | | | | | | | This patch makes it possible to provide 0 as the clock value for udbg_16550, making it default to the standard 1.8432Mhz clock Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Fix non-MPIC CHRPs with CONFIG_SMP setBenjamin Herrenschmidt2006-07-072-11/+25
| | | | | | | | | | | Pseudo-CHRP machines like Pegasos without an MPIC would crash at boot if CONFIG_SMP was set because the "smp_ops" pointer was set to MPIC related ops unconditionally. This patch makes it NULL on machines that don't support SMP and provides proper default behaviour in the callers when smp_ops is NULL. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Fix 32 bits warning in prom_init.cBenjamin Herrenschmidt2006-07-071-0/+2
| | | | | | | A warning is hurting my eyes when building 32 bits kernels Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Workaround Pegasos incorrect ISA "ranges"Benjamin Herrenschmidt2006-07-071-0/+34
| | | | | | | | | | The Pegasos firmware doesn't create a valid "ranges" property for the ISA bridge, thus causing translation of ISA addresses and IO ports to fail. This fixes it, thus re-enabling proper early serial console to work on Pegasos. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] fix up front-LED KconfigJohannes Berg2006-07-074-31/+106
| | | | | | | Rather long patch, apparently no one has updated the pmac32_defconfig in a while. Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Add -fno-stack-protector to BOOTCFLAGS in arch/powerpc/boot/Makefile.Niels Kristian Bech Jensen2006-07-071-0/+4
| | | | | | | | | | | | | | | | I got some undefined references to __stack_chk_fail in arch/powerpc/boot/stdio.o and arch/powerpc/boot/prom.o when I was trying to build a kernel on Ubuntu Edgy Eft - which includes Stack Smashing Protection. This patch adds -fno-stack-protector to BOOTCFLAGS in arch/powerpc/boot/Makefile (why does BOOTCFLAGS depend on HOSTCFLAGS and not CFLAGS?). Regards, Niels Kristian Bech Jensen Signed-off-by: Paul Mackerras <paulus@samba.org>
* Linux 2.6.18-rc1v2.6.18-rc1Linus Torvalds2006-07-051-2/+2
| | | | It's all good.
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-07-051-8/+10
|\ | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [PKT_SCHED]: Fix error handling while dumping actions [PKT_SCHED]: Return ENOENT if action module is unavailable [PKT_SCHED]: Fix illegal memory dereferences when dumping actions
| * [PKT_SCHED]: Fix error handling while dumping actionsThomas Graf2006-07-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | "return -err" and blindly inheriting the error code in the netlink failure exception handler causes errors codes to be returned as positive value therefore making them being ignored by the caller. May lead to sending out incomplete netlink messages. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [PKT_SCHED]: Return ENOENT if action module is unavailableThomas Graf2006-07-051-0/+1
| | | | | | | | | | Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [PKT_SCHED]: Fix illegal memory dereferences when dumping actionsThomas Graf2006-07-051-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TCA_ACT_KIND attribute is used without checking its availability when dumping actions therefore leading to a value of 0x4 being dereferenced. The use of strcmp() in tc_lookup_action_n() isn't safe when fed with string from an attribute without enforcing proper NUL termination. Both bugs can be triggered with malformed netlink message and don't require any privileges. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-07-054-6/+25
|\ \ | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix stack overflow checking in modular non-SMP kernels. [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.
| * | [SPARC64]: Fix stack overflow checking in modular non-SMP kernels.Mikael Pettersson2006-07-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sparc64 kernel's EXPORT_SYMBOL(_mcount) is inside an #ifdef CONFIG_SMP. This breaks modules in non-SMP kernels built with stack overflow checking (CONFIG_STACK_DEBUG=y), as modules_install reports: WARNING: /lib/modules/2.6.17/kernel/drivers/ide/ide-cd.ko needs unknown symbol _mcount Trivially fixed by moving EXPORT_SYMBOL(_mcount) outside of the #ifdef CONFIG_SMP. Signed-off-by: Mikael Pettersson <mikpe@it.uu.se> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.Randy Dunlap2006-07-053-1/+20
| |/ | | | | | | | | Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'upstream-linus' of ↵Linus Torvalds2006-07-059-271/+897
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PCI] Add JMicron PCI ID constants [PATCH] ahci: Ensure that we don't grab both functions [PATCH] libata-core.c: restore configuration boot messages in ata_dev_configure(), v2 [PATCH] sata_sil24: add suspend/sleep support [PATCH] sata_sil24: separate out sil24_init_controller() [PATCH] sata_sil: add suspend/sleep support [PATCH] sata_sil: separate out sil_init_controller() [PATCH] libata: reimplement controller-wide PM [PATCH] libata: reimplement per-dev PM [PATCH] libata: implement PM EH actions [PATCH] libata: separate out __ata_ehi_hotplugged() [PATCH] libata: implement ATA_EHI_NO_AUTOPSY and QUIET [PATCH] libata: clean up debounce parameters and improve parameter selection [PATCH] libata: implement ATA_EHI_RESUME_LINK [PATCH] libata: replace ap_lock w/ ap->lock in ata_scsi_error() [PATCH] libata: fix ehc->i.action setting in ata_eh_autopsy() [PATCH] libata: add ap->pflags and move core dynamic flags to it [PATCH] libata: Conditionally set host->max_cmd_len [PATCH] sata_vsc: data_xfer should use mmio
| * | [PCI] Add JMicron PCI ID constantsJeff Garzik2006-07-051-0/+7
| | | | | | | | | | | | | | | | | | They will be used in several IDE/libata files. Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] ahci: Ensure that we don't grab both functionsroot2006-07-051-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we force the chip into dual fn mode so we get PATA and AHCI we must be sure we don't then do anything dumb like try and grab both with the AHCI driver. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] libata-core.c: restore configuration boot messages in ↵Borislav Petkov2006-07-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ata_dev_configure(), v2 This one looks better, IMHO. This restores the default libata configuration messages printed during booting. Signed-off-by: <petkov@math.uni-muenster.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sata_sil24: add suspend/sleep supportTejun Heo2006-07-051-0/+25
| | | | | | | | | | | | | | | | | | | | | Add suspend/sleep support. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sata_sil24: separate out sil24_init_controller()Tejun Heo2006-07-051-45/+62
| | | | | | | | | | | | | | | | | | | | | | | | Separate out controller initialization from sil24_init_one() into sil24_init_controller(). This will be used by resume. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sata_sil: add suspend/sleep supportTejun Heo2006-07-051-0/+17
| | | | | | | | | | | | | | | | | | | | | Add suspend/sleep support. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sata_sil: separate out sil_init_controller()Tejun Heo2006-07-051-38/+48
| | | | | | | | | | | | | | | | | | | | | | | | Separate out controller initialization from sil_init_one() into sil_init_controller(). This will be used by resume. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 12:21:49 +0000