* Re: Regarding the PPC board bringup with Linux 2.6 kernel
From: Wolfgang Denk @ 2005-09-06 14:54 UTC (permalink / raw)
To: vinay hegde; +Cc: linuxppc-embedded
In-Reply-To: <20050906130029.74727.qmail@web8405.mail.in.yahoo.com>
In message <20050906130029.74727.qmail@web8405.mail.in.yahoo.com> you wrote:
>
> Does anybody have any idea about the problem? Also,
Yes.
> is it possible to print some debug messages at this
> point of booting? {Note that, in the early stage of
Use a BDI2000.
> Can somebody help me with the above problem?
Maybe you start reading the FAQ... See
http://www.denx.de/twiki/bin/view/DULG/LinuxHangsAfterUncompressingKernel
Best regards,
Wolfgang Denk
--
Software Engineering: Embedded and Realtime Systems, Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
A wise person makes his own decisions, a weak one obeys public
opinion. -- Chinese proverb
^ permalink raw reply
* Re: Regarding the PPC board bringup with Linux 2.6 kernel
From: Clemens Koller @ 2005-09-06 16:09 UTC (permalink / raw)
Cc: linuxppc-embedded
In-Reply-To: <20050906145405.BFEC5352661@atlas.denx.de>
Hi, Vinay
Please reply to the list also!
I can guess your problem, but you should give more
information about your system i.e.
Processor / Board / Kernel version, ...
vinay hegde wrote:
> I do not have the board in my possesion. Actually, I
> am using the board through virtual network. Hence, I
> am unable to use any of the debugging techniques
> (JTAG, logic analyzer etc) except going through the
> source code and printing some messages.
Then you depend on the console output at least.
-> early printk.
> Also, how do I enable early printk option? I did not
> find any such option under kernel configuration.
i.e. if you use one of the latest 2.6 kernels,
turn on "Support for early boot texts over serial port"
(That's in in "Kernel hacking")
Verify your console settings twice.
You can even start to poke out some characters manually
to the serial port to see if (where) it really hangs if
you cannot use or don't want to spend lots of money to
get a hw debugger just for this.
> And, thanks for referring me to the mailing
> addresses. I will immediately subscribe to Ozlabs!
Read the list archives and the FAQ's mentioned
in here and ask google. You will get good answers there,
too!
Best greets,
Clemens Koller
_______________________________
R&D Imaging Devices
Anagramm GmbH
Rupert-Mayer-Str. 45/1
81379 Muenchen
Germany
http://www.anagramm.de
Phone: +49-89-741518-50
Fax: +49-89-741518-19
^ permalink raw reply
* [PATCH] ppc32: Fix Kconfig mismerge
From: Kumar Gala @ 2005-09-06 16:46 UTC (permalink / raw)
To: Andrew Morton; +Cc: linuxppc-dev, linux-kernel
Looks like the help comment for MPC834x got merged incorrectly.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
---
commit 28806bb4f8992eb46d2d788a00d08f62b4559d61
tree de364c30cb32f279b3b01f13f683d0fd88416bb9
parent 2dcbb32c37cd71d9f4a7f5530af896a18d859ef5
author Kumar K. Gala <kumar.gala@freescale.com> Tue, 06 Sep 2005 11:24:52 -0500
committer Kumar K. Gala <kumar.gala@freescale.com> Tue, 06 Sep 2005 11:24:52 -0500
arch/ppc/Kconfig | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -495,11 +495,6 @@ config WINCEPT
MPC821 PowerPC, introduced in 1998 and designed to be used in
thin-client machines. Say Y to support it directly.
- Be aware that PCI buses can only function when SYS board is plugged
- into the PIB (Platform IO Board) board from Freescale which provide
- 3 PCI slots. The PIBs PCI initialization is the bootloader's
- responsiblilty.
-
endchoice
choice
@@ -675,6 +670,11 @@ config MPC834x_SYS
bool "Freescale MPC834x SYS"
help
This option enables support for the MPC 834x SYS evaluation board.
+
+ Be aware that PCI buses can only function when SYS board is plugged
+ into the PIB (Platform IO Board) board from Freescale which provide
+ 3 PCI slots. The PIBs PCI initialization is the bootloader's
+ responsiblilty.
config EV64360
bool "Marvell-EV64360BP"
^ permalink raw reply
* Re: Regarding the PPC board bringup with Linux 2.6 kernel
From: Robert P. J. Day @ 2005-09-06 16:34 UTC (permalink / raw)
To: Clemens Koller; +Cc: linuxppc-embedded
In-Reply-To: <431DBF34.2040000@anagramm.de>
On Tue, 6 Sep 2005, Clemens Koller wrote:
> Hi, Vinay
>
> Please reply to the list also!
>
> I can guess your problem, but you should give more
> information about your system i.e.
> Processor / Board / Kernel version, ...
i missed the first part of this. i've booted a 2.6 kernel on an 8xx
board and got to the command prompt. is that of any use here?
rday
p.s. i'm not using u-boot as the bootloader but that shouldn't be an
unmanageable difference.
^ permalink raw reply
* Xilinx SystemACE driver for 2.6
From: Grant Likely @ 2005-09-06 18:26 UTC (permalink / raw)
To: linuxppc-embedded
Has anybody ported the SystemACE driver from 2.4 to 2.6 yet? If so,
where can I pull a patch from? Otherwise I'll start work on it.
Thanks,
g.
^ permalink raw reply
* Re: [PATCH 0/3] Start the merge
From: Jon Loeliger @ 2005-09-06 20:12 UTC (permalink / raw)
To: linuxppc64-dev, linuxppc-dev@ozlabs.org
In-Reply-To: <200508290845.34544.arnd@arndb.de>
On Mon, 2005-08-29 at 01:45, Arnd Bergmann wrote:
> On Maandag 29 August 2005 05:01, Stephen Rothwell wrote:
>
> > Please send at least the first upstream. The other two can also probably
> > be sent.
>
> These certainly look good to me.
>
> This is another patch to merge the atomic.h file. It is not completely
> trivial and changes the semantics for 32 bit SMP systems, which previously
> did not do EIEIO_ON_SMP within the atomic operations. AFAICT, that was
> a bug in the 32 bit version, which is now fixed as a side-effect of
> the merge.
>
> The combined version of this file also prevents building user space
> applications using atomic.h on ppc64. That was already impossible
> on 32 bit ppc, but probably also created broken output on ppc64.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> --
>
> include/asm-ppc/atomic.h | 214 ------------------------------
> include/asm-ppc64/atomic.h | 197 ---------------------------
> include/asm-ppc64/memory.h | 59 --------
> linux-2.6.12/include/asm-powerpc/atomic.h | 209 +++++++++++++++++++++++++++++
> linux-2.6.12/include/asm-powerpc/memory.h | 59 ++++++++
> linux-2.6.12/include/asm-ppc/io.h | 11 -
> 6 files changed, 269 insertions(+), 480 deletions(-)
Paul,
I'd like to call attention to this buried patch. It appears that
it might be lost due to Subject: line swiping; it likely hasn't
gotten first class status as its own independent patch.
Any chance we can get this one reviewed and pushed upstream too?
Thanks,
jdl
^ permalink raw reply
* Re: PATCH Merge more include files
From: Jon Loeliger @ 2005-09-06 20:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linuxppc64-dev, linuxppc-dev@ozlabs.org
In-Reply-To: <20050902163708.12c1abe3.sfr@canb.auug.org.au>
On Fri, 2005-09-02 at 01:37, Stephen Rothwell wrote:
> On Thu, 01 Sep 2005 15:51:52 -0500 Jon Loeliger <jdl@freescale.com> wrote:
> >
> > This patch merges several include files from
> > asm-ppc and asm-ppc64 into the new asm-powerpc.
> >
> > Signed-off-by: Jon Loeliger <jdl@freescale.com>
> > Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
>
> > +#ifndef _POWERPC_BUGS_H
>
> I would use _ASM_POWERPC_... but that is just me.
I'll start using _ASM_POWERPC_ from now on. I will
also submit a different patch to do a round of this
sort of cleanup.
Can we get an official call on the GPL header in
include files? I'm defaulting to adding them for now.
> Looks good.
Thanks. More coming, of course.
So, will you resubmit patches based on your 3/3 patch
that cover the slid-through the cracks set, or shall I?
I'm thinking pmac_features.h, dbdma.h, keylargo.h, etc.
Thanks,
jdl
^ permalink raw reply
* Re: PATCH Merge more include files
From: Jon Loeliger @ 2005-09-06 20:46 UTC (permalink / raw)
Cc: linuxppc64-dev, Arnd Bergmann, linuxppc-dev@ozlabs.org
In-Reply-To: <B6241EC1-429C-4286-BCF0-E0D3DC5049BF@freescale.com>
On Fri, 2005-09-02 at 08:38, Kumar Gala wrote:
> On Sep 1, 2005, at 10:18 PM, Arnd Bergmann wrote:
>
> > On Dunnersdag 01 September 2005 22:51, Jon Loeliger wrote:
> >
> >> +/*
> >> + * This file is included by 'init/main.c' to check for
> >> + * architecture-dependent bugs.
> >> + */
> >> +
> >> +extern void check_bugs(void);
> >> +
> >>
> >
> > Actually, I think this could to be
> >
> > +static inline void check_bugs(void)
> > +{
> > +}
> >
> > The function is empty on both ppc and ppc64, so we can just as
> > well get rid of the symbol as well.
> > The rest of the patch looks perfect to me.
>
> We just have to make sure to get ride of the implementation in arch/
> ppc*/kernel/syscalls.c if we do this.
>
> - kumar
Arnd,
If you'd like, I'll submit a patch to use the static inline
variant and rip out the definiton in the syscalls.c files.
jdl
^ permalink raw reply
* PATCH Merge kmap_types.h
From: Jon Loeliger @ 2005-09-06 20:51 UTC (permalink / raw)
To: linuxppc-dev@ozlabs.org, linuxppc64-dev
Here is a patch to merge the ppc and pp64 version of kmap_types.h
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
---
diff --git a/include/asm-powerpc/kmap_types.h b/include/asm-powerpc/kmap_types.h
new file mode 100644
--- /dev/null
+++ b/include/asm-powerpc/kmap_types.h
@@ -0,0 +1,33 @@
+#ifndef _ASM_POWERPC_KMAP_TYPES_H
+#define _ASM_POWERPC_KMAP_TYPES_H
+
+#ifdef __KERNEL__
+
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+enum km_type {
+ KM_BOUNCE_READ,
+ KM_SKB_SUNRPC_DATA,
+ KM_SKB_DATA_SOFTIRQ,
+ KM_USER0,
+ KM_USER1,
+ KM_BIO_SRC_IRQ,
+ KM_BIO_DST_IRQ,
+ KM_PTE0,
+ KM_PTE1,
+ KM_IRQ0,
+ KM_IRQ1,
+ KM_SOFTIRQ0,
+ KM_SOFTIRQ1,
+ KM_PPC_SYNC_PAGE,
+ KM_PPC_SYNC_ICACHE,
+ KM_TYPE_NR
+};
+
+#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_KMAP_TYPES_H */
diff --git a/include/asm-ppc/kmap_types.h b/include/asm-ppc/kmap_types.h
deleted file mode 100644
--- a/include/asm-ppc/kmap_types.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
- KM_BOUNCE_READ,
- KM_SKB_SUNRPC_DATA,
- KM_SKB_DATA_SOFTIRQ,
- KM_USER0,
- KM_USER1,
- KM_BIO_SRC_IRQ,
- KM_BIO_DST_IRQ,
- KM_PTE0,
- KM_PTE1,
- KM_IRQ0,
- KM_IRQ1,
- KM_SOFTIRQ0,
- KM_SOFTIRQ1,
- KM_PPC_SYNC_PAGE,
- KM_PPC_SYNC_ICACHE,
- KM_TYPE_NR
-};
-
-#endif
-#endif /* __KERNEL__ */
diff --git a/include/asm-ppc64/kmap_types.h b/include/asm-ppc64/kmap_types.h
deleted file mode 100644
--- a/include/asm-ppc64/kmap_types.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
- KM_BOUNCE_READ,
- KM_SKB_SUNRPC_DATA,
- KM_SKB_DATA_SOFTIRQ,
- KM_USER0,
- KM_USER1,
- KM_BIO_SRC_IRQ,
- KM_BIO_DST_IRQ,
- KM_PTE0,
- KM_PTE1,
- KM_IRQ0,
- KM_IRQ1,
- KM_SOFTIRQ0,
- KM_SOFTIRQ1,
- KM_TYPE_NR
-};
-
-#endif
-#endif /* __KERNEL__ */
^ permalink raw reply
* Re: PATCH Merge more include files
From: Arnd Bergmann @ 2005-09-06 22:14 UTC (permalink / raw)
To: Jon Loeliger; +Cc: linuxppc64-dev, linuxppc-dev@ozlabs.org
In-Reply-To: <1126039597.25148.59.camel@cashmere.sps.mot.com>
On Dinsdag 06 September 2005 22:46, Jon Loeliger wrote:
>
> If you'd like, I'll submit a patch to use the static inline
> variant and rip out the definiton in the syscalls.c files.
Yes, that sounds good.
Thanks,
Arnd <><
^ permalink raw reply
* Re: [PATCH 0/3] Start the merge
From: Paul Mackerras @ 2005-09-06 22:49 UTC (permalink / raw)
To: Jon Loeliger; +Cc: linuxppc64-dev, linuxppc-dev@ozlabs.org
In-Reply-To: <1126037554.25148.41.camel@cashmere.sps.mot.com>
Jon Loeliger writes:
> I'd like to call attention to this buried patch. It appears that
> it might be lost due to Subject: line swiping; it likely hasn't
> gotten first class status as its own independent patch.
>
> Any chance we can get this one reviewed and pushed upstream too?
I went to send it on yesterday and found that it doesn't apply any
more. If Arnd or someone would like to update it, I'll send it on.
Paul.
^ permalink raw reply
* Re: [PATCH 0/3] Start the merge
From: Arnd Bergmann @ 2005-09-07 0:07 UTC (permalink / raw)
To: linuxppc64-dev; +Cc: linuxppc-dev@ozlabs.org
In-Reply-To: <17182.7390.886339.12876@cargo.ozlabs.ibm.com>
On Middeweken 07 September 2005 00:49, Paul Mackerras wrote:
> I went to send it on yesterday and found that it doesn't apply any
> more. If Arnd or someone would like to update it, I'll send it on.
>
Hmm. I don't get rejects against the git head. For which tree do
you want the patch?
Arnd <><
^ permalink raw reply
* Re: PATCH Merge more include files
From: Stephen Rothwell @ 2005-09-07 1:02 UTC (permalink / raw)
To: Jon Loeliger; +Cc: linuxppc64-dev, linuxppc-dev
In-Reply-To: <1126039509.25148.54.camel@cashmere.sps.mot.com>
[-- Attachment #1: Type: text/plain, Size: 955 bytes --]
On Tue, 06 Sep 2005 15:45:09 -0500 Jon Loeliger <jdl@freescale.com> wrote:
>
> I'll start using _ASM_POWERPC_ from now on. I will
> also submit a different patch to do a round of this
> sort of cleanup.
OK, thanks.
> Can we get an official call on the GPL header in
> include files? I'm defaulting to adding them for now.
And I've been removing them :-)
It actually often depends on which of the asm-ppc or asm-ppc64 files you actually
copy.
You are right, we need a statement.
> Thanks. More coming, of course.
Great.
> So, will you resubmit patches based on your 3/3 patch
> that cover the slid-through the cracks set, or shall I?
> I'm thinking pmac_features.h, dbdma.h, keylargo.h, etc.
I took those out because they were controversial and may require
some more thought about where they actually end up.
--
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
* How can I compile the module into kernel
From: zhonglei @ 2005-09-07 7:34 UTC (permalink / raw)
To: linuxppc-embedded
hi:
My driver is a char device driver htm.o. How can I compile it into my kernel?
BestRegards
zhonglei
^ permalink raw reply
* lost "Using multi-level CPM interrupts" option
From: 徐小威的EMAIL @ 2005-09-07 8:43 UTC (permalink / raw)
To: linuxppc-embedded
Hi All:
I used patch file (patch-denx-linuxppc_2_4_devel-2005_06_23_1722)
to patch 2.4.25 Linux,
but this patch file didn't contain " Using multi-level CPM interrupts"
option.Why?
I used RTAI that version is stromboli and I want to run example
cpm_irqs.c.
Best Regards,
Rober Hsu
^ permalink raw reply
* ads8272 SEC problem on 2.4.18
From: Markus @ 2005-09-07 9:20 UTC (permalink / raw)
To: linuxppc-embedded
HiHo!
I am trying to get the SEC engine running on a ads8272
but i am completely stuck now. (It feels like the problem
we saw on this list last month, but there is still no solution
to that issue yet.
Quick Problem description:
initialize seems, ok, yet when i feed a single
dpd (for DES EU) into channel 0, the engine
seems to stuck during fetch. Nothing happens.
Questions:
- Can someone help me out? (Not sure if this is the right list for this?)
- Do (open) sources for the SEC1 (motorola/freescale) engine exist for vanilla linux?
(I know of Arabella, but they are neither open nor for vanilla linux)
ciao
Markus
P.S. some more details below
--------------------------------------------
more info:
- i hopefully initialized it correctly
- prepared a dpd
- wrote it into fetch register
- see that something happens: CurrentDescriptorPR changes
- boing, that's it... no more
some dumps:
Before writing the fetch register:
CryptoChannelConfigRegister (f0042008), 0x00000000 0x0000071c
CryptoChannelPointerStatusRegister (f0042010), 0x00000000 0x00000007
CryptoChannelCurrentDescriptorPointerRegister (f0042040), 0x00000000 0x00000000
CryptoChannelFetchDescriptorRegister (f0042048), 0x00000000 0x00000000
CryptoChannelDescriptorBufferRegister 0 (f0042080), 0x00000000
after writing to fetch register
CryptoChannelConfigRegister (f0042008), 0x00000000 0x0000071c
CryptoChannelPointerStatusRegister (f0042010), 0x00000002 0x00000007
CryptoChannelCurrentDescriptorPointerRegister (f0042040), 0x00000000 0x002e9a98
CryptoChannelFetchDescriptorRegister (f0042048), 0x00000000 0x00000000
CryptoChannelDescriptorBufferRegister 0 (f0042080), 0x00000000
CCPSR changes to 2 (error), but i don't know why?
Nothing else (at least nothing i can see) happens.
------------------------------------------------------
markus schaefer --- software engineer
epygi labs de gmbh
herrenstrasse 23
d-76133 karlsruhe, germany
tel: +49 (721) 205 96 30 -- fax: +49 (721) 205 96 59
sip: 20444@sip.epygi.com
*email removed, but it is easy to guess*
http://www.epygi.de
^ permalink raw reply
* Re: ads8272 SEC problem on 2.4.18
From: Vikas Aggarwal @ 2005-09-07 9:56 UTC (permalink / raw)
To: Markus; +Cc: linuxppc-embedded
In-Reply-To: <BDEHJGPIKNLKJJBCCFPLCEOOCPAA.listuser@epygi.de>
I had the similar error with SEC1 for 8248. My RNG DPD could not generate
desired result. After DPD address written my ISR was invoked but all i had
is TEA error, or bus error etc when i checked the Status Registers.
regards
-vikas
> HiHo!
>
> I am trying to get the SEC engine running on a ads8272
> but i am completely stuck now. (It feels like the problem
> we saw on this list last month, but there is still no solution
> to that issue yet.
>
> Quick Problem description:
> initialize seems, ok, yet when i feed a single
> dpd (for DES EU) into channel 0, the engine
> seems to stuck during fetch. Nothing happens.
>
> Questions:
> - Can someone help me out? (Not sure if this is the right list for this?)
> - Do (open) sources for the SEC1 (motorola/freescale) engine exist for
> vanilla linux?
> (I know of Arabella, but they are neither open nor for vanilla linux)
>
> ciao
> Markus
>
> P.S. some more details below
> --------------------------------------------
> more info:
> - i hopefully initialized it correctly
> - prepared a dpd
> - wrote it into fetch register
> - see that something happens: CurrentDescriptorPR changes
> - boing, that's it... no more
>
> some dumps:
> Before writing the fetch register:
> CryptoChannelConfigRegister (f0042008), 0x00000000 0x0000071c
> CryptoChannelPointerStatusRegister (f0042010), 0x00000000 0x00000007
> CryptoChannelCurrentDescriptorPointerRegister (f0042040), 0x00000000
> 0x00000000
> CryptoChannelFetchDescriptorRegister (f0042048), 0x00000000 0x00000000
> CryptoChannelDescriptorBufferRegister 0 (f0042080), 0x00000000
>
> after writing to fetch register
> CryptoChannelConfigRegister (f0042008), 0x00000000 0x0000071c
> CryptoChannelPointerStatusRegister (f0042010), 0x00000002 0x00000007
> CryptoChannelCurrentDescriptorPointerRegister (f0042040), 0x00000000
> 0x002e9a98
> CryptoChannelFetchDescriptorRegister (f0042048), 0x00000000 0x00000000
> CryptoChannelDescriptorBufferRegister 0 (f0042080), 0x00000000
>
> CCPSR changes to 2 (error), but i don't know why?
> Nothing else (at least nothing i can see) happens.
> ------------------------------------------------------
> markus schaefer --- software engineer
> epygi labs de gmbh
> herrenstrasse 23
> d-76133 karlsruhe, germany
> tel: +49 (721) 205 96 30 -- fax: +49 (721) 205 96 59
> sip: 20444@sip.epygi.com
> *email removed, but it is easy to guess*
> http://www.epygi.de
>
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>
^ permalink raw reply
* newbie question : how to register for a new interrupt
From: Nuguru Susheel @ 2005-09-07 14:14 UTC (permalink / raw)
To: linuxppc-embedded
Hi all,
I have written an service routine for handling the GPIO_WAKEUP
interrupt PSC2_4 pin (MPC5200 Core), but I donno how to register this
routine into the kernel.
I have connected an external circuit which generates interrupts to this
PSC2_4 pin, but I believe the Core doesnt know what to do when this
interrupt is generated without registering this routine ...
Help/Suggestions/Redirections please .......
--Cheers
nSr
^ permalink raw reply
* Re: How can I compile the module into kernel
From: Nuguru Susheel @ 2005-09-07 14:21 UTC (permalink / raw)
To: zhonglei; +Cc: linuxppc-embedded
Zhonglei,
after your kernel boots up and you have command line on ur console
type
"insmod htm.o" for normal insertion, if anything goes wrong try to force
"insmod -f htm.o"
forcing option is not recommended .. go through these pages
http://www.tldp.org/LDP/lkmpg/
> My driver is a char device driver htm.o. How can I compile it into my kernel?
^ permalink raw reply
* Re: Xilinx SystemACE driver for 2.6
From: Jeff Angielski @ 2005-09-07 13:56 UTC (permalink / raw)
To: glikely; +Cc: linuxppc-embedded
In-Reply-To: <528646bc050906112673dd4543@mail.gmail.com>
On Tue, 2005-09-06 at 18:26 +0000, Grant Likely wrote:
> Has anybody ported the SystemACE driver from 2.4 to 2.6 yet? If so,
> where can I pull a patch from? Otherwise I'll start work on it.
Along these lines, has anybody done any work to improve the overall
performance of the driver?
What kind of throughput are you seeing on your systems?
With our 266MHz MPC8260 w/ SystemACE (DENX linux-2.4.25), we see the
following numbers from Bonnie 1.4. The first set is for an ext2 system
and the second is for ext3...
---Sequential Output (nosync)--- ---Sequential Input-- --Rnd Seek-
-Per Char- --Block--- -Rewrite-- -Per Char- --Block--- --04k (03)-
MB K/sec %CPU K/sec %CPU K/sec %CPU K/sec %CPU K/sec %CPU /sec %CPU
696 65.9 1638 5.7 367 1.6 438 47.6 868 1.7 59.5 5.4
540 53.4 901 9.4 355 1.8 495 54.1 862 1.6 52.4 3.0
Jeff Angielski
The PTR Group
^ permalink raw reply
* Re: Platform devices on MPC8245
From: Mark Brown @ 2005-09-07 16:34 UTC (permalink / raw)
To: linuxppc-embedded
In-Reply-To: <20050831122556.GA474@projectcolo.org.uk>
On Wed, Aug 31, 2005 at 01:26:00PM +0100, Mark Brown wrote:
> I'm having some trouble using the platform device support for the
> MPC8245 using memory map B, set up using mpc10x_bridge_init(). When
> that function registers the host bridge it registers addresses
> 0x80000000-0xfebfffff for the bridge but by default (with EUMB mapped to
> MPC10X_MAPB_EUMB_BASE) the platform devices on the chip are also within
> this address range. The problem I'm seeing is that when
> platform_device_register() comes to call request_resource() on the
> devices that call fails because the addresses have already been
> allocated to the PCI host bridge.
Does anyone have any suggestions as to what I'm doing wrong with this?
Using kernel 2.6.13 I am currently working around the issue by making
the platform bus use insert_resource() rather than request_resource() as
in the patch below but this really seems like the wrong solution.
--- linux-2.6.13/drivers/base/platform.c 2005-08-29 00:41:01.000000000 +0100
+++ linux/drivers/base/platform.c 2005-09-07 17:26:10.459969600 +0100
@@ -149,7 +149,7 @@
p = &ioport_resource;
}
- if (p && request_resource(p, r)) {
+ if (p && insert_resource(p, r)) {
printk(KERN_ERR
"%s: failed to claim resource %d\n",
pdev->dev.bus_id, i);
--
"You grabbed my hand and we fell into it, like a daydream - or a fever."
^ permalink raw reply
* Re: Platform devices on MPC8245
From: Vitaly Bordug @ 2005-09-07 16:42 UTC (permalink / raw)
To: Mark Brown; +Cc: linuxppc-embedded list
In-Reply-To: <20050907163428.GA8522@projectcolo.org.uk>
Mark Brown wrote:
> On Wed, Aug 31, 2005 at 01:26:00PM +0100, Mark Brown wrote:
>
>
>>I'm having some trouble using the platform device support for the
>>MPC8245 using memory map B, set up using mpc10x_bridge_init(). When
>>that function registers the host bridge it registers addresses
>>0x80000000-0xfebfffff for the bridge but by default (with EUMB mapped to
>>MPC10X_MAPB_EUMB_BASE) the platform devices on the chip are also within
>>this address range. The problem I'm seeing is that when
>>platform_device_register() comes to call request_resource() on the
>>devices that call fails because the addresses have already been
>>allocated to the PCI host bridge.
>
>
> Does anyone have any suggestions as to what I'm doing wrong with this?
> Using kernel 2.6.13 I am currently working around the issue by making
> the platform bus use insert_resource() rather than request_resource() as
> in the patch below but this really seems like the wrong solution.
>
Yes, that's right. The proper solution (I guess) will be reconfiguration
in mpc10x_bridge_init() so that memory covered by the bridge do not
intercept anything what pdevs request. Or (less probably) there's
something odd in pdevs descriptions - if so you need to find out what
exactly is intercepted with the bridge area.
--
Sincerely,
Vitaly
^ permalink raw reply
* Re: Platform devices on MPC8245
From: Mark Brown @ 2005-09-07 16:58 UTC (permalink / raw)
To: Vitaly Bordug; +Cc: linuxppc-embedded list
In-Reply-To: <431F187E.4070006@ru.mvista.com>
On Wed, Sep 07, 2005 at 08:42:38PM +0400, Vitaly Bordug wrote:
> Yes, that's right. The proper solution (I guess) will be reconfiguration
> in mpc10x_bridge_init() so that memory covered by the bridge do not
> intercept anything what pdevs request. Or (less probably) there's
> something odd in pdevs descriptions - if so you need to find out what
> exactly is intercepted with the bridge area.
Setting the parent for the on-chip devices to be the PCI bridge ought to
do the trick, I think. The thing that's worrying me is that I can't see
how existing users of this code manage to do so successfully.
--
"You grabbed my hand and we fell into it, like a daydream - or a fever."
^ permalink raw reply
* [PATCH] ppc: Moved ASM_CONST macro into ppc_asm.h
From: Kumar Gala @ 2005-09-07 18:55 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, linuxppc64-dev
Moved the ASM_CONST macro into ppc_asm for ppc32 and ppc64 since that
seems like a much better place for it long term. Also, by adding the
macro to ppc32 it will ease some future merging of code into arch/powerpc.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
---
commit f56255eddd631902e3835bf7cdd8d94e69799097
tree 82c222d64fdccbaed25e302816fd4cf6237e8d56
parent 71c22e7cc4bf30119761b60b26c498d7b9d33e36
author Kumar K. Gala <kumar.gala@freescale.com> Wed, 07 Sep 2005 13:53:35 -0500
committer Kumar K. Gala <kumar.gala@freescale.com> Wed, 07 Sep 2005 13:53:35 -0500
include/asm-ppc/ppc_asm.h | 12 ++++++++++++
include/asm-ppc64/cputable.h | 2 +-
include/asm-ppc64/mmu.h | 1 +
include/asm-ppc64/page.h | 8 +-------
include/asm-ppc64/ppc_asm.h | 7 +++++++
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/include/asm-ppc/ppc_asm.h b/include/asm-ppc/ppc_asm.h
--- a/include/asm-ppc/ppc_asm.h
+++ b/include/asm-ppc/ppc_asm.h
@@ -11,6 +11,9 @@
* 2 of the License, or (at your option) any later version.
*/
+#ifndef __PPC_ASM_H
+#define __PPC_ASM_H
+
#include <linux/config.h>
/*
@@ -348,3 +351,12 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
#define N_RSYM 64
#define N_SLINE 68
#define N_SO 100
+
+#ifdef __ASSEMBLY__
+ #define ASM_CONST(x) x
+#else
+ #define __ASM_CONST(x) x##UL
+ #define ASM_CONST(x) __ASM_CONST(x)
+#endif
+
+#endif /* __PPC_ASM_H */
diff --git a/include/asm-ppc64/cputable.h b/include/asm-ppc64/cputable.h
--- a/include/asm-ppc64/cputable.h
+++ b/include/asm-ppc64/cputable.h
@@ -16,7 +16,7 @@
#define __ASM_PPC_CPUTABLE_H
#include <linux/config.h>
-#include <asm/page.h> /* for ASM_CONST */
+#include <asm/ppc_asm.h> /* for ASM_CONST */
/* Exposed to userland CPU features - Must match ppc32 definitions */
#define PPC_FEATURE_32 0x80000000
diff --git a/include/asm-ppc64/mmu.h b/include/asm-ppc64/mmu.h
--- a/include/asm-ppc64/mmu.h
+++ b/include/asm-ppc64/mmu.h
@@ -14,6 +14,7 @@
#define _PPC64_MMU_H_
#include <linux/config.h>
+#include <asm/ppc_asm.h> /* for ASM_CONST */
#include <asm/page.h>
/*
diff --git a/include/asm-ppc64/page.h b/include/asm-ppc64/page.h
--- a/include/asm-ppc64/page.h
+++ b/include/asm-ppc64/page.h
@@ -11,13 +11,7 @@
*/
#include <linux/config.h>
-
-#ifdef __ASSEMBLY__
- #define ASM_CONST(x) x
-#else
- #define __ASM_CONST(x) x##UL
- #define ASM_CONST(x) __ASM_CONST(x)
-#endif
+#include <asm/ppc_asm.h> /* for ASM_CONST */
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
diff --git a/include/asm-ppc64/ppc_asm.h b/include/asm-ppc64/ppc_asm.h
--- a/include/asm-ppc64/ppc_asm.h
+++ b/include/asm-ppc64/ppc_asm.h
@@ -239,4 +239,11 @@
#define vr30 30
#define vr31 31
+#ifdef __ASSEMBLY__
+ #define ASM_CONST(x) x
+#else
+ #define __ASM_CONST(x) x##UL
+ #define ASM_CONST(x) __ASM_CONST(x)
+#endif
+
#endif /* _PPC64_PPC_ASM_H */
^ permalink raw reply
* PATCH Standardize on _ASM_POWERPC header symbol prefix
From: jdl @ 2005-09-07 20:27 UTC (permalink / raw)
To: linuxppc-dev, linuxppc64-dev
Standardize on _ASM_POWERPC_... prefix for all #include
exclusion symbols. Fixup all the non-compliers.
include/asm-powerpc/8253pit.h | 8 ++++----
include/asm-powerpc/agp.h | 8 +++-----
include/asm-powerpc/bugs.h | 6 +++---
include/asm-powerpc/errno.h | 6 +++---
include/asm-powerpc/ioctl.h | 6 +++---
include/asm-powerpc/ioctls.h | 6 +++---
include/asm-powerpc/linkage.h | 6 +++---
include/asm-powerpc/mc146818rtc.h | 6 +++---
include/asm-powerpc/mman.h | 6 +++---
include/asm-powerpc/module.h | 6 +++---
include/asm-powerpc/namei.h | 14 +++++++-------
include/asm-powerpc/poll.h | 6 +++---
include/asm-powerpc/sembuf.h | 6 +++---
include/asm-powerpc/shmbuf.h | 6 +++---
include/asm-powerpc/shmparam.h | 6 +++---
include/asm-powerpc/siginfo.h | 6 +++---
include/asm-powerpc/socket.h | 6 +++---
include/asm-powerpc/sockios.h | 6 +++---
include/asm-powerpc/string.h | 6 +++---
include/asm-powerpc/termbits.h | 6 +++---
include/asm-powerpc/termios.h | 6 +++---
include/asm-powerpc/unaligned.h | 9 +++++----
22 files changed, 73 insertions(+), 74 deletions(-)
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
---
diff --git a/include/asm-powerpc/8253pit.h b/include/asm-powerpc/8253pit.h
--- a/include/asm-powerpc/8253pit.h
+++ b/include/asm-powerpc/8253pit.h
@@ -1,10 +1,10 @@
+#ifndef _ASM_POWERPC_8253PIT_H
+#define _ASM_POWERPC_8253PIT_H
+
/*
* 8253/8254 Programmable Interval Timer
*/
-#ifndef _8253PIT_H
-#define _8253PIT_H
-
#define PIT_TICK_RATE 1193182UL
-#endif
+#endif /* _ASM_POWERPC_8253PIT_H */
diff --git a/include/asm-powerpc/agp.h b/include/asm-powerpc/agp.h
--- a/include/asm-powerpc/agp.h
+++ b/include/asm-powerpc/agp.h
@@ -1,10 +1,8 @@
-#ifndef AGP_H
-#define AGP_H 1
+#ifndef _ASM_POWERPC_AGP_H
+#define _ASM_POWERPC_AGP_H
#include <asm/io.h>
-/* nothing much needed here */
-
#define map_page_into_agp(page)
#define unmap_page_from_agp(page)
#define flush_agp_mappings()
@@ -20,4 +18,4 @@
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
-#endif
+#endif /* _ASM_POWERPC_AGP_H */
diff --git a/include/asm-powerpc/bugs.h b/include/asm-powerpc/bugs.h
--- a/include/asm-powerpc/bugs.h
+++ b/include/asm-powerpc/bugs.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_BUGS_H
-#define _POWERPC_BUGS_H
+#ifndef _ASM_POWERPC_BUGS_H
+#define _ASM_POWERPC_BUGS_H
/*
* This program is free software; you can redistribute it and/or
@@ -15,4 +15,4 @@
extern void check_bugs(void);
-#endif /* _POWERPC_BUGS_H */
+#endif /* _ASM_POWERPC_BUGS_H */
diff --git a/include/asm-powerpc/errno.h b/include/asm-powerpc/errno.h
--- a/include/asm-powerpc/errno.h
+++ b/include/asm-powerpc/errno.h
@@ -1,5 +1,5 @@
-#ifndef _PPC_ERRNO_H
-#define _PPC_ERRNO_H
+#ifndef _ASM_POWERPC_ERRNO_H
+#define _ASM_POWERPC_ERRNO_H
#include <asm-generic/errno.h>
@@ -8,4 +8,4 @@
#define _LAST_ERRNO 516
-#endif
+#endif /* _ASM_POWERPC_ERRNO_H */
diff --git a/include/asm-powerpc/ioctl.h b/include/asm-powerpc/ioctl.h
--- a/include/asm-powerpc/ioctl.h
+++ b/include/asm-powerpc/ioctl.h
@@ -1,5 +1,5 @@
-#ifndef _PPC_IOCTL_H
-#define _PPC_IOCTL_H
+#ifndef _ASM_POWERPC_IOCTL_H
+#define _ASM_POWERPC_IOCTL_H
/*
@@ -66,4 +66,4 @@ extern unsigned int __invalid_size_argum
#define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT)
#define IOCSIZE_SHIFT (_IOC_SIZESHIFT)
-#endif
+#endif /* _ASM_POWERPC_IOCTL_H */
diff --git a/include/asm-powerpc/ioctls.h b/include/asm-powerpc/ioctls.h
--- a/include/asm-powerpc/ioctls.h
+++ b/include/asm-powerpc/ioctls.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_PPC_IOCTLS_H
-#define _ASM_PPC_IOCTLS_H
+#ifndef _ASM_POWERPC_IOCTLS_H
+#define _ASM_POWERPC_IOCTLS_H
#include <asm/ioctl.h>
@@ -104,4 +104,4 @@
#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
-#endif /* _ASM_PPC_IOCTLS_H */
+#endif /* _ASM_POWERPC_IOCTLS_H */
diff --git a/include/asm-powerpc/linkage.h b/include/asm-powerpc/linkage.h
--- a/include/asm-powerpc/linkage.h
+++ b/include/asm-powerpc/linkage.h
@@ -1,6 +1,6 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
+#ifndef _ASM_POWERPC_LINKAGE_H
+#define _ASM_POWERPC_LINKAGE_H
/* Nothing to see here... */
-#endif
+#endif /* _ASM_POWERPC_LINKAGE_H */
diff --git a/include/asm-powerpc/mc146818rtc.h b/include/asm-powerpc/mc146818rtc.h
--- a/include/asm-powerpc/mc146818rtc.h
+++ b/include/asm-powerpc/mc146818rtc.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_MC146818RTC_H
-#define _POWERPC_MC146818RTC_H
+#ifndef _ASM_POWERPC_MC146818RTC_H
+#define _ASM_POWERPC_MC146818RTC_H
/*
* Machine dependent access functions for RTC registers.
@@ -33,4 +33,4 @@ outb_p((val),RTC_PORT(1)); \
})
#endif /* __KERNEL__ */
-#endif /* _POWERPC_MC146818RTC_H */
+#endif /* _ASM_POWERPC_MC146818RTC_H */
diff --git a/include/asm-powerpc/mman.h b/include/asm-powerpc/mman.h
--- a/include/asm-powerpc/mman.h
+++ b/include/asm-powerpc/mman.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_MMAN_H
-#define _POWERPC_MMAN_H
+#ifndef _ASM_POWERPC_MMAN_H
+#define _ASM_POWERPC_MMAN_H
/*
* This program is free software; you can redistribute it and/or
@@ -49,4 +49,4 @@
#define MAP_ANON MAP_ANONYMOUS
#define MAP_FILE 0
-#endif /* _POWERPC_MMAN_H */
+#endif /* _ASM_POWERPC_MMAN_H */
diff --git a/include/asm-powerpc/module.h b/include/asm-powerpc/module.h
--- a/include/asm-powerpc/module.h
+++ b/include/asm-powerpc/module.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_MODULE_H
-#define _POWERPC_MODULE_H
+#ifndef _ASM_POWERPC_MODULE_H
+#define _ASM_POWERPC_MODULE_H
/*
* This program is free software; you can redistribute it and/or
@@ -74,4 +74,4 @@ struct exception_table_entry;
void sort_ex_table(struct exception_table_entry *start,
struct exception_table_entry *finish);
-#endif /* _POWERPC_MODULE_H */
+#endif /* _ASM_POWERPC_MODULE_H */
diff --git a/include/asm-powerpc/namei.h b/include/asm-powerpc/namei.h
--- a/include/asm-powerpc/namei.h
+++ b/include/asm-powerpc/namei.h
@@ -1,14 +1,14 @@
+#ifndef _ASM_POWERPC_NAMEI_H
+#define _ASM_POWERPC_NAMEI_H
+
+#ifdef __KERNEL__
+
/*
- * include/asm-ppc/namei.h
* Adapted from include/asm-alpha/namei.h
*
* Included from fs/namei.c
*/
-#ifdef __KERNEL__
-#ifndef __PPC_NAMEI_H
-#define __PPC_NAMEI_H
-
/* This dummy routine maybe changed to something useful
* for /usr/gnemul/ emulation stuff.
* Look at asm-sparc/namei.h for details.
@@ -16,5 +16,5 @@
#define __emul_prefix() NULL
-#endif /* __PPC_NAMEI_H */
-#endif /* __KERNEL__ */
+#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_NAMEI_H */
diff --git a/include/asm-powerpc/poll.h b/include/asm-powerpc/poll.h
--- a/include/asm-powerpc/poll.h
+++ b/include/asm-powerpc/poll.h
@@ -1,5 +1,5 @@
-#ifndef __PPC_POLL_H
-#define __PPC_POLL_H
+#ifndef _ASM_POWERPC_POLL_H
+#define _ASM_POWERPC_POLL_H
#define POLLIN 0x0001
#define POLLPRI 0x0002
@@ -20,4 +20,4 @@ struct pollfd {
short revents;
};
-#endif
+#endif /* _ASM_POWERPC_POLL_H */
diff --git a/include/asm-powerpc/sembuf.h b/include/asm-powerpc/sembuf.h
--- a/include/asm-powerpc/sembuf.h
+++ b/include/asm-powerpc/sembuf.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SEMBUF_H
-#define _POWERPC_SEMBUF_H
+#ifndef _ASM_POWERPC_SEMBUF_H
+#define _ASM_POWERPC_SEMBUF_H
/*
* This program is free software; you can redistribute it and/or
@@ -33,4 +33,4 @@ struct semid64_ds {
unsigned long __unused4;
};
-#endif /* _POWERPC_SEMBUF_H */
+#endif /* _ASM_POWERPC_SEMBUF_H */
diff --git a/include/asm-powerpc/shmbuf.h b/include/asm-powerpc/shmbuf.h
--- a/include/asm-powerpc/shmbuf.h
+++ b/include/asm-powerpc/shmbuf.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SHMBUF_H
-#define _POWERPC_SHMBUF_H
+#ifndef _ASM_POWERPC_SHMBUF_H
+#define _ASM_POWERPC_SHMBUF_H
/*
* This program is free software; you can redistribute it and/or
@@ -56,4 +56,4 @@ struct shminfo64 {
unsigned long __unused4;
};
-#endif /* _POWERPC_SHMBUF_H */
+#endif /* _ASM_POWERPC_SHMBUF_H */
diff --git a/include/asm-powerpc/shmparam.h b/include/asm-powerpc/shmparam.h
--- a/include/asm-powerpc/shmparam.h
+++ b/include/asm-powerpc/shmparam.h
@@ -1,6 +1,6 @@
-#ifndef _PPC_SHMPARAM_H
-#define _PPC_SHMPARAM_H
+#ifndef _ASM_POWERPC_SHMPARAM_H
+#define _ASM_POWERPC_SHMPARAM_H
#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
-#endif /* _PPC_SHMPARAM_H */
+#endif /* _ASM_POWERPC_SHMPARAM_H */
diff --git a/include/asm-powerpc/siginfo.h b/include/asm-powerpc/siginfo.h
--- a/include/asm-powerpc/siginfo.h
+++ b/include/asm-powerpc/siginfo.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SIGINFO_H
-#define _POWERPC_SIGINFO_H
+#ifndef _ASM_POWERPC_SIGINFO_H
+#define _ASM_POWERPC_SIGINFO_H
/*
* This program is free software; you can redistribute it and/or
@@ -15,4 +15,4 @@
#include <asm-generic/siginfo.h>
-#endif /* _POWERPC_SIGINFO_H */
+#endif /* _ASM_POWERPC_SIGINFO_H */
diff --git a/include/asm-powerpc/socket.h b/include/asm-powerpc/socket.h
--- a/include/asm-powerpc/socket.h
+++ b/include/asm-powerpc/socket.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SOCKET_H
-#define _POWERPC_SOCKET_H
+#ifndef _ASM_POWERPC_SOCKET_H
+#define _ASM_POWERPC_SOCKET_H
/*
* This program is free software; you can redistribute it and/or
@@ -56,4 +56,4 @@
#define SO_PEERSEC 31
-#endif /* _POWERPC_SOCKET_H */
+#endif /* _ASM_POWERPC_SOCKET_H */
diff --git a/include/asm-powerpc/sockios.h b/include/asm-powerpc/sockios.h
--- a/include/asm-powerpc/sockios.h
+++ b/include/asm-powerpc/sockios.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SOCKIOS_H
-#define _POWERPC_SOCKIOS_H
+#ifndef _ASM_POWERPC_SOCKIOS_H
+#define _ASM_POWERPC_SOCKIOS_H
/*
* This program is free software; you can redistribute it and/or
@@ -16,4 +16,4 @@
#define SIOCATMARK 0x8905
#define SIOCGSTAMP 0x8906 /* Get stamp */
-#endif /* _POWERPC_SOCKIOS_H */
+#endif /* _ASM_POWERPC_SOCKIOS_H */
diff --git a/include/asm-powerpc/string.h b/include/asm-powerpc/string.h
--- a/include/asm-powerpc/string.h
+++ b/include/asm-powerpc/string.h
@@ -1,5 +1,5 @@
-#ifndef _PPC_STRING_H_
-#define _PPC_STRING_H_
+#ifndef _ASM_POWERPC_STRING_H
+#define _ASM_POWERPC_STRING_H
#ifdef __KERNEL__
@@ -29,4 +29,4 @@ extern void * memchr(const void *,int,__
#endif /* __KERNEL__ */
-#endif
+#endif /* _ASM_POWERPC_STRING_H */
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h
--- a/include/asm-powerpc/termbits.h
+++ b/include/asm-powerpc/termbits.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_TERMBITS_H
-#define _POWERPC_TERMBITS_H
+#ifndef _ASM_POWERPC_TERMBITS_H
+#define _ASM_POWERPC_TERMBITS_H
/*
* This program is free software; you can redistribute it and/or
@@ -188,4 +188,4 @@ struct termios {
#define TCSADRAIN 1
#define TCSAFLUSH 2
-#endif /* _POWERPC_TERMBITS_H */
+#endif /* _ASM_POWERPC_TERMBITS_H */
diff --git a/include/asm-powerpc/termios.h b/include/asm-powerpc/termios.h
--- a/include/asm-powerpc/termios.h
+++ b/include/asm-powerpc/termios.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_TERMIOS_H
-#define _POWERPC_TERMIOS_H
+#ifndef _ASM_POWERPC_TERMIOS_H
+#define _ASM_POWERPC_TERMIOS_H
/*
* Liberally adapted from alpha/termios.h. In particular, the c_cc[]
@@ -233,4 +233,4 @@ struct termio {
#endif /* __KERNEL__ */
-#endif /* _POWERPC_TERMIOS_H */
+#endif /* _ASM_POWERPC_TERMIOS_H */
diff --git a/include/asm-powerpc/unaligned.h b/include/asm-powerpc/unaligned.h
--- a/include/asm-powerpc/unaligned.h
+++ b/include/asm-powerpc/unaligned.h
@@ -1,6 +1,7 @@
+#ifndef _ASM_POWERPC_UNALIGNED_H
+#define _ASM_POWERPC_UNALIGNED_H
+
#ifdef __KERNEL__
-#ifndef __PPC_UNALIGNED_H
-#define __PPC_UNALIGNED_H
/*
* The PowerPC can do unaligned accesses itself in big endian mode.
@@ -14,5 +15,5 @@
#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
-#endif
-#endif /* __KERNEL__ */
+#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_UNALIGNED_H */
^ 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