* [PATCH] serial: Add pci ids for PA Semi PWRficient onchip uarts
From: Olof Johansson @ 2007-08-17 4:09 UTC (permalink / raw)
To: akpm; +Cc: linuxppc-dev, linux-kernel, Alan Cox
Add PCI IDs for the onchip UARTs on PA Semi PWRficient.
Signed-off-by: Olof Johansson <olof@lixom.net>
Index: linux-2.6/drivers/serial/8250_pci.c
===================================================================
--- linux-2.6.orig/drivers/serial/8250_pci.c
+++ linux-2.6/drivers/serial/8250_pci.c
@@ -984,6 +984,7 @@ enum pci_board_num_t {
pbn_exar_XR17C152,
pbn_exar_XR17C154,
pbn_exar_XR17C158,
+ pbn_pasemi_1682M,
};
/*
@@ -1511,6 +1512,14 @@ static struct pciserial_board pci_boards
.base_baud = 921600,
.uart_offset = 0x200,
},
+ /*
+ * PA Semi PWRficient PA6T-1682M on-chip UART
+ */
+ [pbn_pasemi_1682M] = {
+ .flags = FL_BASE0,
+ .num_ports = 1,
+ .base_baud = 8333333,
+ },
};
/*
@@ -2402,6 +2411,13 @@ static struct pci_device_id serial_pci_t
PCI_SUBVENDOR_ID_PERLE, PCI_SUBDEVICE_ID_PCI_RAS8,
0, 0, pbn_b2_8_921600 },
/*
+ * PA Semi PA6T-1682M on-chip UART
+ */
+ { PCI_VENDOR_ID_PASEMI, 0xa004,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ pbn_pasemi_1682M },
+
+ /*
* These entries match devices with class COMMUNICATION_SERIAL,
* COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
*/
^ permalink raw reply
* Re: [PATCH] fix compile warning in arch/powerpc/kernel/sysfs.c
From: Michael Neuling @ 2007-08-17 5:25 UTC (permalink / raw)
To: paulus, linuxppc-dev
In-Reply-To: <7816.1187322013@neuling.org>
It seems I missed a long discussion about this warning... Please ignore.
Mikey
In message <7816.1187322013@neuling.org> you wrote:
> This fixes the following warning:
> arch/powerpc/kernel/sysfs.c:388: warning: ignoring return value of
> 'sysfs_create_group', declared with attribute warn_unused_result
>
> Signed-off-by: Michael Neuling <mikey@neuling.org>
> ---
> arch/powerpc/kernel/sysfs.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> Index: linux-2.6-ozlabs/arch/powerpc/kernel/sysfs.c
> ===================================================================
> --- linux-2.6-ozlabs.orig/arch/powerpc/kernel/sysfs.c
> +++ linux-2.6-ozlabs/arch/powerpc/kernel/sysfs.c
> @@ -378,14 +378,18 @@ EXPORT_SYMBOL_GPL(cpu_add_sysdev_attr);
>
> int cpu_add_sysdev_attr_group(struct attribute_group *attrs)
> {
> - int cpu;
> + int cpu, err;
> struct sys_device *sysdev;
>
> mutex_lock(&cpu_mutex);
>
> for_each_possible_cpu(cpu) {
> sysdev = get_cpu_sysdev(cpu);
> - sysfs_create_group(&sysdev->kobj, attrs);
> + err = sysfs_create_group(&sysdev->kobj, attrs);
> + if (err) {
> + mutex_unlock(&cpu_mutex);
> + return err;
> + }
> }
>
> mutex_unlock(&cpu_mutex);
>
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
>
^ permalink raw reply
* Re: [PATCH] powerpc: add setclrbits macros
From: Geert Uytterhoeven @ 2007-08-17 6:44 UTC (permalink / raw)
To: Timur Tabi; +Cc: linuxppc-dev, paulus
In-Reply-To: <11873041991712-git-send-email-timur@freescale.com>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 3214 bytes --]
On Thu, 16 Aug 2007, Timur Tabi wrote:
> This patch adds the setclrbits_xxx() macros, which are used to set and clear
> multiple bits in a single read-modify-write operation. Specify the bits
> to set in the 'set' parameter and the bits to clear in the 'clear' parameter.
> These macros can also be used to set a multiple-bit bit pattern using a mask,
> by specifying the mask in the 'clear' parameter and the new bit pattern in the
> 'set' parameter. There are big-endian and little-endian versions for 8, 16,
> 32, and 64 bits.
Sorry for nitpicking again, but since the clear is done before the set (cfr.
the expanded functionality), perhaps they should be changed to
clrsetbits_X(addr, clear, set)?
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
>
> Changed the macros from setmaskedbits_xxx to setclrbits_xxx and added a comment
> indicating the expanded functionality.
>
> include/asm-powerpc/io.h | 27 +++++++++++++++++++++++++++
> 1 files changed, 27 insertions(+), 0 deletions(-)
>
> diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
> index bb8d965..58c8b96 100644
> --- a/include/asm-powerpc/io.h
> +++ b/include/asm-powerpc/io.h
> @@ -734,6 +734,33 @@ static inline void * bus_to_virt(unsigned long address)
> #define setbits16(_addr, _v) out_be16((_addr), in_be16(_addr) | (_v))
> #define clrbits16(_addr, _v) out_be16((_addr), in_be16(_addr) & ~(_v))
>
> +/* Set and clear bits in one shot. These macros can be used to clear and
> + * set multiple bits in a register using a single read-modify-write. These
> + * macros can also be used to set a multiple-bit bit pattern using a mask,
> + * by specifying the mask in the 'clear' parameter and the new bit pattern
> + * in the 'set' parameter.
> + */
> +
> +#ifdef __powerpc64__
> +#define setclrbits_be64(addr, set, clear) \
> + out_be64((addr), (in_be64(addr) & ~(clear)) | (set))
> +#define setclrbits_le64(addr, set, clear) \
> + out_le64((addr), (in_le64(addr) & ~(clear)) | (set))
> +#endif
> +
> +#define setclrbits_be32(addr, set, clear) \
> + out_be32((addr), (in_be32(addr) & ~(clear)) | (set))
> +#define setclrbits_be16(addr, set, clear) \
> + out_be16((addr), (in_be16(addr) & ~(clear)) | (set))
> +
> +#define setclrbits_le32(addr, set, clear) \
> + out_le32((addr), (in_le32(addr) & ~(clear)) | (set))
> +#define setclrbits_le16(addr, set, clear) \
> + out_le16((addr), (in_le16(addr) & ~(clear)) | (set))
> +
> +#define setclrbits_8(addr, set, clear) \
> + out_8((addr), (in_8(addr) & ~(clear)) | (set))
> +
> #endif /* __KERNEL__ */
>
> #endif /* _ASM_POWERPC_IO_H */
> --
> 1.5.2.4
>
With kind regards,
Geert Uytterhoeven
Software Architect
Sony Network and Software Technology Center Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: Geert.Uytterhoeven@sonycom.com
Internet: http://www.sony-europe.com/
Sony Network and Software Technology Center Europe
A division of Sony Service Centre (Europe) N.V.
Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium
VAT BE 0413.825.160 · RPR Brussels
Fortis Bank Zaventem · Swift GEBABEBB08A · IBAN BE39001382358619
^ permalink raw reply
* [PATCH 0/3] Remove need for include/asm-ppc
From: Kumar Gala @ 2007-08-17 7:11 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
This patch series removes the need for include/asm-ppc in the ARCH=powerpc
build for ppc32. They exist in the following git tree:
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
posting here for everyone else to see.
- k
^ permalink raw reply
* [PATCH 1/3] [POWERPC] Remove old includes from arch/ppc
From: Kumar Gala @ 2007-08-17 7:12 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
In-Reply-To: <Pine.LNX.4.64.0708170157140.15311@blarg.am.freescale.net>
Remove includes of files that existed in arch/ppc that we dont need in
arch/powerpc anymore. The following includes were removed:
<asm/amigappc.h>
<asm/bootinfo.h>
<asm/ppcboot.h>
<asm/ppc_sys.h>
<asm/residual.h>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
arch/powerpc/kernel/setup_32.c | 2 --
arch/powerpc/platforms/52xx/lite5200.c | 1 -
arch/powerpc/platforms/82xx/mpc82xx.c | 1 -
arch/powerpc/platforms/82xx/mpc82xx_ads.c | 1 -
arch/powerpc/platforms/82xx/pq2ads.h | 1 -
arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 -
arch/powerpc/platforms/83xx/mpc834x_itx.c | 1 -
arch/powerpc/platforms/83xx/mpc834x_mds.c | 1 -
arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 -
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 -
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
arch/powerpc/platforms/8xx/m8xx_setup.c | 4 ++--
arch/powerpc/platforms/8xx/mpc86xads.h | 1 -
arch/powerpc/platforms/8xx/mpc86xads_setup.c | 1 -
arch/powerpc/platforms/8xx/mpc885ads.h | 1 -
arch/powerpc/platforms/8xx/mpc885ads_setup.c | 1 -
arch/powerpc/platforms/chrp/smp.c | 1 -
arch/powerpc/platforms/embedded6xx/ls_uart.c | 1 -
arch/powerpc/platforms/powermac/bootx_init.c | 1 -
19 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 7ec6ba5..a288a5f 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -18,13 +18,11 @@
#include <linux/cpu.h>
#include <linux/console.h>
-#include <asm/residual.h>
#include <asm/io.h>
#include <asm/prom.h>
#include <asm/processor.h>
#include <asm/pgtable.h>
#include <asm/setup.h>
-#include <asm/amigappc.h>
#include <asm/smp.h>
#include <asm/elf.h>
#include <asm/cputable.h>
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 84bd3da..ce3f695 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -35,7 +35,6 @@
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/ipic.h>
-#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/prom.h>
#include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/82xx/mpc82xx.c b/arch/powerpc/platforms/82xx/mpc82xx.c
index cc9900d..c706871 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx.c
@@ -36,7 +36,6 @@
#include <asm/time.h>
#include <asm/io.h>
#include <asm/machdep.h>
-#include <asm/bootinfo.h>
#include <asm/pci-bridge.h>
#include <asm/mpc8260.h>
#include <asm/irq.h>
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index 2d1b05b..c0a0c56 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -37,7 +37,6 @@
#include <asm/time.h>
#include <asm/io.h>
#include <asm/machdep.h>
-#include <asm/bootinfo.h>
#include <asm/pci-bridge.h>
#include <asm/mpc8260.h>
#include <asm/irq.h>
diff --git a/arch/powerpc/platforms/82xx/pq2ads.h b/arch/powerpc/platforms/82xx/pq2ads.h
index 5b5cca6..6f749b7 100644
--- a/arch/powerpc/platforms/82xx/pq2ads.h
+++ b/arch/powerpc/platforms/82xx/pq2ads.h
@@ -23,7 +23,6 @@
#define __MACH_ADS8260_DEFS
#include <linux/seq_file.h>
-#include <asm/ppcboot.h>
/* For our show_cpuinfo hooks. */
#define CPUINFO_VENDOR "Freescale Semiconductor"
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 2c8e641..61e3f1c 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -32,7 +32,6 @@
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/ipic.h>
-#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/prom.h>
#include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 47ba544..6d06645 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -30,7 +30,6 @@
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/ipic.h>
-#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/prom.h>
#include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 4c9ff9c..f8aba9a 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -30,7 +30,6 @@
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/ipic.h>
-#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/prom.h>
#include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 84b5893..69970b9 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -38,7 +38,6 @@
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/ipic.h>
-#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/prom.h>
#include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 6a171e9..0402334 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -35,7 +35,6 @@
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/ipic.h>
-#include <asm/bootinfo.h>
#include <asm/pci-bridge.h>
#include <asm/mpc85xx.h>
#include <asm/irq.h>
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index be25ecd..53830c9 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -38,7 +38,6 @@
#include <asm/time.h>
#include <asm/io.h>
#include <asm/machdep.h>
-#include <asm/bootinfo.h>
#include <asm/pci-bridge.h>
#include <asm/mpc85xx.h>
#include <asm/irq.h>
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index f169355..f00c8d1 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -36,13 +36,11 @@
#include <asm/mmu.h>
#include <asm/reg.h>
-#include <asm/residual.h>
#include <asm/io.h>
#include <asm/pgtable.h>
#include <asm/mpc8xx.h>
#include <asm/8xx_immap.h>
#include <asm/machdep.h>
-#include <asm/bootinfo.h>
#include <asm/time.h>
#include <asm/prom.h>
#include <asm/fs_pd.h>
@@ -55,7 +53,9 @@ struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
#endif
void m8xx_calibrate_decr(void);
+#ifdef CONFIG_8xx_WDT
extern void m8xx_wdt_handler_install(bd_t *bp);
+#endif
extern int cpm_pic_init(void);
extern int cpm_get_irq(void);
diff --git a/arch/powerpc/platforms/8xx/mpc86xads.h b/arch/powerpc/platforms/8xx/mpc86xads.h
index 59bad2f..dd10cd2 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads.h
+++ b/arch/powerpc/platforms/8xx/mpc86xads.h
@@ -15,7 +15,6 @@
#ifndef __ASM_MPC86XADS_H__
#define __ASM_MPC86XADS_H__
-#include <asm/ppcboot.h>
#include <sysdev/fsl_soc.h>
/* U-Boot maps BCSR to 0xff080000 */
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index d881647..8f64f48 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -31,7 +31,6 @@
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/time.h>
-#include <asm/ppcboot.h>
#include <asm/mpc8xx.h>
#include <asm/8xx_immap.h>
#include <asm/commproc.h>
diff --git a/arch/powerpc/platforms/8xx/mpc885ads.h b/arch/powerpc/platforms/8xx/mpc885ads.h
index 7c31aec..14db124 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads.h
+++ b/arch/powerpc/platforms/8xx/mpc885ads.h
@@ -15,7 +15,6 @@
#ifndef __ASM_MPC885ADS_H__
#define __ASM_MPC885ADS_H__
-#include <asm/ppcboot.h>
#include <sysdev/fsl_soc.h>
/* U-Boot maps BCSR to 0xff080000 */
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index bd5ff7a..d3da385 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -32,7 +32,6 @@
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/time.h>
-#include <asm/ppcboot.h>
#include <asm/mpc8xx.h>
#include <asm/8xx_immap.h>
#include <asm/commproc.h>
diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c
index a137d13..10a4a4d 100644
--- a/arch/powerpc/platforms/chrp/smp.c
+++ b/arch/powerpc/platforms/chrp/smp.c
@@ -26,7 +26,6 @@
#include <asm/io.h>
#include <asm/prom.h>
#include <asm/smp.h>
-#include <asm/residual.h>
#include <asm/time.h>
#include <asm/machdep.h>
#include <asm/mpic.h>
diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c
index d0bee9f..f7a4def 100644
--- a/arch/powerpc/platforms/embedded6xx/ls_uart.c
+++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c
@@ -5,7 +5,6 @@
#include <linux/serial_8250.h>
#include <asm/io.h>
#include <asm/mpc10x.h>
-#include <asm/ppc_sys.h>
#include <asm/prom.h>
#include <asm/termbits.h>
diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c
index 9d73d02..cf66091 100644
--- a/arch/powerpc/platforms/powermac/bootx_init.c
+++ b/arch/powerpc/platforms/powermac/bootx_init.c
@@ -17,7 +17,6 @@
#include <asm/prom.h>
#include <asm/page.h>
#include <asm/bootx.h>
-#include <asm/bootinfo.h>
#include <asm/btext.h>
#include <asm/io.h>
--
1.5.2.2
^ permalink raw reply related
* [PATCH 2/3] [POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need
From: Kumar Gala @ 2007-08-17 7:14 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
In-Reply-To: <Pine.LNX.4.64.0708170212210.15311@blarg.am.freescale.net>
To build arch/powerpc without including asm-ppc/ we need these files
in asm-powerpc/
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
include/asm-powerpc/8xx_immap.h | 564 +++++++++++++++++
include/asm-powerpc/commproc.h | 692 ++++++++++++++++++++
include/asm-powerpc/cpm2.h | 1248 +++++++++++++++++++++++++++++++++++++
include/asm-powerpc/gg2.h | 61 ++
include/asm-powerpc/highmem.h | 135 ++++
include/asm-powerpc/hydra.h | 102 +++
include/asm-powerpc/immap_cpm2.h | 648 +++++++++++++++++++
include/asm-powerpc/kgdb.h | 57 ++
include/asm-powerpc/m8260_pci.h | 187 ++++++
include/asm-powerpc/mpc10x.h | 180 ++++++
include/asm-powerpc/mpc52xx_psc.h | 191 ++++++
11 files changed, 4065 insertions(+), 0 deletions(-)
create mode 100644 include/asm-powerpc/8xx_immap.h
create mode 100644 include/asm-powerpc/commproc.h
create mode 100644 include/asm-powerpc/cpm2.h
create mode 100644 include/asm-powerpc/gg2.h
create mode 100644 include/asm-powerpc/highmem.h
create mode 100644 include/asm-powerpc/hydra.h
create mode 100644 include/asm-powerpc/immap_cpm2.h
create mode 100644 include/asm-powerpc/kgdb.h
create mode 100644 include/asm-powerpc/m8260_pci.h
create mode 100644 include/asm-powerpc/mpc10x.h
create mode 100644 include/asm-powerpc/mpc52xx_psc.h
[patch removed since I was just copying the asm-ppc variants to
asm-powerpc]
- k
^ permalink raw reply
* [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32
From: Kumar Gala @ 2007-08-17 7:15 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
In-Reply-To: <Pine.LNX.4.64.0708170213040.15311@blarg.am.freescale.net>
We no longer have any dependancies on include/asm-ppc so we can get ride
of the makefile hacks to include it in the build process.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
arch/powerpc/Makefile | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 6c1e36c..83a39a2 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -63,8 +63,7 @@ endif
LDFLAGS_vmlinux := -Bstatic
-# The -Iarch/$(ARCH)/include is temporary while we are merging
-CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include
+CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)
AFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)
CFLAGS-$(CONFIG_PPC64) := -mminimal-toc -mtraceback=none -mcall-aixdesc
CFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -ffixed-r2 -mmultiple
@@ -72,9 +71,6 @@ CPPFLAGS += $(CPPFLAGS-y)
AFLAGS += $(AFLAGS-y)
CFLAGS += -msoft-float -pipe $(CFLAGS-y)
CPP = $(CC) -E $(CFLAGS)
-# Temporary hack until we have migrated to asm-powerpc
-LINUXINCLUDE-$(CONFIG_PPC32) := -Iarch/$(ARCH)/include
-LINUXINCLUDE += $(LINUXINCLUDE-y)
CHECKFLAGS += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__
@@ -172,18 +168,15 @@ install:
archclean:
$(Q)$(MAKE) $(clean)=$(boot)
-archmrproper:
- $(Q)rm -rf arch/$(ARCH)/include
-
archprepare: checkbin
-ifeq ($(CONFIG_PPC32),y)
-# Temporary hack until we have migrated to asm-powerpc
-include/asm: arch/$(ARCH)/include/asm
-arch/$(ARCH)/include/asm: FORCE
- $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
- $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
-endif
+#ifeq ($(CONFIG_PPC32),y)
+## Temporary hack until we have migrated to asm-powerpc
+#include/asm: arch/$(ARCH)/include/asm
+#arch/$(ARCH)/include/asm: FORCE
+# $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
+# $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
+#endif
# Use the file '.tmp_gas_check' for binutils tests, as gas won't output
# to stdout and these checks are run even on install targets.
--
1.5.2.2
^ permalink raw reply related
* Please pull from 'for-2.6.24' branch
From: Kumar Gala @ 2007-08-17 7:17 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Paul,
Please pull from 'for-2.6.24' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
It would be good to get these changes in ASAP as a baseline for other work
that might need to move other files over to asm-powerpc or other clean
ups.
to receive the following updates:
arch/powerpc/Makefile | 23
arch/powerpc/kernel/setup_32.c | 2
arch/powerpc/platforms/52xx/lite5200.c | 1
arch/powerpc/platforms/82xx/mpc82xx.c | 1
arch/powerpc/platforms/82xx/mpc82xx_ads.c | 1
arch/powerpc/platforms/82xx/pq2ads.h | 1
arch/powerpc/platforms/83xx/mpc832x_mds.c | 1
arch/powerpc/platforms/83xx/mpc834x_itx.c | 1
arch/powerpc/platforms/83xx/mpc834x_mds.c | 1
arch/powerpc/platforms/83xx/mpc836x_mds.c | 1
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1
arch/powerpc/platforms/8xx/m8xx_setup.c | 4
arch/powerpc/platforms/8xx/mpc86xads.h | 1
arch/powerpc/platforms/8xx/mpc86xads_setup.c | 1
arch/powerpc/platforms/8xx/mpc885ads.h | 1
arch/powerpc/platforms/8xx/mpc885ads_setup.c | 1
arch/powerpc/platforms/chrp/smp.c | 1
arch/powerpc/platforms/embedded6xx/ls_uart.c | 1
arch/powerpc/platforms/powermac/bootx_init.c | 1
include/asm-powerpc/8xx_immap.h | 564 ++++++++++++
include/asm-powerpc/commproc.h | 692 ++++++++++++++
include/asm-powerpc/cpm2.h | 1248 +++++++++++++++++++++++++++
include/asm-powerpc/gg2.h | 61 +
include/asm-powerpc/highmem.h | 135 ++
include/asm-powerpc/hydra.h | 102 ++
include/asm-powerpc/immap_cpm2.h | 648 ++++++++++++++
include/asm-powerpc/kgdb.h | 57 +
include/asm-powerpc/m8260_pci.h | 187 ++++
include/asm-powerpc/mpc10x.h | 180 +++
include/asm-powerpc/mpc52xx_psc.h | 191 ++++
31 files changed, 4075 insertions(+), 36 deletions(-)
Kumar Gala (3):
[POWERPC] Remove old includes from arch/ppc
[POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need
[POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32
^ permalink raw reply
* Patches for ppc?
From: Johan Borkhuis @ 2007-08-17 7:43 UTC (permalink / raw)
To: Linuxppc-dev
Hello,
I am working with a PPC-kernel, and came across a problem with the PCI
initialisation. On this mailing list I see a lot of patches, but they
are all for the PowerPC architecture. Are patches for the PPC
architecture still processed?
I know that the ppc-architecture is being phased out, but for the moment
I am stuck with it, as the board I am working with is not supported in
the powerpc architecture.
Kind regards,
Johan Borkhuis
^ permalink raw reply
* Re: Patches for ppc?
From: Kumar Gala @ 2007-08-17 8:00 UTC (permalink / raw)
To: Johan Borkhuis; +Cc: Linuxppc-dev
In-Reply-To: <46C5519E.6010300@dutchspace.nl>
On Aug 17, 2007, at 2:43 AM, Johan Borkhuis wrote:
> Hello,
>
> I am working with a PPC-kernel, and came across a problem with the PCI
> initialisation. On this mailing list I see a lot of patches, but they
> are all for the PowerPC architecture. Are patches for the PPC
> architecture still processed?
>
> I know that the ppc-architecture is being phased out, but for the
> moment
> I am stuck with it, as the board I am working with is not supported in
> the powerpc architecture.
If it fixes a bug we'll take patches to arch/ppc.
- k
^ permalink raw reply
* Re: [PATCH] [POWERPC] Fix interrupt routing and setup of ULI M1575 on FSL boards
From: Paul Mackerras @ 2007-08-17 8:07 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
In-Reply-To: <Pine.LNX.4.64.0708170003210.21006@blarg.am.freescale.net>
Kumar Gala writes:
> The interrupt routing in the device trees for the ULI M1575 was
> inproperly using the interrupt line field as pci function. Fixed
> up the device tree's to actual conform for to specification and
> changed the interrupt mapping code so it just uses a static mapping
> setup as follows:
This is a big patch to be going in post -rc3. Is it really fixing a
regression or a serious bug?
Paul.
^ permalink raw reply
* Re: [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32
From: Stephen Rothwell @ 2007-08-17 8:13 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, Paul Mackerras
In-Reply-To: <Pine.LNX.4.64.0708170215360.15311@blarg.am.freescale.net>
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
On Fri, 17 Aug 2007 02:15:54 -0500 (CDT) Kumar Gala <galak@kernel.crashing.org> wrote:
>
> @@ -172,18 +168,15 @@ install:
> archclean:
> $(Q)$(MAKE) $(clean)=$(boot)
>
> -archmrproper:
> - $(Q)rm -rf arch/$(ARCH)/include
> -
> archprepare: checkbin
>
> -ifeq ($(CONFIG_PPC32),y)
> -# Temporary hack until we have migrated to asm-powerpc
> -include/asm: arch/$(ARCH)/include/asm
> -arch/$(ARCH)/include/asm: FORCE
> - $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
> - $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
> -endif
> +#ifeq ($(CONFIG_PPC32),y)
> +## Temporary hack until we have migrated to asm-powerpc
> +#include/asm: arch/$(ARCH)/include/asm
> +#arch/$(ARCH)/include/asm: FORCE
> +# $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
> +# $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
> +#endif
Why not just remove it? git will preserve it if we find a use for it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* RE: some question about linux kernel in embed system
From: Pedro Luis D. L. @ 2007-08-17 8:42 UTC (permalink / raw)
To: linuxppc-embedded
DQoNCg0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KPiBEYXRlOiBG
cmksIDE3IEF1ZyAyMDA3IDE2OjE1OjUzICswODAwDQo+IEZyb206IGxpbUB0YWljb20uY29tLmNu
DQo+IFRvOiBjYXJjYWRpekBob3RtYWlsLmNvbQ0KPiBTdWJqZWN0OiBSZTogUkU6IHNvbWUgcXVl
c3Rpb24gYWJvdXQgbGludXgga2VybmVsIGluIGVtYmVkIHN5c3RlbQ0KPiANCj4gdGhhbmtzICEN
Cj4gaG93IHRvIHBhc3MgdGhlIGNvbnNvbGUgcGFyYW1ldGVyID8gd2hlcmUgaXMgdGhlc2U/DQo+
IHdoZW4gSSBtYWtlIG1lbnVjb25maWcsIHRoZXJlIGlzIENvbnNvbGUgZHJpdmVycyBvcHRpb24s
IGFuZCBpIGNob29zZSBzb21ldGhpbmcgYXQgZGlzY3JldGlvbi4gYnV0IHRoZSBrZXJuZWwgaXMg
bm90IGdvIG9uIQ0KPiBJIG5lZWQgeW91ciBoZWxwICENCj4gVGhpcyBpcyBteSBtc246IGxpbS5s
aXZlQG1zbi5jb20NCg0KWW91IHNob3VsZCBtb2RpZnkgdGhlICJib290YXJncyIgcGFyYW1ldGVy
IGluIHRoZSB1LWJvb3QgY29uc29sZS4gVS1ib290IHBhc3NlcyB0aGlzIHZhbHVlIHRvIHRoZSBr
ZXJuZWwgYXQgYm9vdCB0aW1lLiBZb3VyICJib290YXJncyIgcGFyYW1ldGVyIHNob3VsZCBpbmNs
dWRlIHNvbWV0aGluZyBsaWtlICJjb25zb2xlPXR0eVMwLDExNTIwMCIgb3Igc2ltaWxpYXIsIHdo
ZXJlIHR0eVMwIHNob3VsZCBiZSB0aGUgY29uc29sZSBkZXZpY2UncyBuYW1lIChpbiBNUEM1MjAw
IGlzLCBmb3IgZXhhbXBsZSwgdHR5UFNDMCkgYW5kIDExNTIwMCBpcyB0aGUgYmF1ZHJhdGUgdXNl
ZCBieSB0aGUgY29uc29sZSB0byBjb21tdW5pY2F0ZSB3aXRoIHlvdXIgaG9zdCBjb21wdXRlci4N
Cg0KUmVnYXJkcywNClBlZHJvLg0KDQo+IA0KPiDlj5Hku7bkurrvvJogUGVkcm8gTHVpcyBELiBM
LiANCj4g5Y+R6YCB5pe26Ze077yaIDIwMDctMDgtMTcgIDE1OjE0OjIyIA0KPiDmlLbku7bkurrv
vJogbGltQHRhaWNvbS5jb20uY24gDQo+IOaKhOmAge+8miANCj4g5Li76aKY77yaIFJFOiBzb21l
IHF1ZXN0aW9uIGFib3V0IGxpbnV4IGtlcm5lbCBpbiBlbWJlZCBzeXN0ZW0gDQo+ICANCj4gPiBE
YXRlOiBGcmksIDE3IEF1ZyAyMDA3IDEwOjU4OjAxICswODAwDQo+ID4gRnJvbTogbGltQHRhaWNv
bS5jb20uY24NCj4gDQo+ID4gaGVsbG8gZXZlcnlvbmUgDQo+ID4gSSBhbSBkb2luZyBzb21lIGVt
YmVkIHN5c3RlbSB3b3Jrcy4NCj4gPiBOb3cgSSB3YW50IHRvIHJlcGxhbnQgdGhlIGxpbnV4LTIu
NC4zMiB0byBteSBvd24gc3lzdGVtLg0KPiA+IEJ1dCB0aGVyZSBhcmUgc29tZSBxdWVzdGlvbnMu
Rmlyc3QgbGV0IG1lIGludHJvZHVjZSBteSBoZWFyZHdhcmU6DQo+ID4gSSB1c2UgcG93ZXJwYytm
bGFzaCtzZHJhbSB0byBidWlsZHVwIGEgbWluaSBzeXN0ZW0sdXNlIHUtYm9vdCAxLjEuNCBhcyBi
b290bG9hZGVyIHRoZW4gSSBuZWVkIHRvIHJlcGxhbnQgdGhlIGtlcm5lbCBvbiBpdCAuDQo+ID4g
VGhlIGxpbnV4LTIuNC4zMiBrZXJuZWwgd2hpY2ggd2FzIG1hZGUgYSB1SW1hZ2UsIGlzIHJ1bm5p
bmcgaW4gdGhpcyBtaW5pIHN5c3RlbSwgdGhlIHF1ZXN0aW9uIGlzIGFwcGVhcjoNCj4gPiAgICAg
SW1hZ2UgTmFtZTogICBMaW51eC0yLjQuMzINCj4gPiAgICBDcmVhdGVkOiAgICAgIDIwMDctMDgt
MTYgIDIxOjMxOjAzIFVUQw0KPiA+ICAgIEltYWdlIFR5cGU6ICAgUG93ZXJQQyBMaW51eCBLZXJu
ZWwgSW1hZ2UgKGd6aXAgY29tcHJlc3NlZCkNCj4gPiAgICBEYXRhIFNpemU6ICAgIDY4NTgwOSBC
eXRlcyA9IDY2OS43IGtCDQo+ID4gICAgTG9hZCBBZGRyZXNzOiAwMDAwMDAwMA0KPiA+ICAgIEVu
dHJ5IFBvaW50OiAgMDAwMDAwMDANCj4gPiAgICBWZXJpZnlpbmcgQ2hlY2tzdW0gLi4uIE9LDQo+
ID4gICAgVW5jb21wcmVzc2luZyBLZXJuZWwgSW1hZ2UgLi4uIE9LDQo+ID4gdGhlbiB0aGUga2Vy
bmVsIGlzIGRlYWQsIEkgZG8gbm90IGtub3cgd2hhdCBpcyBwcm9ibGVtLHBsZWFzZSBnaXZlIG1l
IHNvbWUgY2xldyx0aGFua3MhICAgDQo+IA0KPiBEbyB5b3UgcGFzcyB0aGUgY29uc29sZSBwYXJh
bWV0ZXIgYXQgYm9vdGluZz8gSXTno5cgYSB0eXBpY2FsIHByb2JsZW0sIHlvdXIga2VybmVsIGJv
b3RzIGJ1dCBpdCBkb2VzbuejmCBrbm93IHdoZXJlIHRoZSBjb25zb2xlIGlzLi4uDQo+IA0KPiBS
ZWdhcmRzLA0KPiBQZWRyby4NCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX18NCj4g7pOfYSBlc3Q/YXF1P1dpbmRvd3MgTGl2
ZSBTcGFjZXMhIEFob3JhIHBvZHLphqkgY3JlYXIgZumGlWlsbWVudGUgdHUgcHJvcGlvIHNpdGlv
IFdlYi4NCj4gaHR0cDovL3NwYWNlcy5saXZlLmNvbS9zaWdudXAuYXNweA0KDQpfX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXw0K
TGxhbWEgYSB0dXMgYW1pZ29zIGRlIFBDIGEgUEM6IMKhRXMgR1JBVElTIQ0KaHR0cDovL2dldC5s
aXZlLmNvbS9tZXNzZW5nZXIvb3ZlcnZpZXc=
^ permalink raw reply
* How to set non standurd baud rate on MPC5200 UART.
From: Syamala Venugopal Reddy @ 2007-08-17 9:00 UTC (permalink / raw)
To: linuxppc-embedded
[-- Attachment #1.1: Type: text/plain, Size: 2113 bytes --]
tried to set non standard baud rate using tty calls.
Code snipped as fallows.
baudrate=5;
ret=ioctl(fd, TIOCGSERIAL, &serial_info);
if(ret!=0)
{
perror("custom baud rate get");
}
serial_info.flags &= ~ASYNC_SPD_MASK;
serial_info.flags |= ASYNC_SPD_CUST;
serial_info.custom_divisor=serial_info.baud_base / baudrate;
ret=ioctl(fd, TIOCSSERIAL,&serial_info);
if(ret!=0)
{
perror("custom baud rate set:");
}
This code compiles well but gives error as
"Custom baud rate set: invalid argument" in run time.
Is there any thing wrong in this code?
Any one worked on MPC52XX, PSC controller provided by Freescale?
Does this serial driver (mpc52xx) supports custom baud rates?
Even the following code also giving me the same error. (This will just get
the options and set the same options with out modifying)
ret=ioctl(fd, TIOCGSERIAL, &serial_info);
ret=ioctl(fd, TIOCSSERIAL,&serial_info);
Thanks and Regards,
Venu ,
DISCLAIMER:
This message (including attachment if any) is confidential and may be privileged. Before opening attachments please check them for viruses and defects. MindTree Consulting Limited (MindTree) will not be responsible for any viruses or defects or any forwarded attachments emanating either from within MindTree or outside. If you have received this message by mistake please notify the sender by return e-mail and delete this message from your system. Any unauthorized use or dissemination of this message in whole or in part is strictly prohibited.Please note that e-mails are susceptible to change and MindTree shall not be liable for any improper, untimely or incomplete transmission.
E-mail may contain viruses. Before opening attachments please check them for viruses and defects. While MindTree Consulting Limited (MindTree) has put in place checks to minimize the risks, MindTree will not be responsible for any viruses or defects or any forwarded attachments emanating either from within MindTree or outside.
[-- Attachment #1.2: Type: text/html, Size: 11815 bytes --]
[-- Attachment #2: image001.gif --]
[-- Type: image/gif, Size: 1117 bytes --]
^ permalink raw reply
* [PATCH]ppc: fix unalligned PCI BAR-mapping
From: Johan Borkhuis @ 2007-08-17 9:43 UTC (permalink / raw)
To: Linuxppc-dev
Hello,
The following patch makes sure that all areas referred to through a BAR
register in a PCI device are aligned on a PAGE_SIZE boundary.
When looking at the result of the PCI initialization, the BAR registers
are filled with values that make sure the areas are directly adjacent.
This is a problem when trying to map these memory areas into user space
(using mmap). Mmap will only map pages, so to access the mapped area the
user must know the offset of the BAR register within the page.
When comparing this to the i386 architecture, the areas are aligned on
boundaries.
The following patch makes sure that all BAR areas are aligned on page
boundaries, by rounding down the address to the next page boundary. BAR
areas are mapped from the top down, so by just masking with
~(PAGE_SIZE-1) the address is aligned with the page.
This is the first time I propose a patch for the Linux kernel, so please
help me if I do something wrong here, or (in case this patch is
acceptable) how to get this into the kernel tree.
Kind regards,
Johan Borkhuis
=======================
diff -u linux-org/arch/ppc/syslib/pci_auto.c
linux/arch/ppc/syslib/pci_auto.c
--- linux-org/arch/ppc/syslib/pci_auto.c 2007-01-14
02:26:54.000000000 +0100
+++ linux/arch/ppc/syslib/pci_auto.c 2007-08-17 11:19:25.000000000 +0200
@@ -87,7 +87,7 @@
bar_size = ~(bar_response & addr_mask) + 1;
/* Allocate a base address */
- bar_value = (*upper_limit - bar_size) & ~(bar_size - 1);
+ bar_value = ((*upper_limit - bar_size) & ~(bar_size - 1)) &
~(PAGE_SIZE-1);
/* Write it out and update our limit */
early_write_config_dword(hose,
^ permalink raw reply
* Re: Patches for ppc?
From: David Woodhouse @ 2007-08-17 12:26 UTC (permalink / raw)
To: Johan Borkhuis; +Cc: Linuxppc-dev
In-Reply-To: <46C5519E.6010300@dutchspace.nl>
On Fri, 2007-08-17 at 09:43 +0200, Johan Borkhuis wrote:
> I am working with a PPC-kernel, and came across a problem with the PCI
> initialisation. On this mailing list I see a lot of patches, but they
> are all for the PowerPC architecture. Are patches for the PPC
> architecture still processed?
>
> I know that the ppc-architecture is being phased out, but for the moment
> I am stuck with it, as the board I am working with is not supported in
> the powerpc architecture.
If you've having to submit or look for patches, it sounds like it isn't
working with the obsolete arch/ppc either. Time to update, perhaps?
--
dwmw2
^ permalink raw reply
* Re: [PATCH 0/3] Remove need for include/asm-ppc
From: Josh Boyer @ 2007-08-17 12:30 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, Paul Mackerras
In-Reply-To: <Pine.LNX.4.64.0708170157140.15311@blarg.am.freescale.net>
On Fri, 17 Aug 2007 02:11:58 -0500 (CDT)
Kumar Gala <galak@kernel.crashing.org> wrote:
> This patch series removes the need for include/asm-ppc in the ARCH=powerpc
> build for ppc32. They exist in the following git tree:
>
> master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.24
>
> posting here for everyone else to see.
Did you happen to try building 44x with this series applied? If not,
I'll give it a whirl later today.
josh
^ permalink raw reply
* Re: [PATCH] [POWERPC] Fix interrupt routing and setup of ULI M1575 on FSL boards
From: Kumar Gala @ 2007-08-17 12:50 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
In-Reply-To: <18117.22358.723442.148999@cargo.ozlabs.ibm.com>
On Aug 17, 2007, at 3:07 AM, Paul Mackerras wrote:
> Kumar Gala writes:
>
>> The interrupt routing in the device trees for the ULI M1575 was
>> inproperly using the interrupt line field as pci function. Fixed
>> up the device tree's to actual conform for to specification and
>> changed the interrupt mapping code so it just uses a static mapping
>> setup as follows:
>
> This is a big patch to be going in post -rc3. Is it really fixing a
> regression or a serious bug?
Its a regression in that the ULI M1575 doesn't really work properly
on some of these boards in certain situations.
- k
^ permalink raw reply
* Re: [PATCH 3/3] [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32
From: Kumar Gala @ 2007-08-17 12:55 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linuxppc-dev, Paul Mackerras
In-Reply-To: <20070817181352.d29117be.sfr@canb.auug.org.au>
On Aug 17, 2007, at 3:13 AM, Stephen Rothwell wrote:
> On Fri, 17 Aug 2007 02:15:54 -0500 (CDT) Kumar Gala
> <galak@kernel.crashing.org> wrote:
>>
>> @@ -172,18 +168,15 @@ install:
>> archclean:
>> $(Q)$(MAKE) $(clean)=$(boot)
>>
>> -archmrproper:
>> - $(Q)rm -rf arch/$(ARCH)/include
>> -
>> archprepare: checkbin
>>
>> -ifeq ($(CONFIG_PPC32),y)
>> -# Temporary hack until we have migrated to asm-powerpc
>> -include/asm: arch/$(ARCH)/include/asm
>> -arch/$(ARCH)/include/asm: FORCE
>> - $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/
>> include; fi
>> - $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/
>> include/asm
>> -endif
>> +#ifeq ($(CONFIG_PPC32),y)
>> +## Temporary hack until we have migrated to asm-powerpc
>> +#include/asm: arch/$(ARCH)/include/asm
>> +#arch/$(ARCH)/include/asm: FORCE
>> +# $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$
>> (ARCH)/include; fi
>> +# $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/
>> include/asm
>> +#endif
>
> Why not just remove it? git will preserve it if we find a use for it.
oops, that was a debug foobar.. should have been removed.
Now fixed, got to love git-commit --amend.
- k
^ permalink raw reply
* Re: [PATCH 0/3] Remove need for include/asm-ppc
From: Kumar Gala @ 2007-08-17 12:56 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev, Paul Mackerras
In-Reply-To: <20070817073028.130728a0@zod.rchland.ibm.com>
On Aug 17, 2007, at 7:30 AM, Josh Boyer wrote:
> On Fri, 17 Aug 2007 02:11:58 -0500 (CDT)
> Kumar Gala <galak@kernel.crashing.org> wrote:
>
>> This patch series removes the need for include/asm-ppc in the
>> ARCH=powerpc
>> build for ppc32. They exist in the following git tree:
>>
>> master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git
>> for-2.6.24
>>
>> posting here for everyone else to see.
>
> Did you happen to try building 44x with this series applied? If not,
> I'll give it a whirl later today.
I built ebony w/o any issues.
- k
^ permalink raw reply
* [PATCH] advertise correct IDE mode on Pegasos2
From: Olaf Hering @ 2007-08-17 13:10 UTC (permalink / raw)
To: linuxppc-dev, linux-ide
In-Reply-To: <20070404111635.GA1855@aepfle.de>
The built-in IDE controller is configured in legacy mode,
but the PCI registers advertise native mode.
Force the PCI class into legacy mode. This allows pata_via to access
two drives.
The Pegasos specific irq enforcement in the via82cxxx driver
can be removed.
Tested on Pegasos2 with firmware version 20040810, and two IDE disks.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
arch/powerpc/kernel/prom_init.c | 11 ++++++++---
arch/powerpc/platforms/chrp/pci.c | 28 ++++++++++++++++++++++++++++
drivers/ide/pci/via82cxxx.c | 7 -------
3 files changed, 36 insertions(+), 10 deletions(-)
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2041,6 +2041,7 @@ static void __init fixup_device_tree_map
/*
* Pegasos and BriQ lacks the "ranges" property in the isa node
* Pegasos needs decimal IRQ 14/15, not hexadecimal
+ * Pegasos has the IDE configured in legacy mode, but advertised as native
*/
static void __init fixup_device_tree_chrp(void)
{
@@ -2078,9 +2079,13 @@ static void __init fixup_device_tree_chr
prom_printf("Fixing up IDE interrupt on Pegasos...\n");
prop[0] = 14;
prop[1] = 0x0;
- prop[2] = 15;
- prop[3] = 0x0;
- prom_setprop(ph, name, "interrupts", prop, 4*sizeof(u32));
+ prom_setprop(ph, name, "interrupts", prop, 2*sizeof(u32));
+ prom_printf("Fixing up IDE class-code on Pegasos...\n");
+ rc = prom_getprop(ph, "class-code", prop, sizeof(u32));
+ if (rc == sizeof(u32)) {
+ prop[0] &= ~0x5;
+ prom_setprop(ph, name, "class-code", prop, sizeof(u32));
+ }
}
}
#else
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -338,3 +338,31 @@ void chrp_pci_fixup_winbond_ata(struct p
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
chrp_pci_fixup_winbond_ata);
+
+/* Pegasos2 firmware version 20040810 configures the built-in IDE controller
+ * in legacy mode, but sets the PCI registers to PCI native mode.
+ * The chip can only operate in legacy mode, so force the PCI class into legacy
+ * mode as well. The same fixup must be done to the class-code property in
+ * the IDE node /pci@80000000/ide@C,1
+ */
+static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
+{
+ u8 progif;
+ struct pci_dev *viaisa;
+
+ if (!machine_is(chrp) || _chrp_type != _CHRP_Pegasos)
+ return;
+ if (viaide->irq != 14)
+ return;
+
+ viaisa = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231, NULL);
+ if (!viaisa)
+ return;
+ printk("Fixing VIA IDE, force legacy mode on '%s'\n", viaide->dev.bus_id);
+
+ pci_read_config_byte(viaide, PCI_CLASS_PROG, &progif);
+ pci_write_config_byte(viaide, PCI_CLASS_PROG, progif & ~0x5);
+
+ pci_dev_put(viaisa);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -436,13 +436,6 @@ static void __devinit init_hwif_via82cxx
hwif->tuneproc = &via82cxxx_tune_drive;
hwif->speedproc = &via_set_drive;
-
-#ifdef CONFIG_PPC_CHRP
- if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
- hwif->irq = hwif->channel ? 15 : 14;
- }
-#endif
-
for (i = 0; i < 2; i++) {
hwif->drives[i].io_32bit = 1;
hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;
^ permalink raw reply
* still using stabs debug format?
From: Kumar Gala @ 2007-08-17 13:17 UTC (permalink / raw)
To: linuxppc-dev@ozlabs.org list; +Cc: Ed Swarthout
Is anyone really still using the stabs format for kernel debug?
can we kill off the .stabs references?
- k
^ permalink raw reply
* [PATCH] [POWERPC] Fix 8xx compile failure
From: Kumar Gala @ 2007-08-17 13:24 UTC (permalink / raw)
To: linuxppc-dev
CC arch/powerpc/sysdev/commproc.o
arch/powerpc/sysdev/fsl_soc.c: In function fsl_pcmcia_of_init:
arch/powerpc/sysdev/fsl_soc.c:1109: error: implicit declaration of function of_platform_device_create
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
This patch is in the fixes-2.6.23 branch of my git tree
arch/powerpc/sysdev/fsl_soc.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 727453d..f6943fc 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -36,6 +36,7 @@
#include <sysdev/fsl_soc.h>
#include <mm/mmu_decl.h>
#include <asm/cpm2.h>
+#include <asm/of_platform.h>
extern void init_fcc_ioports(struct fs_platform_info*);
extern void init_fec_ioports(struct fs_platform_info*);
--
1.5.2.2
^ permalink raw reply related
* Re: Please pull from 'fixes-2.6.23' branch
From: Kumar Gala @ 2007-08-17 13:26 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, Paul Mackerras
In-Reply-To: <Pine.LNX.4.64.0708170000160.20987@blarg.am.freescale.net>
On Aug 17, 2007, at 12:02 AM, Kumar Gala wrote:
> Please pull from 'fixes-2.6.23' branch of
>
> master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git
> fixes-2.6.23
>
> to receive the following updates:
>
> arch/powerpc/boot/dts/mpc8544ds.dts | 88 ++++------
> arch/powerpc/boot/dts/mpc8641_hpcn.dts | 114 ++----------
> arch/powerpc/kernel/traps.c | 4
> arch/powerpc/platforms/85xx/Kconfig | 1
> arch/powerpc/platforms/85xx/mpc8544_ds.c | 214
> +-----------------------
> arch/powerpc/platforms/86xx/Kconfig | 1
> arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 224
> +------------------------
> arch/powerpc/platforms/Kconfig | 8
> arch/powerpc/platforms/Makefile | 3
> arch/powerpc/platforms/fsl_uli1575.c | 255 +++++++++++++++++
> ++++++++++++
> arch/powerpc/sysdev/rtc_cmos_setup.c | 15 +
> include/asm-powerpc/reg_booke.h | 12 +
> 12 files changed, 386 insertions(+), 553 deletions(-)
>
> Becky Bruce (1):
> [POWERPC] Fix FSL BookE machine check reporting
>
> Kumar Gala (2):
> [POWERPC] Add interrupt resource for RTC CMOS driver
> [POWERPC] Fix interrupt routing and setup of ULI M1575 on FSL
> boards
I've added the following fix to this branch:
[PATCH] [POWERPC] Fix 8xx compile failure
- k
^ permalink raw reply
* Re: for-2.6.24 branch in powerpc.git created
From: Josh Boyer @ 2007-08-17 13:35 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
In-Reply-To: <18117.1110.955352.469650@cargo.ozlabs.ibm.com>
On Fri, 17 Aug 2007 12:13:42 +1000
Paul Mackerras <paulus@samba.org> wrote:
> I have made a for-2.6.24 branch in powerpc.git and pushed the
> following patches to it.
Care to pick up the 4xx series (sending a separate pull request) and
this one below?
http://patchwork.ozlabs.org/linuxppc/patch?id=12799
thx,
josh
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox