* please pull powerpc-merge.git
@ 2006-02-20 6:08 Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-02-20 6:08 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
There are 6 commits there with some bug fixes that should go in
2.6.16, including a fix for the xtime vs gettimeofday drift that uses
the current_tick_length() function that was recently added.
Thanks,
Paul.
Michael Ellerman:
powerpc: Don't start secondary CPUs in a UP && KEXEC kernel
powerpc: Make UP -> SMP kexec work again
powerpc: Fix bug in spinup of renumbered secondary threads
Olaf Hering:
powerpc: remove duplicate exports
Olof Johansson:
powerpc: Fix OOPS in lparcfg on G5
Paul Mackerras:
powerpc: Keep xtime and gettimeofday in sync
arch/powerpc/kernel/head_64.S | 4
arch/powerpc/kernel/lparcfg.c | 6 -
arch/powerpc/kernel/ppc_ksyms.c | 16 --
arch/powerpc/kernel/setup_64.c | 4
arch/powerpc/kernel/sys_ppc32.c | 4
arch/powerpc/kernel/time.c | 282 ++++++++++++----------------------
arch/powerpc/platforms/pseries/smp.c | 2
arch/ppc/kernel/ppc_ksyms.c | 8 -
arch/ppc/xmon/start.c | 15 --
include/asm-ppc/machdep.h | 13 --
10 files changed, 108 insertions(+), 246 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* please pull powerpc-merge.git
@ 2006-04-23 1:15 Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-04-23 1:15 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
to get the following powerpc bug-fixes, and a defconfig update.
Thanks,
Paul.
Arnd Bergmann:
powerpc/cell: remove BUILD_BUG_ON and add sys_tee to spu_syscall_table
Becky Bruce:
ppc: Fix powersave code on arch/ppc
Benjamin Herrenschmidt:
powermac: Fix i2c on keywest based chips
powerpc: fix oops in alsa powermac driver
Kumar Gala:
powerpc/ppc: export strncasecmp
Olof Johansson:
powerpc: IOMMU support for honoring dma_mask
powerpc: Lower threshold for DART enablement to 1GB
Paul Mackerras:
powerpc: Fix define_machine so machine_is() works from modules
Will Schmidt:
powerpc: update {g5,iseries,pseries}_defconfigs
arch/powerpc/configs/g5_defconfig | 58 ++++++++++----------
arch/powerpc/configs/iseries_defconfig | 43 +++++++++------
arch/powerpc/configs/pseries_defconfig | 54 +++++++++----------
arch/powerpc/kernel/iommu.c | 38 +++++++++----
arch/powerpc/kernel/pci_iommu.c | 42 +++++++++++++--
arch/powerpc/kernel/ppc_ksyms.c | 1
arch/powerpc/kernel/prom.c | 2 -
arch/powerpc/kernel/systbl.S | 5 ++
arch/powerpc/kernel/vio.c | 6 +-
arch/powerpc/platforms/cell/spu_callbacks.c | 5 +-
arch/powerpc/platforms/powermac/low_i2c.c | 78 ++++++++++++---------------
arch/powerpc/sysdev/dart_iommu.c | 12 +++-
arch/ppc/kernel/asm-offsets.c | 1
arch/ppc/kernel/entry.S | 35 ++++++------
arch/ppc/kernel/ppc_ksyms.c | 1
drivers/macintosh/therm_adt746x.c | 4 +
include/asm-powerpc/iommu.h | 7 +-
include/asm-powerpc/machdep.h | 6 ++
sound/oss/dmasound/tas_common.c | 4 +
sound/ppc/daca.c | 2 -
sound/ppc/tumbler.c | 2 -
21 files changed, 234 insertions(+), 172 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* please pull powerpc-merge.git
@ 2006-04-18 12:11 Paul Mackerras
2006-04-18 18:20 ` Andy Fleming
0 siblings, 1 reply; 19+ messages in thread
From: Paul Mackerras @ 2006-04-18 12:11 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
to get the following powerpc bug-fixes.
Thanks,
Paul.
Anton Blanchard:
powerpc: Ensure runlatch is off in the idle loop
powerpc: Avoid __initcall warnings
Jordi Caubet:
spufs: fix context-switch decrementer code
Linas Vepstas:
powerpc/pseries: bugfix: balance calls to pci_device_put
Michael Ellerman:
powerpc: Fix machine detection in prom_init.c
Olaf Hering:
powerpc32: Set cpu explicitly in kernel compiles
Paul Mackerras:
powerpc: Fix CHRP booting - needs a define_machine call
powerpc: Use correct sequence for putting CPU into nap mode
Stephen Rothwell:
powerpc: iSeries has only 256 IRQs
Vitaly Bordug:
ppc32: Fix string comparing in platform_notify_map
arch/powerpc/Kconfig | 6 +++
arch/powerpc/Makefile | 4 ++
arch/powerpc/kernel/Makefile | 2 -
arch/powerpc/kernel/asm-offsets.c | 1
arch/powerpc/kernel/entry_32.S | 35 +++++++--------
arch/powerpc/kernel/head_64.S | 49 +++++++++++++++++++++
arch/powerpc/kernel/idle.c | 4 +-
arch/powerpc/kernel/idle_6xx.S | 65 +++++++++-------------------
arch/powerpc/kernel/idle_power4.S | 10 +++-
arch/powerpc/kernel/irq.c | 36 +++++++++-------
arch/powerpc/kernel/prom_init.c | 5 +-
arch/powerpc/kernel/rtas-proc.c | 4 +-
arch/powerpc/platforms/cell/spufs/switch.c | 2 -
arch/powerpc/platforms/chrp/chrp.h | 1
arch/powerpc/platforms/chrp/pci.c | 6 ++-
arch/powerpc/platforms/chrp/setup.c | 48 +++++++++------------
arch/powerpc/platforms/iseries/setup.c | 7 +++
arch/powerpc/platforms/pseries/eeh.c | 6 ++-
arch/powerpc/platforms/pseries/rtasd.c | 2 -
arch/ppc/syslib/ppc_sys.c | 9 ++--
include/asm-powerpc/irq.h | 7 +++
include/asm-powerpc/thread_info.h | 8 +++
22 files changed, 194 insertions(+), 123 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* please pull powerpc-merge.git
@ 2006-03-16 10:53 Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-03-16 10:53 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
I have redone the powerpc-merge.git tree and eliminated one
unnecessary merge that I had in there. I have pushed it up to
kernel.org using git push, and I have done a test pull to check that
it is all OK this time. So please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
There are the same set of commits in there as I listed in my last pull
request.
Thanks,
Paul.
^ permalink raw reply [flat|nested] 19+ messages in thread
* please pull powerpc-merge.git
@ 2006-03-15 5:52 Paul Mackerras
2006-03-15 15:52 ` Linus Torvalds
0 siblings, 1 reply; 19+ messages in thread
From: Paul Mackerras @ 2006-03-15 5:52 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
There are 5 commits in there which fix bugs which need to be fixed for
2.6.16:
Benjamin Herrenschmidt:
powerpc: enable NAP only on cpus who support it to avoid memory corruption
John Rose:
powerpc: properly configure DDR/P5IOC children devs
Michael Neuling:
powerpc: RTC memory corruption
Olaf Hering:
powerpc: correct cacheflush loop in zImage
Paul Mackerras:
powerpc: Fix problem with time going backwards
plus a patch from Olaf Hering to remove some duplicate EXPORT_SYMBOLs,
which cause warnings at compile time (perhaps not critical, but still
should be fixed, and the fix is low-impact),
plus two patches which make minor changes to Kconfig files:
Michael Ellerman:
powerpc: Clarify wording for CRASH_DUMP Kconfig option
Paul Mackerras:
powerpc: Disallow lparcfg being a module
plus two commits that update defconfig files:
Olaf Hering:
powerpc/64: enable CONFIG_BLK_DEV_SL82C105
Paul Mackerras:
powerpc: update defconfigs
I have included the full commit message plus patch below for all
except the defconfig updates.
Thanks,
Paul.
arch/powerpc/Kconfig | 2 -
arch/powerpc/boot/crt0.S | 5 +
arch/powerpc/configs/cell_defconfig | 94 +++++++++++++++++++--------
arch/powerpc/configs/iseries_defconfig | 96 +++++++++++++++++-----------
arch/powerpc/configs/maple_defconfig | 50 ++++++++++++---
arch/powerpc/configs/mpc834x_sys_defconfig | 32 +++++----
arch/powerpc/configs/pmac32_defconfig | 77 ++++++++++++++--------
arch/powerpc/configs/ppc64_defconfig | 2 -
arch/powerpc/kernel/pci_64.c | 5 +
arch/powerpc/kernel/ppc_ksyms.c | 10 ---
arch/powerpc/kernel/rtas-rtc.c | 2 -
arch/powerpc/kernel/rtas_pci.c | 24 -------
arch/powerpc/kernel/time.c | 48 ++++++++++----
arch/powerpc/mm/pgtable_32.c | 5 +
arch/powerpc/platforms/powermac/feature.c | 9 +--
arch/powerpc/platforms/powermac/setup.c | 4 -
arch/powerpc/platforms/pseries/Kconfig | 2 -
arch/powerpc/platforms/pseries/pci_dlpar.c | 28 ++++++++
include/asm-powerpc/ppc-pci.h | 1
19 files changed, 315 insertions(+), 181 deletions(-)
diff-tree bb32754f054f42455cac667daea62668035f427c (from 7177ee48eb3a9f042f10d5b4e49f1737b988123d)
Author: John Rose <johnrose@austin.ibm.com>
Date: Tue Mar 14 17:46:45 2006 -0600
[PATCH] powerpc: properly configure DDR/P5IOC children devs
The dynamic add path for PCI Host Bridges can fail to configure children
adapters under P5IOC controllers. It fails to properly fixup bus/device
resources, and it fails to properly enable EEH. Both of these steps
need to occur before any children devices are enabled in
pci_bus_add_devices().
Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index c367520..ba92bab 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -589,7 +589,6 @@ void __devinit scan_phb(struct pci_contr
#endif /* CONFIG_PPC_MULTIPLATFORM */
if (mode == PCI_PROBE_NORMAL)
hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
- pci_bus_add_devices(bus);
}
static int __init pcibios_init(void)
@@ -608,8 +607,10 @@ static int __init pcibios_init(void)
printk("PCI: Probing PCI hardware\n");
/* Scan all of the recorded PCI controllers. */
- list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
+ list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
scan_phb(hose);
+ pci_bus_add_devices(hose->bus);
+ }
#ifndef CONFIG_PPC_ISERIES
if (pci_probe_only)
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 5579f65..7442775 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -280,8 +280,7 @@ static int phb_set_bus_ranges(struct dev
return 0;
}
-static int __devinit setup_phb(struct device_node *dev,
- struct pci_controller *phb)
+int __devinit setup_phb(struct device_node *dev, struct pci_controller *phb)
{
if (is_python(dev))
python_countermeasures(dev);
@@ -359,27 +358,6 @@ unsigned long __init find_and_init_phbs(
return 0;
}
-struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
-{
- struct pci_controller *phb;
- int primary;
-
- primary = list_empty(&hose_list);
- phb = pcibios_alloc_controller(dn);
- if (!phb)
- return NULL;
- setup_phb(dn, phb);
- pci_process_bridge_OF_ranges(phb, dn, primary);
-
- pci_setup_phb_io_dynamic(phb, primary);
-
- pci_devs_phb_init_dynamic(phb);
- scan_phb(phb);
-
- return phb;
-}
-EXPORT_SYMBOL(init_phb_dynamic);
-
/* RPA-specific bits for removing PHBs */
int pcibios_remove_root_bus(struct pci_controller *phb)
{
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index f3bad90..44abdeb 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -27,6 +27,7 @@
#include <linux/pci.h>
#include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
static struct pci_bus *
find_bus_among_children(struct pci_bus *bus,
@@ -179,3 +180,30 @@ pcibios_add_pci_devices(struct pci_bus *
}
}
EXPORT_SYMBOL_GPL(pcibios_add_pci_devices);
+
+struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
+{
+ struct pci_controller *phb;
+ int primary;
+
+ primary = list_empty(&hose_list);
+ phb = pcibios_alloc_controller(dn);
+ if (!phb)
+ return NULL;
+ setup_phb(dn, phb);
+ pci_process_bridge_OF_ranges(phb, dn, 0);
+
+ pci_setup_phb_io_dynamic(phb, primary);
+
+ pci_devs_phb_init_dynamic(phb);
+
+ if (dn->child)
+ eeh_add_device_tree_early(dn);
+
+ scan_phb(phb);
+ pcibios_fixup_new_pci_devices(phb->bus, 0);
+ pci_bus_add_devices(phb->bus);
+
+ return phb;
+}
+EXPORT_SYMBOL_GPL(init_phb_dynamic);
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index f80482c..cf79bc7 100644
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -38,6 +38,7 @@ void *traverse_pci_devices(struct device
void pci_devs_phb_init(void);
void pci_devs_phb_init_dynamic(struct pci_controller *phb);
+int setup_phb(struct device_node *dev, struct pci_controller *phb);
void __devinit scan_phb(struct pci_controller *hose);
/* From rtas_pci.h */
diff-tree 7177ee48eb3a9f042f10d5b4e49f1737b988123d (from 33bcc33f7f445c9c43a0f4a67b24561821b3aeaa)
Author: Olaf Hering <olh@suse.de>
Date: Tue Mar 14 21:21:11 2006 +0100
[PATCH] powerpc: remove duplicate EXPORT_SYMBOLS
remove warnings when building a 64bit kernel.
smp_call_function triggers also with 32bit kernel.
WARNING: vmlinux: duplicate symbol 'smp_call_function' previous definition was in vmlinux
arch/powerpc/kernel/ppc_ksyms.c:164:EXPORT_SYMBOL(smp_call_function);
arch/powerpc/kernel/smp.c:300:EXPORT_SYMBOL(smp_call_function);
WARNING: vmlinux: duplicate symbol 'ioremap' previous definition was in vmlinux
arch/powerpc/kernel/ppc_ksyms.c:113:EXPORT_SYMBOL(ioremap);
arch/powerpc/mm/pgtable_64.c:321:EXPORT_SYMBOL(ioremap);
WARNING: vmlinux: duplicate symbol '__ioremap' previous definition was in vmlinux
arch/powerpc/kernel/ppc_ksyms.c:117:EXPORT_SYMBOL(__ioremap);
arch/powerpc/mm/pgtable_64.c:322:EXPORT_SYMBOL(__ioremap);
WARNING: vmlinux: duplicate symbol 'iounmap' previous definition was in vmlinux
arch/powerpc/kernel/ppc_ksyms.c:118:EXPORT_SYMBOL(iounmap);
arch/powerpc/mm/pgtable_64.c:323:EXPORT_SYMBOL(iounmap);
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 8a731ea..63ecbec 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -110,15 +110,6 @@ EXPORT_SYMBOL(_insw_ns);
EXPORT_SYMBOL(_outsw_ns);
EXPORT_SYMBOL(_insl_ns);
EXPORT_SYMBOL(_outsl_ns);
-EXPORT_SYMBOL(ioremap);
-#ifdef CONFIG_44x
-EXPORT_SYMBOL(ioremap64);
-#endif
-EXPORT_SYMBOL(__ioremap);
-EXPORT_SYMBOL(iounmap);
-#ifdef CONFIG_PPC32
-EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
-#endif
#if defined(CONFIG_PPC32) && (defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE))
EXPORT_SYMBOL(ppc_ide_md);
@@ -161,7 +152,6 @@ EXPORT_SYMBOL(__flush_icache_range);
EXPORT_SYMBOL(flush_dcache_range);
#ifdef CONFIG_SMP
-EXPORT_SYMBOL(smp_call_function);
#ifdef CONFIG_PPC32
EXPORT_SYMBOL(smp_hw_index);
#endif
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index f4e5ac1..d296eb6 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -37,6 +37,7 @@
unsigned long ioremap_base;
unsigned long ioremap_bot;
+EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
int io_bat_index;
#if defined(CONFIG_6xx) || defined(CONFIG_POWER3)
@@ -153,6 +154,7 @@ ioremap64(unsigned long long addr, unsig
{
return __ioremap(addr, size, _PAGE_NO_CACHE);
}
+EXPORT_SYMBOL(ioremap64);
void __iomem *
ioremap(phys_addr_t addr, unsigned long size)
@@ -162,6 +164,7 @@ ioremap(phys_addr_t addr, unsigned long
return ioremap64(addr64, size);
}
#endif /* CONFIG_PHYS_64BIT */
+EXPORT_SYMBOL(ioremap);
void __iomem *
__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
@@ -247,6 +250,7 @@ __ioremap(phys_addr_t addr, unsigned lon
out:
return (void __iomem *) (v + ((unsigned long)addr & ~PAGE_MASK));
}
+EXPORT_SYMBOL(__ioremap);
void iounmap(volatile void __iomem *addr)
{
@@ -259,6 +263,7 @@ void iounmap(volatile void __iomem *addr
if (addr > high_memory && (unsigned long) addr < ioremap_bot)
vunmap((void *) (PAGE_MASK & (unsigned long)addr));
}
+EXPORT_SYMBOL(iounmap);
void __iomem *ioport_map(unsigned long port, unsigned int len)
{
diff-tree 33bcc33f7f445c9c43a0f4a67b24561821b3aeaa (from 486154a6329aca598d1590d6fc6ea074a8e3d7bd)
Author: Michael Neuling <mikey@neuling.org>
Date: Tue Mar 14 17:11:51 2006 +1100
[PATCH] powerpc: RTC memory corruption
We should be memset'ing the data we are pointing to, not the pointer
itself. This is in an error path so we probably don't hit it much.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/kernel/rtas-rtc.c b/arch/powerpc/kernel/rtas-rtc.c
index 635d3b9..34d073f 100644
--- a/arch/powerpc/kernel/rtas-rtc.c
+++ b/arch/powerpc/kernel/rtas-rtc.c
@@ -52,7 +52,7 @@ void rtas_get_rtc_time(struct rtc_time *
error = rtas_call(rtas_token("get-time-of-day"), 0, 8, ret);
if (error == RTAS_CLOCK_BUSY || rtas_is_extended_busy(error)) {
if (in_interrupt() && printk_ratelimit()) {
- memset(&rtc_tm, 0, sizeof(struct rtc_time));
+ memset(rtc_tm, 0, sizeof(struct rtc_time));
printk(KERN_WARNING "error: reading clock"
" would delay interrupt\n");
return; /* delay not allowed */
diff-tree 486154a6329aca598d1590d6fc6ea074a8e3d7bd (from 6275062d9d9f1709543667cb509755c2a1c9153a)
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun Mar 12 10:55:01 2006 +1100
[PATCH] powerpc: enable NAP only on cpus who support it to avoid memory corruption
This patch fixes incorrect setting of powersave_nap to 1 on all
PowerMacs, potentially causing memory corruption on some models. This
bug was introuced by me during the 32/64 bits merge.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 34714d3..bbe7948 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -2491,9 +2491,7 @@ found:
pmac_mb.model_id = PMAC_TYPE_COMET;
iounmap(mach_id_ptr);
}
-#endif /* CONFIG_POWER4 */
-#ifdef CONFIG_6xx
/* Set default value of powersave_nap on machines that support it.
* It appears that uninorth rev 3 has a problem with it, we don't
* enable it on those. In theory, the flush-on-lock property is
@@ -2522,10 +2520,11 @@ found:
* NAP mode
*/
powersave_lowspeed = 1;
-#endif /* CONFIG_6xx */
-#ifdef CONFIG_POWER4
+
+#else /* CONFIG_POWER4 */
powersave_nap = 1;
-#endif
+#endif /* CONFIG_POWER4 */
+
/* Check for "mobile" machine */
if (model && (strncmp(model, "PowerBook", 9) == 0
|| strncmp(model, "iBook", 5) == 0))
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 1955462..29c2946 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -621,10 +621,6 @@ static void __init pmac_init_early(void)
/* Probe motherboard chipset */
pmac_feature_init();
- /* We can NAP */
- powersave_nap = 1;
- printk(KERN_INFO "Using native/NAP idle loop\n");
-
/* Initialize debug stuff */
udbg_scc_init(!!strstr(cmd_line, "sccdbg"));
udbg_adb_init(!!strstr(cmd_line, "btextdbg"));
diff-tree 6275062d9d9f1709543667cb509755c2a1c9153a (from 0406e1c8a64b329377cae662cfcb1efccbde754d)
Author: Michael Ellerman <michael@ellerman.id.au>
Date: Fri Mar 10 15:01:08 2006 +1100
[PATCH] powerpc: Clarify wording for CRASH_DUMP Kconfig option
The wording of the CRASH_DUMP Kconfig option is not very clear. It gives you a
kernel that can be used _as_ the kdump kernel, not a kernel that can boot into
a kdump kernel.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a834f9e..dfba817 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -580,7 +580,7 @@ config KEXEC
strongly in flux, so no good recommendation can be made.
config CRASH_DUMP
- bool "kernel crash dumps (EXPERIMENTAL)"
+ bool "Build a kdump crash kernel (EXPERIMENTAL)"
depends on PPC_MULTIPLATFORM && PPC64 && EXPERIMENTAL
help
Build a kernel suitable for use as a kdump capture kernel.
diff-tree 8ff99aa6d36c4e568c85197e6e1439c15b206504 (from 17c3dec53d68857a5c9e3d671b6a2b82225ec202)
Author: Olaf Hering <olh@suse.de>
Date: Sat Mar 4 13:15:40 2006 +0100
[PATCH] powerpc: correct cacheflush loop in zImage
Correct the loop for cacheflush. No idea where I copied the code from,
but the original does not work correct. Maybe the flush is not needed.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/boot/crt0.S b/arch/powerpc/boot/crt0.S
index e0192c2..70e65b1 100644
--- a/arch/powerpc/boot/crt0.S
+++ b/arch/powerpc/boot/crt0.S
@@ -45,7 +45,8 @@ _zimage_start:
bdnz 2b
/* Do a cache flush for our text, in case OF didn't */
-3: lis r9,_start@h
+3: lis r9,_start@ha
+ addi r9,r9,_start@l
add r9,r0,r9
lis r8,_etext@ha
addi r8,r8,_etext@l
@@ -53,7 +54,7 @@ _zimage_start:
4: dcbf r0,r9
icbi r0,r9
addi r9,r9,0x20
- cmplwi 0,r9,8
+ cmplw cr0,r9,r8
blt 4b
sync
isync
diff-tree 17c3dec53d68857a5c9e3d671b6a2b82225ec202 (from cdc1e86904587171e70e16f7b77e8d2879f06c3c)
Author: Paul Mackerras <paulus@samba.org>
Date: Wed Mar 15 13:47:15 2006 +1100
powerpc: Fix problem with time going backwards
The recent changes to keep gettimeofday in sync with xtime had the side
effect that it was occasionally possible for the time reported by
gettimeofday to go back by a microsecond. There were two reasons:
(1) when we recalculated the offsets used by gettimeofday every 2^31
timebase ticks, we lost an accumulated fractional microsecond, and
(2) because the update is done some time after the notional start of
jiffy, if ntp is slowing the clock, it is possible to see time go backwards
when the timebase factor gets reduced.
This fixes it by (a) slowing the gettimeofday clock by about 1us in
2^31 timebase ticks (a factor of less than 1 in 3.7 million), and (b)
adjusting the timebase offsets in the rare case that the gettimeofday
result could possibly go backwards (i.e. when ntp is slowing the clock
and the timer interrupt is late). In this case the adjustment will
reduce to zero eventually because of (a).
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 2a7ddc5..86f7e3d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -283,9 +283,9 @@ static inline void update_gtod(u64 new_t
* the two values of tb_update_count match and are even then the
* tb_to_xs and stamp_xsec values are consistent. If not, then it
* loops back and reads them again until this criteria is met.
+ * We expect the caller to have done the first increment of
+ * vdso_data->tb_update_count already.
*/
- ++(vdso_data->tb_update_count);
- smp_wmb();
vdso_data->tb_orig_stamp = new_tb_stamp;
vdso_data->stamp_xsec = new_stamp_xsec;
vdso_data->tb_to_xs = new_tb_to_xs;
@@ -310,20 +310,15 @@ static __inline__ void timer_recalc_offs
unsigned long offset;
u64 new_stamp_xsec;
u64 tlen, t2x;
+ u64 tb, xsec_old, xsec_new;
+ struct gettimeofday_vars *varp;
if (__USE_RTC())
return;
tlen = current_tick_length();
offset = cur_tb - do_gtod.varp->tb_orig_stamp;
- if (tlen == last_tick_len && offset < 0x80000000u) {
- /* check that we're still in sync; if not, resync */
- struct timeval tv;
- __do_gettimeofday(&tv, cur_tb);
- if (tv.tv_sec <= xtime.tv_sec &&
- (tv.tv_sec < xtime.tv_sec ||
- tv.tv_usec * 1000 <= xtime.tv_nsec))
- return;
- }
+ if (tlen == last_tick_len && offset < 0x80000000u)
+ return;
if (tlen != last_tick_len) {
t2x = mulhdu(tlen << TICKLEN_SHIFT, ticklen_to_xs);
last_tick_len = tlen;
@@ -332,6 +327,21 @@ static __inline__ void timer_recalc_offs
new_stamp_xsec = (u64) xtime.tv_nsec * XSEC_PER_SEC;
do_div(new_stamp_xsec, 1000000000);
new_stamp_xsec += (u64) xtime.tv_sec * XSEC_PER_SEC;
+
+ ++vdso_data->tb_update_count;
+ smp_mb();
+
+ /*
+ * Make sure time doesn't go backwards for userspace gettimeofday.
+ */
+ tb = get_tb();
+ varp = do_gtod.varp;
+ xsec_old = mulhdu(tb - varp->tb_orig_stamp, varp->tb_to_xs)
+ + varp->stamp_xsec;
+ xsec_new = mulhdu(tb - cur_tb, t2x) + new_stamp_xsec;
+ if (xsec_new < xsec_old)
+ new_stamp_xsec += xsec_old - xsec_new;
+
update_gtod(cur_tb, new_stamp_xsec, t2x);
}
@@ -564,6 +574,10 @@ int do_settimeofday(struct timespec *tv)
}
#endif
+ /* Make userspace gettimeofday spin until we're done. */
+ ++vdso_data->tb_update_count;
+ smp_mb();
+
/*
* Subtract off the number of nanoseconds since the
* beginning of the last tick.
@@ -724,10 +738,16 @@ void __init time_init(void)
* It is computed as:
* ticklen_to_xs = 2^N / (tb_ticks_per_jiffy * 1e9)
* where N = 64 + 20 - TICKLEN_SCALE - TICKLEN_SHIFT
- * so as to give the result as a 0.64 fixed-point fraction.
+ * which turns out to be N = 51 - SHIFT_HZ.
+ * This gives the result as a 0.64 fixed-point fraction.
+ * That value is reduced by an offset amounting to 1 xsec per
+ * 2^31 timebase ticks to avoid problems with time going backwards
+ * by 1 xsec when we do timer_recalc_offset due to losing the
+ * fractional xsec. That offset is equal to ppc_tb_freq/2^51
+ * since there are 2^20 xsec in a second.
*/
- div128_by_32(1ULL << (64 + 20 - TICKLEN_SCALE - TICKLEN_SHIFT), 0,
- tb_ticks_per_jiffy, &res);
+ div128_by_32((1ULL << 51) - ppc_tb_freq, 0,
+ tb_ticks_per_jiffy << SHIFT_HZ, &res);
div128_by_32(res.result_high, res.result_low, NSEC_PER_SEC, &res);
ticklen_to_xs = res.result_low;
diff-tree 82dfdcae0d57c842e02f037758687eef42fb7af6 (from 3759fa9c55923f719ae944a3f8fbb029b36f759d)
Author: Paul Mackerras <paulus@samba.org>
Date: Tue Mar 14 11:35:37 2006 +1100
powerpc: Disallow lparcfg being a module
The lparcfg code needs several things which are pretty arcane internal
details and which we don't want to export, which means that lparcfg
doesn't work when built as a module. This makes it a bool instead of
a tristate in the Kconfig so that users can't try to build it as a
module.
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 4e5c8f8..a57032c 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -19,7 +19,7 @@ config SCANLOG
depends on RTAS_PROC && PPC_PSERIES
config LPARCFG
- tristate "LPAR Configuration Data"
+ bool "LPAR Configuration Data"
depends on PPC_PSERIES || PPC_ISERIES
help
Provide system capacity information via human readable
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: please pull powerpc-merge.git
2006-03-15 5:52 Paul Mackerras
@ 2006-03-15 15:52 ` Linus Torvalds
2006-03-15 20:32 ` Paul Mackerras
0 siblings, 1 reply; 19+ messages in thread
From: Linus Torvalds @ 2006-03-15 15:52 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
On Wed, 15 Mar 2006, Paul Mackerras wrote:
>
> Please do a pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
Umm. What _have_ you done to that tree?
error: object directory /home/paulus/kernel/linux-2.6/.git/objects does not exist; check .git/objects/info/alternates.
error: object directory /home/paulus/kernel/linux-2.6/.git/objects does not exist; check .git/objects/info/alternates.
Generating pack...
error: object directory /home/paulus/kernel/linux-2.6/.git/objects does not exist; check .git/objects/info/alternates.
error: Could not read a488edc914aa1d766a4e2c982b5ae03d5657ec1b
error: Could not read 3759fa9c55923f719ae944a3f8fbb029b36f759d
error: Could not read 153b1d3f0a5ec0760deef783e337e2164bfa1a68
fatal: bad tree object 153b1d3f0a5ec0760deef783e337e2164bfa1a68
Done counting 0 objects.
Total 0, written 0 (delta 0), reused 0 (delta 0)
Unpacking 0 objects
Hmm? Looks like you're _still_ using rsync to move git trees around, and
that is just not valid.
Please just do "git push" to push to master. Use the "-f" flag if you
want to force it because you did bad things. Don't use rsync. rsync on
git repos is evil and wrong when there are other alternatives, and leads
to crap like the above.
Linus
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: please pull powerpc-merge.git
2006-03-15 15:52 ` Linus Torvalds
@ 2006-03-15 20:32 ` Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-03-15 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev
Linus Torvalds writes:
> Umm. What _have_ you done to that tree?
Just stuffed up the objects/info/alternates file. It's fixed now.
> Please just do "git push" to push to master. Use the "-f" flag if you
> want to force it because you did bad things. Don't use rsync. rsync on
> git repos is evil and wrong when there are other alternatives, and leads
> to crap like the above.
OK, will do.
Paul.
^ permalink raw reply [flat|nested] 19+ messages in thread
* please pull powerpc-merge.git
@ 2006-03-08 2:32 Paul Mackerras
2006-03-08 8:08 ` Olaf Hering
0 siblings, 1 reply; 19+ messages in thread
From: Paul Mackerras @ 2006-03-08 2:32 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
There is just one new commit - the one from me fixing some problems in
the syscall entry/exit path. There are 8 commits still there from the
last pull request.
Thanks,
Paul.
Benjamin Herrenschmidt:
powerpc: Fix old g5 issues with windfarm
powerpc: Fix windfarm_pm112 not starting all control loops
powerpc: Expose SMT and L1 icache snoop userland features
powerpc: incorrect rmo_top handling in prom_init
David Gibson:
powerpc: Fix incorrect pud_ERROR() message
Paul Mackerras:
powerpc: Fix might-sleep warning in program check exception handler
powerpc: Turn off verbose debug output in powermac platform functions
powerpc32: Fix timebase synchronization on 32-bit powermacs
powerpc: Fix various syscall/signal/swapcontext bugs
arch/powerpc/kernel/asm-offsets.c | 1
arch/powerpc/kernel/cputable.c | 9 ++
arch/powerpc/kernel/entry_32.S | 95 +++++++-------------------
arch/powerpc/kernel/entry_64.S | 94 ++++++--------------------
arch/powerpc/kernel/prom_init.c | 2 -
arch/powerpc/kernel/ptrace.c | 5 -
arch/powerpc/kernel/signal_32.c | 19 +----
arch/powerpc/kernel/signal_64.c | 9 --
arch/powerpc/kernel/systbl.S | 2 -
arch/powerpc/kernel/traps.c | 2 +
arch/powerpc/platforms/powermac/pfunc_base.c | 5 +
arch/powerpc/platforms/powermac/pfunc_core.c | 6 ++
arch/powerpc/platforms/powermac/smp.c | 2 -
arch/ppc/kernel/asm-offsets.c | 1
arch/ppc/kernel/entry.S | 95 +++++++-------------------
drivers/macintosh/windfarm_core.c | 7 ++
drivers/macintosh/windfarm_cpufreq_clamp.c | 8 ++
drivers/macintosh/windfarm_lm75_sensor.c | 32 ++++++---
drivers/macintosh/windfarm_max6690_sensor.c | 25 +++++--
drivers/macintosh/windfarm_pm112.c | 8 +-
include/asm-powerpc/cputable.h | 2 +
include/asm-powerpc/pgtable-4k.h | 2 -
include/asm-powerpc/thread_info.h | 8 +-
23 files changed, 163 insertions(+), 276 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: please pull powerpc-merge.git
2006-03-08 2:32 Paul Mackerras
@ 2006-03-08 8:08 ` Olaf Hering
2006-03-09 0:55 ` Paul Mackerras
0 siblings, 1 reply; 19+ messages in thread
From: Olaf Hering @ 2006-03-08 8:08 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, torvalds
On Wed, Mar 08, Paul Mackeras wrote:
> powerpc: incorrect rmo_top handling in prom_init
I would leave this one out. It gives the false impression that ibook1
works ok, while later it will likely eat your filesystem. Its not a
regression in that sense because 2.6.15 was also broken and noone
complained.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: please pull powerpc-merge.git
2006-03-08 8:08 ` Olaf Hering
@ 2006-03-09 0:55 ` Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-03-09 0:55 UTC (permalink / raw)
To: Olaf Hering; +Cc: linuxppc-dev, torvalds
Olaf Hering writes:
> On Wed, Mar 08, Paul Mackeras wrote:
>
> > powerpc: incorrect rmo_top handling in prom_init
>
> I would leave this one out. It gives the false impression that ibook1
> works ok, while later it will likely eat your filesystem. Its not a
> regression in that sense because 2.6.15 was also broken and noone
> complained.
Ben H and I agree that the fix makes sense and is correct and should
go in for 2.6.16. Your iBook crashes are a separate problem.
Paul.
^ permalink raw reply [flat|nested] 19+ messages in thread
* please pull powerpc-merge.git
@ 2006-03-03 11:23 Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-03-03 11:23 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
More bugfixes, including a fix for the nasty timebase synchronization
bug reported by Kyle Moffett, plus a patch from Ben H. to tell
userland (via the AT_HWCAP mechanism) if the cpu has hardware threads
and if the i-cache snoops the d-cache.
Thanks,
Paul.
Benjamin Herrenschmidt:
powerpc: Fix old g5 issues with windfarm
powerpc: Fix windfarm_pm112 not starting all control loops
powerpc: Expose SMT and L1 icache snoop userland features
powerpc: incorrect rmo_top handling in prom_init
David Gibson:
powerpc: Fix incorrect pud_ERROR() message
Paul Mackerras:
powerpc: Fix might-sleep warning in program check exception handler
powerpc: Turn off verbose debug output in powermac platform functions
powerpc32: Fix timebase synchronization on 32-bit powermacs
arch/powerpc/kernel/cputable.c | 9 +++++--
arch/powerpc/kernel/prom_init.c | 2 +-
arch/powerpc/kernel/traps.c | 2 ++
arch/powerpc/platforms/powermac/pfunc_base.c | 5 ++++
arch/powerpc/platforms/powermac/pfunc_core.c | 6 +++++
arch/powerpc/platforms/powermac/smp.c | 2 +-
drivers/macintosh/windfarm_core.c | 7 ++++++
drivers/macintosh/windfarm_cpufreq_clamp.c | 8 +++++++
drivers/macintosh/windfarm_lm75_sensor.c | 32 +++++++++++++++++++-------
drivers/macintosh/windfarm_max6690_sensor.c | 25 +++++++++++++++-----
drivers/macintosh/windfarm_pm112.c | 8 ++++---
include/asm-powerpc/cputable.h | 2 ++
include/asm-powerpc/pgtable-4k.h | 2 +-
13 files changed, 85 insertions(+), 25 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* please pull powerpc-merge.git
@ 2006-02-28 12:00 Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-02-28 12:00 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
Just four small bugfixes this time.
Thanks,
Paul.
Benjamin Herrenschmidt:
powerpc: vdso 64bits gettimeofday bug
John Rose:
powerpc: fix dynamic PCI probe regression
Michael Ellerman:
powerpc/iseries: Fix double phys_to_abs bug in htab_bolt_mapping
Olaf Hering:
powerpc: fix NULL pointer in handle_eeh_events
arch/powerpc/kernel/vdso64/gettimeofday.S | 4 ++-
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/platforms/pseries/eeh.c | 14 +++++++++++
arch/powerpc/platforms/pseries/eeh_driver.c | 2 +-
arch/powerpc/platforms/pseries/pci_dlpar.c | 36 +++++++++++++++------------
include/asm-powerpc/eeh.h | 7 +++--
6 files changed, 42 insertions(+), 23 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* please pull powerpc-merge.git
@ 2006-02-24 2:36 Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-02-24 2:36 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
I have pulled out the problematic commit, so please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
There are 14 commits there: fixes for various bugs and a performance
regression, plus a defconfig update.
Thanks,
Paul.
Alan Curry:
powerpc: fix altivec_unavailable_exception Oopses
Anton Blanchard:
powerpc: Fix runlatch performance issues
powerpc64: remove broken/bitrotted HMT support
Haren Myneni:
powerpc: Trivial fix to set the proper timeout value for kdump
Kelly Daly:
powerpc: disable OProfile for iSeries
Kumar Gala:
powerpc: Enable coherency for all pages on 83xx to fix PCI data corruption
Michael Ellerman:
powerpc: Initialise hvlpevent_queue.lock correctly
powerpc: Only calculate htab_size in one place for kexec
Michal Ostrowski:
Fix race condition in hvc console.
Olaf Hering:
ppc: fix adb breakage in xmon
Olof Johansson:
powerpc: Update {g5,pseries,ppc64}_defconfig
R Sharada:
powerpc64: fix spinlock recursion in native_hpte_clear
Segher Boessenkool:
powerpc: Fix some MPIC + HT APIC buglets
powerpc: Don't re-assign PCI resources on Maple
arch/powerpc/configs/g5_defconfig | 174 ++++++++++--------------
arch/powerpc/configs/ppc64_defconfig | 173 ++++++++++--------------
arch/powerpc/configs/pseries_defconfig | 127 ++++++-----------
arch/powerpc/kernel/crash.c | 4 -
arch/powerpc/kernel/head_32.S | 1
arch/powerpc/kernel/head_64.S | 109 +--------------
arch/powerpc/kernel/machine_kexec_64.c | 10 -
arch/powerpc/kernel/process.c | 32 ++++
arch/powerpc/kernel/prom_init.c | 38 -----
arch/powerpc/mm/hash_native_64.c | 7 +
arch/powerpc/mm/hash_utils_64.c | 3
arch/powerpc/oprofile/Kconfig | 1
arch/powerpc/platforms/iseries/lpevents.c | 2
arch/powerpc/platforms/iseries/setup.c | 1
arch/powerpc/platforms/maple/pci.c | 4 -
arch/powerpc/platforms/pseries/Kconfig | 7 -
arch/powerpc/sysdev/mpic.c | 9 +
arch/ppc/kernel/head.S | 1
arch/ppc/xmon/adb.c | 212 -----------------------------
arch/ppc/xmon/start.c | 169 -----------------------
arch/ppc/xmon/xmon.c | 108 ---------------
drivers/char/hvc_console.c | 8 +
include/asm-powerpc/cputable.h | 9 +
include/asm-powerpc/mmu.h | 1
include/asm-powerpc/reg.h | 33 -----
include/asm-powerpc/thread_info.h | 4 -
26 files changed, 274 insertions(+), 973 deletions(-)
delete mode 100644 arch/ppc/xmon/adb.c
^ permalink raw reply [flat|nested] 19+ messages in thread* please pull powerpc-merge.git
@ 2006-02-23 12:05 Paul Mackerras
2006-02-24 0:19 ` Paul Mackerras
0 siblings, 1 reply; 19+ messages in thread
From: Paul Mackerras @ 2006-02-23 12:05 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
There are 15 commits there: fixes for various bugs and a performance
regression, plus a defconfig update.
Thanks,
Paul.
Alan Curry:
powerpc: fix altivec_unavailable_exception Oopses
Anton Blanchard:
powerpc: Fix runlatch performance issues
powerpc64: remove broken/bitrotted HMT support
Haren Myneni:
powerpc: Trivial fix to set the proper timeout value for kdump
Kelly Daly:
powerpc: disable OProfile for iSeries
Kumar Gala:
powerpc: Enable coherency for all pages on 83xx to fix PCI data corruption
Michael Ellerman:
powerpc: Initialise hvlpevent_queue.lock correctly
powerpc: Only calculate htab_size in one place for kexec
Michal Ostrowski:
Fix race condition in hvc console.
Olaf Hering:
powerpc: change compat shmget size arg to signed
ppc: fix adb breakage in xmon
Olof Johansson:
powerpc: Update {g5,pseries,ppc64}_defconfig
R Sharada:
powerpc64: fix spinlock recursion in native_hpte_clear
Segher Boessenkool:
powerpc: Fix some MPIC + HT APIC buglets
powerpc: Don't re-assign PCI resources on Maple
arch/powerpc/configs/g5_defconfig | 174 ++++++++++--------------
arch/powerpc/configs/ppc64_defconfig | 173 ++++++++++--------------
arch/powerpc/configs/pseries_defconfig | 127 ++++++-----------
arch/powerpc/kernel/crash.c | 4 -
arch/powerpc/kernel/head_32.S | 1
arch/powerpc/kernel/head_64.S | 109 +--------------
arch/powerpc/kernel/machine_kexec_64.c | 10 -
arch/powerpc/kernel/process.c | 32 ++++
arch/powerpc/kernel/prom_init.c | 38 -----
arch/powerpc/kernel/sys_ppc32.c | 2
arch/powerpc/mm/hash_native_64.c | 7 +
arch/powerpc/mm/hash_utils_64.c | 3
arch/powerpc/oprofile/Kconfig | 1
arch/powerpc/platforms/iseries/lpevents.c | 2
arch/powerpc/platforms/iseries/setup.c | 1
arch/powerpc/platforms/maple/pci.c | 4 -
arch/powerpc/platforms/pseries/Kconfig | 7 -
arch/powerpc/sysdev/mpic.c | 9 +
arch/ppc/kernel/head.S | 1
arch/ppc/xmon/adb.c | 212 -----------------------------
arch/ppc/xmon/start.c | 169 -----------------------
arch/ppc/xmon/xmon.c | 108 ---------------
drivers/char/hvc_console.c | 8 +
include/asm-powerpc/cputable.h | 9 +
include/asm-powerpc/mmu.h | 1
include/asm-powerpc/reg.h | 33 -----
include/asm-powerpc/thread_info.h | 4 -
27 files changed, 275 insertions(+), 974 deletions(-)
delete mode 100644 arch/ppc/xmon/adb.c
^ permalink raw reply [flat|nested] 19+ messages in thread* please pull powerpc-merge.git
@ 2006-02-10 22:31 Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-02-10 22:31 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
Just 4 commits this time. Log and diffstat follow.
Thanks,
Paul.
Becky Bruce:
powerpc: Add FSL USB node to documentation
JANAK DESAI:
powerpc: unshare system call registration
Kumar Gala:
powerpc: Add CONFIG_DEFAULT_UIMAGE for embedded boards
Paul Mackerras:
ppc: Use the system call table from arch/powerpc/kernel/systbl.S
Documentation/powerpc/booting-without-of.txt | 60 +++++-
arch/powerpc/Kconfig | 6 +
arch/powerpc/Makefile | 1
arch/powerpc/kernel/Makefile | 6 -
arch/powerpc/kernel/systbl.S | 3
arch/ppc/kernel/misc.S | 283 --------------------------
include/asm-powerpc/unistd.h | 3
7 files changed, 72 insertions(+), 290 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* please pull powerpc-merge.git
@ 2006-02-08 4:09 Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2006-02-08 4:09 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
Log and diffstat follow.
Thanks,
Paul.
Becky Bruce:
documentation/powerpc: add bus-frequency property to SOC node
Dave C Boutcher:
powerpc: return correct rtas status from ibm,suspend-me
powerpc: prod all processors after ibm,suspend-me
powerpc: remove useless call to touch_softlockup_watchdog
David Gibson:
powerpc: Cleanup, consolidating icache dirtying logic
Geoff Levand:
powerpc: Fix spufs initialization sequence.
Ingo Molnar:
sem2mutex: drivers/macintosh/windfarm_core.c
Jake Moilanen:
powerpc: IOMMU SG paranoia
Jesper Juhl:
Don't check pointer for NULL before passing it to kfree [arch/powerpc/kernel/rtas_flash.c]
Marcelo Tosatti:
powerpc/8xx: last two 8MB D-TLB entries are incorrectly set
Michael Ellerman:
powerpc: Don't allocate zero bytes in finish_device_tree()
powerpc: Make sure we don't create empty lmb regions
powerpc: Refuse to boot a kdump kernel via OF
powerpc: Fix !SMP build of rtas.c
powerpc: Don't overwrite flat device tree with kdump kernel
powerpc: Don't use toc in decrementer_iSeries_masked
Michael Neuling:
powerpc: hypervisor check in pseries_kexec_cpu_down
Nathan Lynch:
powerpc: avoid timer interrupt replay effect when onlining cpu
Olaf Hering:
powerpc: remove pointer/integer confusion in generic_calibrate_decr
powerpc: restore clock speed in /proc/cpuinfo
powerpc: remove pointer/integer confusion in of_find_node_by_name
powerpc: add refcounting to setup_peg2 and of_get_pci_address
powerpc: fix compile warning in udbg_init_maple_realmode
Paul Mackerras:
powerpc/64: Fix bug in setting floating-point exception mode
Documentation/powerpc/booting-without-of.txt | 8 ++++
arch/powerpc/kernel/fpu.S | 2 -
arch/powerpc/kernel/head_64.S | 5 +-
arch/powerpc/kernel/iommu.c | 9 +++-
arch/powerpc/kernel/prom.c | 38 +++++++++++++++++--
arch/powerpc/kernel/prom_init.c | 4 ++
arch/powerpc/kernel/prom_parse.c | 4 +-
arch/powerpc/kernel/rtas.c | 12 +++---
arch/powerpc/kernel/rtas_flash.c | 3 -
arch/powerpc/kernel/setup_64.c | 3 +
arch/powerpc/kernel/smp.c | 3 +
arch/powerpc/kernel/time.c | 8 ++--
arch/powerpc/kernel/udbg_16550.c | 2 -
arch/powerpc/mm/lmb.c | 4 ++
arch/powerpc/mm/mem.c | 14 +------
arch/powerpc/platforms/cell/Makefile | 2 -
arch/powerpc/platforms/chrp/chrp.h | 1
arch/powerpc/platforms/chrp/pci.c | 2 +
arch/powerpc/platforms/chrp/setup.c | 2 -
arch/powerpc/platforms/chrp/time.c | 21 ----------
arch/powerpc/platforms/pseries/setup.c | 2 -
arch/ppc/kernel/head_8xx.S | 7 ++-
drivers/macintosh/windfarm_core.c | 53 +++++++++++++-------------
include/asm-powerpc/prom.h | 2 +
24 files changed, 123 insertions(+), 88 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* please pull powerpc-merge.git
@ 2005-11-08 4:05 Paul Mackerras
0 siblings, 0 replies; 19+ messages in thread
From: Paul Mackerras @ 2005-11-08 4:05 UTC (permalink / raw)
To: torvalds; +Cc: linuxppc-dev, linuxppc64-dev
Linus,
Please do a pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
to get a powerpc update - various bug fixes (including Ben's fix for
the oops that Martin Bligh reported), some powermac and 8xx updates,
and a bit more merging. Diffstat and shortlog follow.
Thanks,
Paul.
arch/powerpc/Kconfig | 9
arch/powerpc/configs/g5_defconfig | 261 +++++--
arch/powerpc/kernel/misc_64.S | 70 ++
arch/powerpc/kernel/process.c | 4
arch/powerpc/kernel/prom.c | 21 -
arch/powerpc/kernel/prom_init.c | 11
arch/powerpc/kernel/rtas.c | 5
arch/powerpc/kernel/setup-common.c | 40 +
arch/powerpc/kernel/setup_32.c | 1
arch/powerpc/kernel/setup_64.c | 46 -
arch/powerpc/kernel/signal_32.c | 1
arch/powerpc/kernel/signal_64.c | 1
arch/powerpc/kernel/smp.c | 1
arch/powerpc/kernel/time.c | 5
arch/powerpc/kernel/traps.c | 11
arch/powerpc/lib/locks.c | 1
arch/powerpc/mm/fault.c | 17
arch/powerpc/mm/hash_utils_64.c | 10
arch/powerpc/mm/init_64.c | 1
arch/powerpc/mm/mem.c | 2
arch/powerpc/mm/numa.c | 1
arch/powerpc/mm/pgtable_64.c | 1
arch/powerpc/oprofile/op_model_power4.c | 24 +
arch/powerpc/platforms/iseries/irq.c | 5
arch/powerpc/platforms/iseries/pci.c | 37 -
arch/powerpc/platforms/iseries/setup.c | 4
arch/powerpc/platforms/iseries/smp.c | 1
arch/powerpc/platforms/powermac/Makefile | 3
arch/powerpc/platforms/powermac/cpufreq_32.c | 15
arch/powerpc/platforms/powermac/cpufreq_64.c | 323 ++++++++
arch/powerpc/platforms/powermac/setup.c | 13
arch/powerpc/platforms/pseries/iommu.c | 2
arch/powerpc/platforms/pseries/lpar.c | 3
arch/powerpc/platforms/pseries/plpar_wrappers.h | 10
arch/powerpc/platforms/pseries/ras.c | 2
arch/powerpc/platforms/pseries/setup.c | 18
arch/powerpc/sysdev/i8259.c | 5
arch/powerpc/sysdev/u3_iommu.c | 1
arch/ppc/kernel/misc.S | 145 +++-
arch/ppc/kernel/traps.c | 12
arch/ppc/syslib/m8xx_wdt.c | 13
arch/ppc/syslib/prom.c | 4
arch/ppc/xmon/xmon.c | 5
arch/ppc64/Kconfig | 11
arch/ppc64/Kconfig.debug | 4
arch/ppc64/kernel/idle.c | 1
arch/ppc64/kernel/machine_kexec.c | 1
arch/ppc64/kernel/misc.S | 72 ++
arch/ppc64/kernel/pci.c | 17
arch/ppc64/kernel/prom.c | 25 +
arch/ppc64/kernel/prom_init.c | 3
arch/ppc64/kernel/rtas_pci.c | 6
arch/ppc64/kernel/udbg.c | 55 -
drivers/block/swim3.c | 20 -
drivers/ide/ppc/pmac.c | 9
drivers/macintosh/Kconfig | 19
drivers/macintosh/Makefile | 9
drivers/macintosh/smu.c | 174 ++++-
drivers/macintosh/via-pmu.c | 10
drivers/macintosh/windfarm.h | 131 +++
drivers/macintosh/windfarm_core.c | 426 +++++++++++
drivers/macintosh/windfarm_cpufreq_clamp.c | 105 +++
drivers/macintosh/windfarm_lm75_sensor.c | 263 +++++++
drivers/macintosh/windfarm_pid.c | 145 ++++
drivers/macintosh/windfarm_pid.h | 84 ++
drivers/macintosh/windfarm_pm81.c | 879 +++++++++++++++++++++++
drivers/macintosh/windfarm_pm91.c | 814 +++++++++++++++++++++
drivers/macintosh/windfarm_smu_controls.c | 282 +++++++
drivers/macintosh/windfarm_smu_sensors.c | 479 +++++++++++++
fs/proc/proc_devtree.c | 57 +
include/asm-powerpc/ide.h | 29 -
include/asm-powerpc/machdep.h | 4
include/asm-powerpc/ppc-pci.h | 1
include/asm-powerpc/prom.h | 2
include/asm-powerpc/reg.h | 9
include/asm-powerpc/smp.h | 4
include/asm-powerpc/smu.h | 199 +++++
include/asm-powerpc/xmon.h | 1
include/asm-ppc/btext.h | 22 -
include/asm-ppc/io.h | 12
include/asm-ppc/kgdb.h | 2
include/asm-ppc/prom.h | 2
include/asm-ppc64/ide.h | 30 -
include/asm-ppc64/pci.h | 8
include/asm-ppc64/ppcdebug.h | 108 ---
include/asm-ppc64/prom.h | 2
include/asm-ppc64/udbg.h | 3
include/linux/proc_fs.h | 9
88 files changed, 5134 insertions(+), 579 deletions(-)
rename arch/powerpc/platforms/powermac/{cpufreq.c => cpufreq_32.c} (99%)
create mode 100644 arch/powerpc/platforms/powermac/cpufreq_64.c
create mode 100644 drivers/macintosh/windfarm.h
create mode 100644 drivers/macintosh/windfarm_core.c
create mode 100644 drivers/macintosh/windfarm_cpufreq_clamp.c
create mode 100644 drivers/macintosh/windfarm_lm75_sensor.c
create mode 100644 drivers/macintosh/windfarm_pid.c
create mode 100644 drivers/macintosh/windfarm_pid.h
create mode 100644 drivers/macintosh/windfarm_pm81.c
create mode 100644 drivers/macintosh/windfarm_pm91.c
create mode 100644 drivers/macintosh/windfarm_smu_controls.c
create mode 100644 drivers/macintosh/windfarm_smu_sensors.c
rename include/{asm-ppc/ide.h => asm-powerpc/ide.h} (78%)
delete mode 100644 include/asm-ppc64/ide.h
delete mode 100644 include/asm-ppc64/ppcdebug.h
Anton Blanchard:
ppc64: fix Memory: summary line
ppc64: fix oprofile sample bit handling
ppc64: remove some direct xmon calls
Benjamin Herrenschmidt:
ppc64: SMU based macs cpufreq support
ppc64: SMU partition recovery
ppc64: Update g5_defconfig for ARCH=powerpc
ppc64: More U3 device-tree fixes
ppc64: Thermal control for SMU based machines
ppc: fix a bunch of warnings
ppc: Fix ARCH=ppc build with xmon
ppc: Fix PowerBook HD led on ARCH=powerpc
ppc64: Fix the lazy icache/dcache code for non-RAM pages
David Gibson:
powerpc: Kill ppcdebug
David Woodhouse:
powerpc: Fix i8259 cascade IRQ
powerpc: Fix ppc32 initrd
John Rose:
dlpar enable for OF pci probe
Marcelo Tosatti:
ppc32 8xx: fix m8xx_wdt accessor macro update
ppc32: handle access to non-present IO ports on 8xx
Michael Ellerman:
powerpc: Make ppc_md.set_dabr non 64-bit specific
Mike Kravetz:
Memory Add Fixes for ppc64
Olof Johansson:
powerpc: Nicer printing of address at oops
Paul Mackerras:
powerpc: Various UP build fixes
Merge ../linux-2.6
Merge ../linux-2.6
powerpc: Fix typo in pmac_cpufreq_resume
macintosh: Always export pmu_[un]register_sleep_notifier if CONFIG_PM set
powermac: Use a spinlock in swim3.c (floppy driver) instead of cli
Stephen Rothwell:
powerpc: merge ide.h
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2006-04-23 1:15 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-20 6:08 please pull powerpc-merge.git Paul Mackerras
-- strict thread matches above, loose matches on Subject: below --
2006-04-23 1:15 Paul Mackerras
2006-04-18 12:11 Paul Mackerras
2006-04-18 18:20 ` Andy Fleming
2006-03-16 10:53 Paul Mackerras
2006-03-15 5:52 Paul Mackerras
2006-03-15 15:52 ` Linus Torvalds
2006-03-15 20:32 ` Paul Mackerras
2006-03-08 2:32 Paul Mackerras
2006-03-08 8:08 ` Olaf Hering
2006-03-09 0:55 ` Paul Mackerras
2006-03-03 11:23 Paul Mackerras
2006-02-28 12:00 Paul Mackerras
2006-02-24 2:36 Paul Mackerras
2006-02-23 12:05 Paul Mackerras
2006-02-24 0:19 ` Paul Mackerras
2006-02-10 22:31 Paul Mackerras
2006-02-08 4:09 Paul Mackerras
2005-11-08 4:05 Paul Mackerras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).