Nabble - linux-kernel

Re: [PATCH 62/86] pata_pdc202xx_old: document known issues

2009-11-25T12:38:27Z

On 11/25/2009 01:29 PM, Bartlomiej Zolnierkiewicz wrote:
> I think it is the best to leave up to the driver maintainer
> (once we find out who this person is, MAINTAINERS file still
> lacks info about PATA drivers in -rc8).

The important thing is taking two minutes to write a relevant comment,
not determining who is wearing a crown on his head.

Jeff

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH] Port ricoh_mmc from driver to pci quirk.

2009-11-25T12:30:36Z

On Wed, 25 Nov 2009 08:53:24 -0800
Philip Langdale <philipl@...> wrote:

> On Wed, 25 Nov 2009 16:58:41 +0200
> Maxim Levitsky <maximlevitsky@...> wrote:
>
> > >From 5c5e6f5ab1a5a09a430f410cab4b160a5e65501c Mon Sep 17 00:00:00
> > >2001
> > From: Maxim Levitsky <maximlevitsky@...>
> > Date: Wed, 25 Nov 2009 16:37:46 +0200
> > Subject: [PATCH] Port ricoh_mmc from driver to pci quirk.
> > This is much cleaner and correct solution
>
> I'm fine with the concept, but when I originally started work on
> Ricoh support, Pierre specifically didn't want a pci quirk.
>
> Pierre wrote:
> > I'd rather we didn't. The current style of quirks are bad enough,
> > making them even more vendor or device specific is a bit more than I'm
> > willing to accept right now (seriously, how hard can it be to follow
> > the damn spec?).
>
> Pierre's not officially the maintainer anymore but I still respect his
> opinions here. Given that a pci quirk solves this problem so simply,
> I think it's justified at this point.
>
> Pierre, do you want to comment?
>

I was talking about the quirks mechanism in sdhci, not pci quirks. :)

I have no objections to this patch.

>
> I would at least suggest a printk so ensure people know this is
> happening - otherwise there's no visible evidence that the system
> even has an MMC controller that's been disabled.
>

Agreed. There might be cases where we cause problems since we don't
fully understand this hardware.

Rgds
--
-- Pierre Ossman

WARNING: This correspondence is being monitored by FRA, a
Swedish intelligence agency. Make sure your server uses
encryption for SMTP traffic and consider using PGP for
end-to-end encryption.

signature.asc (205 bytes) Download Attachment

Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes

2009-11-25T12:23:24Z

On Wed, Nov 25, 2009 at 03:10:11PM -0500, J. Bruce Fields wrote:
> On Tue, Nov 24, 2009 at 08:03:12PM +0200, Boaz Harrosh wrote:
> >
> > In what history where these ever needed? Well not
> > any more.
>
> Applied, thanks.--b.

Um, I said that before I actually tried to compile it.... OK, dropping
for now (assuming I'm missing some earlier patch).

--b.

>
> >
> > Signed-off-by: Boaz Harrosh <bharrosh@...>
> > ---
> > fs/lockd/svc4proc.c | 4 ----
> > fs/lockd/svcproc.c | 4 ----
> > 2 files changed, 0 insertions(+), 8 deletions(-)
> >
> > diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
> > index bd173a6..a7966ee 100644
> > --- a/fs/lockd/svc4proc.c
> > +++ b/fs/lockd/svc4proc.c
> > @@ -11,10 +11,6 @@
> > #include <linux/time.h>
> > #include <linux/slab.h>
> > #include <linux/smp_lock.h>
> > -#include <linux/in.h>
> > -#include <linux/sunrpc/svc.h>
> > -#include <linux/sunrpc/clnt.h>
> > -#include <linux/nfsd/nfsd.h>
> > #include <linux/lockd/lockd.h>
> > #include <linux/lockd/share.h>
> >
> > diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
> > index e1d28dd..56c9519 100644
> > --- a/fs/lockd/svcproc.c
> > +++ b/fs/lockd/svcproc.c
> > @@ -11,10 +11,6 @@
> > #include <linux/time.h>
> > #include <linux/slab.h>
> > #include <linux/smp_lock.h>
> > -#include <linux/in.h>
> > -#include <linux/sunrpc/svc.h>
> > -#include <linux/sunrpc/clnt.h>
> > -#include <linux/nfsd/nfsd.h>
> > #include <linux/lockd/lockd.h>
> > #include <linux/lockd/share.h>
> >
> > --
> > 1.6.5.2
> >
> >

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: BUG at scsi_lib.c:1108 [Was: mmotm 2009-11-24-16-47 uploaded]

2009-11-25T12:22:57Z

On 11/25/2009 04:19 PM, James Bottomley wrote:

> On Wed, 2009-11-25 at 16:12 +0100, Jiri Slaby wrote:
>> On 11/25/2009 01:47 AM, akpm@... wrote:
>>> The mm-of-the-moment snapshot 2009-11-24-16-47 has been uploaded to
>>
>> Hi, I'm hitting the BUG below in the past two -mmotm's
>> (2009-11-24-16-47, 2009-11-17-14-03):
>
> So this looks like some type of bug in the barrier code. What the BUG_ON
> is saying is that something sent us a REQ_TYPE_FS (which should be a
> filesystem read or write) with no attached data, so we can't process it.
>
> I've cc'd Jens to see what he thinks.
>
> Could you bisect this to find the offending commit?

Hmm. I bisected it twice to
commit 1bebedd653e1bb0440ebf40724c55791c21ad7cc
Merge: a8d5ddf 62fa36a
Author: Stephen Rothwell <sfr@...>
Date: Wed Nov 25 17:42:47 2009 +1100

Merge remote branch 'md/for-next'

It doesn't make sense at all. How can empty merge cause a regression?
And md/for-next doesn't produce the BUG.

After the 1st bisection I did
git checkout 1bebedd653e1bb0440ebf40724c55791c21ad7cc
and built it. It crashed. Then I did
git bisect start 1bebedd origin/stable
where origin is next. And got back to the 1bebedd by bisection.

--
js
Faculty of Informatics, Masaryk University
Suse Labs, Novell
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH] hw-breakpoints: Fix unused function in off-case

2009-11-25T12:20:53Z

bp_perf_event_destroy() is unused in its off-case version, let's remove
it to fix the following warning:

kernel/perf_event.c:4306: warning: 'bp_perf_event_destroy' defined but not used

Reported-by: Stephen Rothwell <sfr@...>
Signed-off-by: Frederic Weisbecker <fweisbec@...>
Cc: Peter Zijlstra <peterz@...>
---
kernel/perf_event.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 35df94e..b119e4e 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4303,10 +4303,6 @@ void perf_bp_event(struct perf_event *bp, void *data)
perf_swevent_add(bp, 1, 1, &sample, regs);
}
#else
-static void bp_perf_event_destroy(struct perf_event *event)
-{
-}
-
static const struct pmu *bp_perf_event_init(struct perf_event *bp)
{
return NULL;
--
1.6.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH] SLUB: Fix __GFP_ZERO unlikely() annotation

2009-11-25T12:19:44Z

On Wed, Nov 25, 2009 at 10:15 PM, Christoph Lameter
<cl@...> wrote:
> On Wed, 25 Nov 2009, Pekka Enberg wrote:
>
>> Because that has no effect on the generated code.
>
> Does this affect the cycle count in slab_alloc?

Joe's suggestion doesn't change the generated code, my patch does and
probably changes cycle count. Let me see if I can run the in-kernel
slab tests.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH 1/2] hrtimer: correct a few numbers in comments and printk outputs

2009-11-25T12:18:39Z

On Wed, 25 Nov 2009, Andrew Morton wrote:

> On Tue, 24 Nov 2009 11:14:03 +0100
> Uwe Kleine-K__nig <u.kleine-koenig@...> wrote:
>
> > Hello Andrew,
> >
> > On Mon, Nov 23, 2009 at 03:25:16PM -0800, Andrew Morton wrote:
> > > On Fri, 20 Nov 2009 20:23:39 +0100
> > > Uwe Kleine-K__nig <u.kleine-koenig@...> wrote:
> > >
> > > > @@ -52,7 +52,7 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires,
> > > > printk(KERN_WARNING
> > > > "CE: %s increasing min_delta_ns to %lu nsec\n",
> > > > dev->name ? dev->name : "?",
> > > > - dev->min_delta_ns << 1);
> > > > + dev->min_delta_ns);
> > > >
> > > > i = 0;
> > > > }
> > >
> > > This one's already in linux-next:
> > >
> > > @@ -50,9 +50,9 @@ int tick_dev_program_event(struct clock_
> > > dev->min_delta_ns += dev->min_delta_ns >> 1;
> > >
> > > printk(KERN_WARNING
> > > - "CE: %s increasing min_delta_ns to %lu nsec\n",
> > > + "CE: %s increasing min_delta_ns to %llu nsec\n",
> > > dev->name ? dev->name : "?",
> > > - dev->min_delta_ns << 1);
> > > + (unsigned long long) dev->min_delta_ns << 1);
> > '<< 1' is wrong here, too.
> >
>
> What's wrong with it? That leftshift appears to be to compensate for
> the rightshift a few lines above.
>
> That change was unobvious and unchangelogged, so here we are again.

That's actually my fault. In commit 61c22c34 I removed the WARN_ON
which we put there to gather data on kerneloops.org for a while and
did not fix the printk format string.

Will take care of it. Thanks,

tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH] Input: i8042 - add Dell Vostro 1520 and 1720 to the reset list

2009-11-25T12:17:37Z

Hi Anisse,

On Tue, Nov 24, 2009 at 03:12:50PM +0100, Anisse Astier wrote:
> These laptops may have i8042 in a bad state at very first boot or if you plug
> in a non-Dell power supply.
> Thus this patch is needed for proper keyboard and touchpad function.
>

Could youplease explain in more detail what the "bad state" is. And what
exactly do you mean by "first boot"? Cold boot? The very first boot
after assembling? Something else?

Thanks.

--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

oops in proc_tid_stat

2009-11-25T12:15:57Z

Hi,

something seems to have blown up just under me. Maybe someone can make sense of
the debug trace.

thanks,
Jan

PROMLIB: Sun IEEE Boot Prom 'OBP 4.29.0.a 2008/09/15 11:59'
PROMLIB: Root node compatible: sun4v
Initializing cgroup subsys cpuset
Initializing cgroup subsys cpu
Linux version 2.6.31.1-56.fc12.sparc64 (mockbuild@...) (gcc version 4.4.1 20091010 (Red Hat 4.4.1-21) (GCC) ) #1 SMP Wed Oct 14 21:52:21 CDT 2009
console [earlyprom0] enabled
ARCH: SUN4V
Ethernet address: 00:14:4f:e1:d1:24
Kernel: Using 3 locked TLB entries for main kernel image.
Remapping the kernel... done.
OF stdout device is: /virtual-devices@100/console@1
PROM: Built device tree with 67275 bytes of memory.
MDESC: Size is 32544 bytes.
PLATFORM: banner-name [SPARC Enterprise T1000]
PLATFORM: name [SUNW,SPARC-Enterprise-T1000]
PLATFORM: hostid [84e1d124]
PLATFORM: serial# [00ab4130]
PLATFORM: stick-frequency [3b9aca00]
PLATFORM: mac-address [144fe1d124]
PLATFORM: watchdog-resolution [1000 ms]
PLATFORM: watchdog-max-timeout [31536000000 ms]
PLATFORM: max-cpus [32]
Top of RAM: 0x1ffdbc000, Total RAM: 0x1f79ac000
Memory hole size: 132MB
[0000000200000000-fffff80009400000] page_structs=131072 node=0 entry=0/0
[0000000200000000-fffff80009800000] page_structs=131072 node=0 entry=1/0
[0000000200000000-fffff80009c00000] page_structs=131072 node=0 entry=2/0
[0000000200900000-fffff8000a000000] page_structs=131072 node=0 entry=3/0
[0000000200900000-fffff8000a400000] page_structs=131072 node=0 entry=4/0
[0000000201200000-fffff8000a800000] page_structs=131072 node=0 entry=5/0
[0000000201200000-fffff8000ac00000] page_structs=131072 node=0 entry=6/0
[0000000201b00000-fffff8000b000000] page_structs=131072 node=0 entry=7/0
[0000000201b00000-fffff8000b400000] page_structs=131072 node=0 entry=8/0
[0000000202400000-fffff8000b800000] page_structs=131072 node=0 entry=9/0
[0000000202400000-fffff8000bc00000] page_structs=131072 node=0 entry=10/0
[0000000202400000-fffff8000c000000] page_structs=131072 node=0 entry=11/0
[0000000202d00000-fffff8000c400000] page_structs=131072 node=0 entry=12/0
[0000000202d00000-fffff8000cc00000] page_structs=131072 node=0 entry=13/0
[0000000203600000-fffff8000d000000] page_structs=131072 node=0 entry=14/0
[0000000203600000-fffff8000d400000] page_structs=131072 node=0 entry=15/0
[0000000203f00000-fffff8000d800000] page_structs=131072 node=0 entry=16/0
[0000000203f00000-fffff8000dc00000] page_structs=131072 node=0 entry=17/0
Zone PFN ranges:
Normal 0x00004200 -> 0x000ffede
Movable zone start PFN for each node
early_node_map[2] active PFN ranges
0: 0x00004200 -> 0x000ffec5
0: 0x000ffecd -> 0x000ffede
On node 0 totalpages: 1031382
Normal zone: 9065 pages used for memmap
Normal zone: 0 pages reserved
Normal zone: 1022317 pages, LIFO batch:15
Booting Linux...
Built 1 zonelists in Node order, mobility grouping on. Total pages: 1022317
Policy zone: Normal
Kernel command line: ro root=UUID=792531e6-1ddf-4c43-a1e9-995477d2b2a9 selinux=0 console=ttyS0
PID hash table entries: 4096 (order: 12, 32768 bytes)
Memory: 8161624k available (4400k kernel code, 2264k data, 280k init) [fffff80000000000,00000001ffdbc000]
SLUB: Genslabs=15, HWalign=32, Order=0-3, MinObjects=0, CPUs=32, Nodes=16
Hierarchical RCU implementation.
NR_IRQS:255
clocksource: mult[10000] shift[16]
clockevent: mult[80000000] shift[31]
Console: colour dummy device 80x25
allocated 41943040 bytes of page_cgroup
please try 'cgroup_disable=memory' option if you don't want memory cgroups
ODEBUG: 36 of 36 active objects replaced
Calibrating delay using timer specific routine.. 2003.12 BogoMIPS (lpj=10015634)
Security Framework initialized
SELinux: Disabled at boot.
Dentry cache hash table entries: 1048576 (order: 10, 8388608 bytes)
Inode-cache hash table entries: 524288 (order: 9, 4194304 bytes)
Mount-cache hash table entries: 512
Initializing cgroup subsys ns
Initializing cgroup subsys cpuacct
Initializing cgroup subsys memory
Initializing cgroup subsys devices
Initializing cgroup subsys freezer
Initializing cgroup subsys net_cls
ftrace: allocating 16127 entries in 32 pages
Brought up 24 CPUs
sizeof(vma)=176 bytes
sizeof(page)=72 bytes
sizeof(inode)=768 bytes
sizeof(dentry)=216 bytes
sizeof(ext3inode)=1024 bytes
sizeof(buffer_head)=104 bytes
sizeof(skbuff)=240 bytes
sizeof(task_struct)=5904 bytes
CPU0 attaching sched-domain:
domain 0: span 0-3 level SIBLING
groups: 0 1 2 3
domain 1: span 0-23 level CPU
groups: 0-3 4-7 8-11 12-15 16-19 20-23
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU1 attaching sched-domain:
domain 0: span 0-3 level SIBLING
groups: 1 2 3 0
domain 1: span 0-23 level CPU
groups: 0-3 4-7 8-11 12-15 16-19 20-23
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU2 attaching sched-domain:
domain 0: span 0-3 level SIBLING
groups: 2 3 0 1
domain 1: span 0-23 level CPU
groups: 0-3 4-7 8-11 12-15 16-19 20-23
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU3 attaching sched-domain:
domain 0: span 0-3 level SIBLING
groups: 3 0 1 2
domain 1: span 0-23 level CPU
groups: 0-3 4-7 8-11 12-15 16-19 20-23
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU4 attaching sched-domain:
domain 0: span 4-7 level SIBLING
groups: 4 5 6 7
domain 1: span 0-23 level CPU
groups: 4-7 8-11 12-15 16-19 20-23 0-3
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU5 attaching sched-domain:
domain 0: span 4-7 level SIBLING
groups: 5 6 7 4
domain 1: span 0-23 level CPU
groups: 4-7 8-11 12-15 16-19 20-23 0-3
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU6 attaching sched-domain:
domain 0: span 4-7 level SIBLING
groups: 6 7 4 5
domain 1: span 0-23 level CPU
groups: 4-7 8-11 12-15 16-19 20-23 0-3
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU7 attaching sched-domain:
domain 0: span 4-7 level SIBLING
groups: 7 4 5 6
domain 1: span 0-23 level CPU
groups: 4-7 8-11 12-15 16-19 20-23 0-3
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU8 attaching sched-domain:
domain 0: span 8-11 level SIBLING
groups: 8 9 10 11
domain 1: span 0-23 level CPU
groups: 8-11 12-15 16-19 20-23 0-3 4-7
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU9 attaching sched-domain:
domain 0: span 8-11 level SIBLING
groups: 9 10 11 8
domain 1: span 0-23 level CPU
groups: 8-11 12-15 16-19 20-23 0-3 4-7
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU10 attaching sched-domain:
domain 0: span 8-11 level SIBLING
groups: 10 11 8 9
domain 1: span 0-23 level CPU
groups: 8-11 12-15 16-19 20-23 0-3 4-7
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU11 attaching sched-domain:
domain 0: span 8-11 level SIBLING
groups: 11 8 9 10
domain 1: span 0-23 level CPU
groups: 8-11 12-15 16-19 20-23 0-3 4-7
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU12 attaching sched-domain:
domain 0: span 12-15 level SIBLING
groups: 12 13 14 15
domain 1: span 0-23 level CPU
groups: 12-15 16-19 20-23 0-3 4-7 8-11
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU13 attaching sched-domain:
domain 0: span 12-15 level SIBLING
groups: 13 14 15 12
domain 1: span 0-23 level CPU
groups: 12-15 16-19 20-23 0-3 4-7 8-11
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU14 attaching sched-domain:
domain 0: span 12-15 level SIBLING
groups: 14 15 12 13
domain 1: span 0-23 level CPU
groups: 12-15 16-19 20-23 0-3 4-7 8-11
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU15 attaching sched-domain:
domain 0: span 12-15 level SIBLING
groups: 15 12 13 14
domain 1: span 0-23 level CPU
groups: 12-15 16-19 20-23 0-3 4-7 8-11
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU16 attaching sched-domain:
domain 0: span 16-19 level SIBLING
groups: 16 17 18 19
domain 1: span 0-23 level CPU
groups: 16-19 20-23 0-3 4-7 8-11 12-15
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU17 attaching sched-domain:
domain 0: span 16-19 level SIBLING
groups: 17 18 19 16
domain 1: span 0-23 level CPU
groups: 16-19 20-23 0-3 4-7 8-11 12-15
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU18 attaching sched-domain:
domain 0: span 16-19 level SIBLING
groups: 18 19 16 17
domain 1: span 0-23 level CPU
groups: 16-19 20-23 0-3 4-7 8-11 12-15
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU19 attaching sched-domain:
domain 0: span 16-19 level SIBLING
groups: 19 16 17 18
domain 1: span 0-23 level CPU
groups: 16-19 20-23 0-3 4-7 8-11 12-15
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU20 attaching sched-domain:
domain 0: span 20-23 level SIBLING
groups: 20 21 22 23
domain 1: span 0-23 level CPU
groups: 20-23 0-3 4-7 8-11 12-15 16-19
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU21 attaching sched-domain:
domain 0: span 20-23 level SIBLING
groups: 21 22 23 20
domain 1: span 0-23 level CPU
groups: 20-23 0-3 4-7 8-11 12-15 16-19
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU22 attaching sched-domain:
domain 0: span 20-23 level SIBLING
groups: 22 23 20 21
domain 1: span 0-23 level CPU
groups: 20-23 0-3 4-7 8-11 12-15 16-19
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
CPU23 attaching sched-domain:
domain 0: span 20-23 level SIBLING
groups: 23 20 21 22
domain 1: span 0-23 level CPU
groups: 20-23 0-3 4-7 8-11 12-15 16-19
domain 2: span 0-23 level NODE
groups: 0-23 (__cpu_power = 6144)
ldc.c:v1.1 (July 22, 2008)
ldc: Domaining disabled.
regulator: core version 0.5
NET: Registered protocol family 16
VIO: Adding device channel-devices
VIO: Adding device vldc-port-0-0
VIO: Adding device vldc-port-0-1
VIO: Adding device vldc-port-0-2
VIO: Adding device vldc-port-1-0
VIO: Adding device vldc-port-3-0
VIO: Adding device vldc-port-3-8
VIO: Adding device ds-1
VIO: Adding device ds-0
Testing NMI watchdog ... OK.
pci_sun4v: Registered hvapi major[1] minor[0]
/pci@780: SUN4V PCI Bus Module
/pci@780: On NUMA node -1
/pci@780: PCI IO[e810000000] MEM[ea00000000]
/pci@780: MSI Queue first[0] num[36] count[128] devino[0x18]
/pci@780: MSI first[0] num[256] mask[0xff] width[32]
/pci@780: MSI addr32[0x7fff0000:0x10000] addr64[0x3ffff0000:0x10000]
/pci@780: MSI queues at RA [00000001f9e00000]
PCI: Scanning PBM /pci@780
/pci@7c0: SUN4V PCI Bus Module
/pci@7c0: On NUMA node -1
/pci@7c0: PCI IO[f010000000] MEM[f200000000]
/pci@7c0: MSI Queue first[0] num[36] count[128] devino[0x18]
/pci@7c0: MSI first[0] num[256] mask[0xff] width[32]
/pci@7c0: MSI addr32[0x7fff0000:0x10000] addr64[0x3ffff0000:0x10000]
/pci@7c0: MSI queues at RA [00000001f9e80000]
PCI: Scanning PBM /pci@7c0
pci 0001:02:00.0: PME# supported from D0 D3hot D3cold
pci 0001:02:00.0: PME# disabled
pci 0001:03:04.0: PME# supported from D3hot
pci 0001:03:04.0: PME# disabled
pci 0001:03:04.1: PME# supported from D3hot
pci 0001:03:04.1: PME# disabled
pci 0001:04:01.0: PME# supported from D3hot D3cold
pci 0001:04:01.0: PME# disabled
pci 0001:04:01.1: PME# supported from D3hot D3cold
pci 0001:04:01.1: PME# disabled
pci 0001:04:02.0: supports D1 D2
ds.c:v1.0 (Jul 11, 2007)
bio: create slab <bio-0> at 0
vgaarb: loaded
SCSI subsystem initialized
libata version 3.00 loaded.
usbcore: registered new interface driver usbfs
usbcore: registered new interface driver hub
usbcore: registered new device driver usb
NetLabel: Initializing
NetLabel: domain hash size = 128
NetLabel: protocols = UNLABELED CIPSOv4
NetLabel: unlabeled traffic allowed by default
Switched to high resolution mode on CPU 0
Switched to high resolution mode on CPU 1
Switched to high resolution mode on CPU 22
Switched to high resolution mode on CPU 18
Switched to high resolution mode on CPU 14
Switched to high resolution mode on CPU 10
Switched to high resolution mode on CPU 6
Switched to high resolution mode on CPU 2
Switched to high resolution mode on CPU 23
Switched to high resolution mode on CPU 19
Switched to high resolution mode on CPU 15
Switched to high resolution mode on CPU 11
Switched to high resolution mode on CPU 7
Switched to high resolution mode on CPU 3
Switched to high resolution mode on CPU 20
Switched to high resolution mode on CPU 16
Switched to high resolution mode on CPU 12
Switched to high resolution mode on CPU 8
Switched to high resolution mode on CPU 4
Switched to high resolution mode on CPU 21
Switched to high resolution mode on CPU 17
Switched to high resolution mode on CPU 13
Switched to high resolution mode on CPU 9
Switched to high resolution mode on CPU 5
NET: Registered protocol family 2
IP route cache hash table entries: 262144 (order: 8, 2097152 bytes)
TCP established hash table entries: 524288 (order: 10, 8388608 bytes)
TCP bind hash table entries: 65536 (order: 8, 2097152 bytes)
TCP: Hash tables configured (established 524288 bind 65536)
TCP reno registered
NET: Registered protocol family 1
Trying to unpack rootfs image as initramfs...
Freeing initrd memory: 3429k freed
audit: initializing netlink socket (disabled)
type=2000 audit(1.760:1): initialized
HugeTLB registered 4 MB page size, pre-allocated 0 pages
VFS: Disk quotas dquot_6.5.2
Dquot-cache hash table entries: 1024 (order 0, 8192 bytes)
msgmni has been set to 15947
cryptomgr_test used greatest stack depth: 12288 bytes left
alg: No test for stdrng (krng)
Block layer SCSI generic (bsg) driver version 0.4 loaded (major 252)
io scheduler noop registered
io scheduler anticipatory registered
io scheduler deadline registered
io scheduler cfq registered (default)
f027a19c: ttyS0 at I/O 0x0 (irq = 1) is a SUN4V HCONS
console handover: boot [earlyprom0] -> real [ttyHV0]
f0287068: ttyS1 at MMIO 0xf820c2c000 (irq = 18) is a ST16650V2
brd: module loaded
loop: module loaded
Fixed MDIO Bus: probed
ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
uhci_hcd: USB Universal Host Controller Interface driver
mice: PS/2 mouse device common for all mice
rtc-sun4v rtc-sun4v: rtc core: registered sun4v as rtc0
device-mapper: uevent: version 1.0.3
device-mapper: ioctl: 4.15.0-ioctl (2009-04-01) initialised: dm-devel@...
usbcore: registered new interface driver hiddev
usbcore: registered new interface driver usbhid
usbhid: v2.6:USB HID core driver
nf_conntrack version 0.5.0 (16384 buckets, 65536 max)
CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use
nf_conntrack.acct=1 kernel parameter, acct=1 nf_conntrack module option or
sysctl net.netfilter.nf_conntrack_acct=1 to enable it.
ip_tables: (C) 2000-2006 Netfilter Core Team
TCP cubic registered
Initializing XFRM netlink socket
NET: Registered protocol family 17
registered taskstats version 1
rtc-sun4v rtc-sun4v: setting system clock to 2009-11-25 12:36:36 UTC (1259152596)
Initalizing network drop monitor service
plymouthd used greatest stack depth: 11808 bytes left
console_init used greatest stack depth: 11152 bytes left
plymouth used greatest stack depth: 32 bytes left
Fusion MPT base driver 3.04.10
Copyright (c) 1999-2008 LSI Corporation
Fusion MPT SAS Host driver 3.04.10
mptbase: ioc0: Initiating bringup
ioc0: LSISAS1064 A3: Capabilities={Initiator}
scsi0 : ioc0: LSISAS1064 A3, FwRev=010a0000h, Ports=1, MaxQ=511, IRQ=25
mptsas: ioc0: attaching sata device: fw_channel 0, fw_id 0, phy 0, sas_addr 0x1221000000000000
scsi 0:0:0:0: Direct-Access ATA HITACHI HDS7216S AB8A PQ: 0 ANSI: 5
sd 0:0:0:0: Attached scsi generic sg0 type 0
sd 0:0:0:0: [sda] 312581808 512-byte logical blocks: (160 GB/149 GiB)
sd 0:0:0:0: [sda] Write Protect is off
sd 0:0:0:0: [sda] Mode Sense: 67 00 00 08
sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
sda: sda1 sda2 sda3 sda4 sda5
sd 0:0:0:0: [sda] Attached SCSI disk
kjournald starting. Commit interval 5 seconds
EXT3-fs: mounted filesystem with ordered data mode.
udev: starting version 145
tg3.c:v3.99 (April 20, 2009)
PCI: Enabling device: (0001:03:04.0), cmd 2
tg3 0001:03:04.0: PME# disabled
eth0: Tigon3 [partno(BCM95714) rev 9003] (PCIX:133MHz:64-bit) MAC address 00:14:4f:e1:d1:24
eth0: attached PHY is 5714 (10/100/1000Base-T Ethernet) (WireSpeed[1])
eth0: RXcsums[1] LinkChgREG[0] MIirq[0] ASF[0] TSOcap[1]
eth0: dma_rwctrl[76148000] dma_mask[32-bit]
PCI: Enabling device: (0001:03:04.1), cmd 2
tg3 0001:03:04.1: PME# disabled
eth1: Tigon3 [partno(BCM95714) rev 9003] (PCIX:133MHz:64-bit) MAC address 00:14:4f:e1:d1:25
eth1: attached PHY is 5714 (10/100/1000Base-T Ethernet) (WireSpeed[1])
eth1: RXcsums[1] LinkChgREG[0] MIirq[0] ASF[0] TSOcap[1]
eth1: dma_rwctrl[76148000] dma_mask[32-bit]
PCI: Enabling device: (0001:04:01.0), cmd 2
tg3 0001:04:01.0: PME# disabled
eth2: Tigon3 [partno(BCM95704) rev 2100] (PCIX:100MHz:64-bit) MAC address 00:14:4f:e1:d1:26
eth2: attached PHY is 5704 (10/100/1000Base-T Ethernet) (WireSpeed[1])
eth2: RXcsums[1] LinkChgREG[0] MIirq[0] ASF[0] TSOcap[1]
eth2: dma_rwctrl[769f8000] dma_mask[32-bit]
PCI: Enabling device: (0001:04:01.1), cmd 2
tg3 0001:04:01.1: PME# disabled
eth3: Tigon3 [partno(BCM95704) rev 2100] (PCIX:100MHz:64-bit) MAC address 00:14:4f:e1:d1:27
eth3: attached PHY is 5704 (10/100/1000Base-T Ethernet) (WireSpeed[1])
eth3: RXcsums[1] LinkChgREG[0] MIirq[0] ASF[0] TSOcap[1]
eth3: dma_rwctrl[769f8000] dma_mask[32-bit]
device-mapper: multipath: version 1.1.0 loaded
EXT3 FS on sda2, internal journal
kjournald starting. Commit interval 5 seconds
EXT3 FS on sda4, internal journal
EXT3-fs: mounted filesystem with ordered data mode.
kjournald starting. Commit interval 5 seconds
EXT3 FS on sda1, internal journal
EXT3-fs: mounted filesystem with ordered data mode.
NET: Registered protocol family 10
lo: Disabled Privacy Extensions
ip6_tables: (C) 2000-2006 Netfilter Core Team
tg3 0001:03:04.0: PME# disabled
ADDRCONF(NETDEV_UP): eth0: link is not ready
tg3: eth0: Link is up at 100 Mbps, full duplex.
tg3: eth0: Flow control is on for TX and on for RX.
ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
eth0: no IPv6 routers present
RPC: Registered udp transport module.
RPC: Registered tcp transport module.
cc1 used greatest stack depth: 8 bytes left
Unable to handle kernel NULL pointer dereference
tsk->{mm,active_mm}->context = 00000000000005d6
tsk->{mm,active_mm}->pgd = fffff801f13c6000
\|/ ____ \|/
"@'/ .. \`@"
/_| \__/ |_\
\__U_/
htop(3168): Oops [#1]
TSTATE: 0000000011001603 TPC: 000000000056d358 TNPC: 000000000056d35c Y: 00000000 Not tainted
TPC: <do_task_stat+0xa8/0x5e4>
g0: 0000000000000008 g1: 0000000000000000 g2: 0000000000000001 g3: 0000000000000000
g4: fffff801bb2a8c40 g5: 0000000100930000 g6: fffff801d0a00000 g7: 0000000000000001
o0: 0000000000da2000 o1: 0000000000000001 o2: fffff801f5c82460 o3: fffff801db855d80
o4: 00000000000633e0 o5: 0000000000023dd8 sp: fffff801d0a03001 ret_pc: 000000000056d334
RPC: <do_task_stat+0x84/0x5e4>
l0: fffff801f5b21540 l1: fffffffffffffffd l2: fffff801f5c82460 l3: 0000000000000000
l4: fffff801cc92ef00 l5: 0000000000000001 l6: 0000000000002048 l7: 000000000051b230
i0: fffff801f7a7a630 i1: 0000000000a14200 i2: fffff801f5c82460 i3: fffff801db855d80
i4: 0000000000000000 i5: 0000000000023dd8 i6: fffff801d0a03311 i7: 000000000056d8e0
I7: <proc_tid_stat+0x1c/0x30>
Disabling lock debugging due to kernel taint
Caller[000000000056d8e0]: proc_tid_stat+0x1c/0x30
Caller[000000000056a3e4]: proc_single_show+0x44/0x7c
Caller[0000000000534738]: seq_read+0x1d0/0x400
Caller[000000000051b0e8]: vfs_read+0x74/0x148
Caller[000000000051b264]: SyS_read+0x34/0x64
Caller[0000000000406254]: linux_sparc_syscall32+0x34/0x40
Caller[00000000f7ca1a8c]: 0xf7ca1a8c
Instruction DUMP: c077a79f c25ee008 c2586028 <e6586070> c2586088 c277a79f 9210001b 7ffecad6 9007a7e7
Unable to handle kernel NULL pointer dereference
tsk->{mm,active_mm}->context = 00000000000012c5
tsk->{mm,active_mm}->pgd = fffff801dc35c000
\|/ ____ \|/
"@'/ .. \`@"
/_| \__/ |_\
\__U_/
htop(11416): Oops [#2]
TSTATE: 0000000011001603 TPC: 000000000056d358 TNPC: 000000000056d35c Y: 00000000 Tainted: G D
TPC: <do_task_stat+0xa8/0x5e4>
g0: 0000000000000008 g1: 0000000000000000 g2: 0000000000000001 g3: 0000000000000000
g4: fffff801b9b91760 g5: 0000000100130000 g6: fffff801e3034000 g7: 0000000000000002
o0: 0000000000daa000 o1: 0000000000000001 o2: fffff801f5c82460 o3: fffff801db855d80
o4: 00000000000649d8 o5: 0000000000023dd8 sp: fffff801e3037001 ret_pc: 000000000056d334
RPC: <do_task_stat+0x84/0x5e4>
l0: fffff801f5b21540 l1: fffffffffffffffd l2: fffff801f5c82460 l3: 0000000000000000
l4: fffff801cc92ef00 l5: 0000000000000001 l6: 0000000000002048 l7: 000000000051b230
i0: fffff801f93697b8 i1: 0000000000a14200 i2: fffff801f5c82460 i3: fffff801db855d80
i4: 0000000000000000 i5: 0000000000023dd8 i6: fffff801e3037311 i7: 000000000056d8e0
I7: <proc_tid_stat+0x1c/0x30>
Caller[000000000056d8e0]: proc_tid_stat+0x1c/0x30
Caller[000000000056a3e4]: proc_single_show+0x44/0x7c
Caller[0000000000534738]: seq_read+0x1d0/0x400
Caller[000000000051b0e8]: vfs_read+0x74/0x148
Caller[000000000051b264]: SyS_read+0x34/0x64
Caller[0000000000406254]: linux_sparc_syscall32+0x34/0x40
Caller[00000000f7cc5a8c]: 0xf7cc5a8c
Instruction DUMP: c077a79f c25ee008 c2586028 <e6586070> c2586088 c277a79f 9210001b 7ffecad6 9007a7e7
[died and force rebooted]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH] SLUB: Fix __GFP_ZERO unlikely() annotation

2009-11-25T12:15:26Z

On Wed, 25 Nov 2009, Pekka Enberg wrote:

> Because that has no effect on the generated code.

Does this affect the cycle count in slab_alloc?

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [RFC] nfsd: Move private headers to source directory

2009-11-25T12:14:08Z

On Tue, Nov 24, 2009 at 08:05:14PM +0200, Boaz Harrosh wrote:
>
> Lots of include/linux/nfsd/* headers are only used by
> nfsd module. Move them to the source directory

Fine by me; I guess just resubmit this after the others go in.

--b.

>
> Signed-off-by: Boaz Harrosh <bharrosh@...>
> ---
> fs/nfsd/auth.c | 2 +-
> {include/linux => fs}/nfsd/cache.h | 0
> fs/nfsd/export.c | 3 ++-
> fs/nfsd/lockd.c | 2 +-
> fs/nfsd/nfs2acl.c | 7 ++++---
> fs/nfsd/nfs3acl.c | 7 ++++---
> fs/nfsd/nfs3proc.c | 4 ++--
> fs/nfsd/nfs3xdr.c | 2 +-
> fs/nfsd/nfs4callback.c | 4 ++--
> fs/nfsd/nfs4proc.c | 4 ++--
> fs/nfsd/nfs4recover.c | 5 +++--
> fs/nfsd/nfs4state.c | 2 +-
> fs/nfsd/nfs4xdr.c | 3 ++-
> fs/nfsd/nfscache.c | 4 ++--
> fs/nfsd/nfsctl.c | 5 +++--
> {include/linux => fs}/nfsd/nfsd.h | 0
> fs/nfsd/nfsfh.c | 2 +-
> fs/nfsd/nfsproc.c | 4 ++--
> fs/nfsd/nfssvc.c | 4 ++--
> fs/nfsd/nfsxdr.c | 2 +-
> {include/linux => fs}/nfsd/state.h | 0
> fs/nfsd/stats.c | 4 ++--
> fs/nfsd/vfs.c | 18 ++++++++++--------
> {include/linux => fs}/nfsd/xdr.h | 2 +-
> {include/linux => fs}/nfsd/xdr3.h | 2 +-
> {include/linux => fs}/nfsd/xdr4.h | 4 ++--
> 26 files changed, 52 insertions(+), 44 deletions(-)
> rename {include/linux => fs}/nfsd/cache.h (100%)
> rename {include/linux => fs}/nfsd/nfsd.h (100%)
> rename {include/linux => fs}/nfsd/state.h (100%)
> rename {include/linux => fs}/nfsd/xdr.h (99%)
> rename {include/linux => fs}/nfsd/xdr3.h (99%)
> rename {include/linux => fs}/nfsd/xdr4.h (99%)
>
> diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
> index ad354d2..71209d4 100644
> --- a/fs/nfsd/auth.c
> +++ b/fs/nfsd/auth.c
> @@ -5,7 +5,7 @@
> */
>
> #include <linux/sched.h>
> -#include <linux/nfsd/nfsd.h>
> +#include "nfsd.h"
> #include "auth.h"
>
> int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)
> diff --git a/include/linux/nfsd/cache.h b/fs/nfsd/cache.h
> similarity index 100%
> rename from include/linux/nfsd/cache.h
> rename to fs/nfsd/cache.h
> diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
> index 68e63f4..cb3dae2 100644
> --- a/fs/nfsd/export.c
> +++ b/fs/nfsd/export.c
> @@ -18,10 +18,11 @@
> #include <linux/module.h>
> #include <linux/exportfs.h>
>
> -#include <linux/nfsd/nfsd.h>
> #include <linux/nfsd/syscall.h>
> #include <net/ipv6.h>
>
> +#include "nfsd.h"
> +
> #define NFSDDBG_FACILITY NFSDDBG_EXPORT
>
> typedef struct auth_domain svc_client;
> diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
> index 801ef71..6f12777 100644
> --- a/fs/nfsd/lockd.c
> +++ b/fs/nfsd/lockd.c
> @@ -9,8 +9,8 @@
> */
>
> #include <linux/file.h>
> -#include <linux/nfsd/nfsd.h>
> #include <linux/lockd/bind.h>
> +#include "nfsd.h"
> #include "vfs.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_LOCKD
> diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
> index a54628d..874e2a9 100644
> --- a/fs/nfsd/nfs2acl.c
> +++ b/fs/nfsd/nfs2acl.c
> @@ -6,10 +6,11 @@
> * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@...>
> */
>
> -#include <linux/nfsd/nfsd.h>
> -#include <linux/nfsd/cache.h>
> -#include <linux/nfsd/xdr3.h>
> +#include "nfsd.h"
> +/* FIXME: nfsacl.h is a broken header */
> #include <linux/nfsacl.h>
> +#include "cache.h"
> +#include "xdr3.h"
> #include "vfs.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_PROC
> diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
> index 2f5c61b..c6011dd 100644
> --- a/fs/nfsd/nfs3acl.c
> +++ b/fs/nfsd/nfs3acl.c
> @@ -6,10 +6,11 @@
> * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@...>
> */
>
> -#include <linux/nfsd/nfsd.h>
> -#include <linux/nfsd/cache.h>
> -#include <linux/nfsd/xdr3.h>
> +#include "nfsd.h"
> +/* FIXME: nfsacl.h is a broken header */
> #include <linux/nfsacl.h>
> +#include "cache.h"
> +#include "xdr3.h"
> #include "vfs.h"
>
> #define RETURN_STATUS(st) { resp->status = (st); return (st); }
> diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
> index b694b43..90b19ca 100644
> --- a/fs/nfsd/nfs3proc.c
> +++ b/fs/nfsd/nfs3proc.c
> @@ -10,8 +10,8 @@
> #include <linux/ext2_fs.h>
> #include <linux/magic.h>
>
> -#include <linux/nfsd/cache.h>
> -#include <linux/nfsd/xdr3.h>
> +#include "cache.h"
> +#include "xdr3.h"
> #include "vfs.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_PROC
> diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
> index 623e13a..c523bb8 100644
> --- a/fs/nfsd/nfs3xdr.c
> +++ b/fs/nfsd/nfs3xdr.c
> @@ -9,7 +9,7 @@
> */
>
> #include <linux/namei.h>
> -#include <linux/nfsd/xdr3.h>
> +#include "xdr3.h"
> #include "auth.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_XDR
> diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
> index 4fe3960..f7a3158 100644
> --- a/fs/nfsd/nfs4callback.c
> +++ b/fs/nfsd/nfs4callback.c
> @@ -34,8 +34,8 @@
> */
>
> #include <linux/sunrpc/clnt.h>
> -#include <linux/nfsd/nfsd.h>
> -#include <linux/nfsd/state.h>
> +#include "nfsd.h"
> +#include "state.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_PROC
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index d0e04cb..f8a37c4 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -36,8 +36,8 @@
> */
> #include <linux/file.h>
>
> -#include <linux/nfsd/cache.h>
> -#include <linux/nfsd/xdr4.h>
> +#include "cache.h"
> +#include "xdr4.h"
> #include "vfs.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_PROC
> diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
> index 48742f2..6744e7f 100644
> --- a/fs/nfsd/nfs4recover.c
> +++ b/fs/nfsd/nfs4recover.c
> @@ -33,12 +33,13 @@
> *
> */
>
> -#include <linux/nfsd/nfsd.h>
> -#include <linux/nfsd/state.h>
> #include <linux/file.h>
> #include <linux/namei.h>
> #include <linux/crypto.h>
> #include <linux/sched.h>
> +
> +#include "nfsd.h"
> +#include "state.h"
> #include "vfs.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_PROC
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 1fe6e29..2923e6c 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -36,11 +36,11 @@
>
> #include <linux/file.h>
> #include <linux/smp_lock.h>
> -#include <linux/nfsd/xdr4.h>
> #include <linux/namei.h>
> #include <linux/swap.h>
> #include <linux/sunrpc/svcauth_gss.h>
> #include <linux/sunrpc/clnt.h>
> +#include "xdr4.h"
> #include "vfs.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_PROC
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 2fa9682..cab9780 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -43,10 +43,11 @@
> #include <linux/namei.h>
> #include <linux/statfs.h>
> #include <linux/utsname.h>
> -#include <linux/nfsd/xdr4.h>
> #include <linux/nfsd_idmap.h>
> #include <linux/nfs4_acl.h>
> #include <linux/sunrpc/svcauth_gss.h>
> +
> +#include "xdr4.h"
> #include "vfs.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_XDR
> diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
> index 96694b8..18aa972 100644
> --- a/fs/nfsd/nfscache.c
> +++ b/fs/nfsd/nfscache.c
> @@ -10,8 +10,8 @@
> * Copyright (C) 1995, 1996 Olaf Kirch <okir@...>
> */
>
> -#include <linux/nfsd/nfsd.h>
> -#include <linux/nfsd/cache.h>
> +#include "nfsd.h"
> +#include "cache.h"
>
> /* Size of reply cache. Common values are:
> * 4.3BSD: 128
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index e4f49fd..0415680 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -11,12 +11,13 @@
>
> #include <linux/nfsd_idmap.h>
> #include <linux/sunrpc/svcsock.h>
> -#include <linux/nfsd/nfsd.h>
> -#include <linux/nfsd/cache.h>
> #include <linux/nfsd/syscall.h>
> #include <linux/lockd/lockd.h>
> #include <linux/sunrpc/clnt.h>
>
> +#include "nfsd.h"
> +#include "cache.h"
> +
> /*
> * We have a single directory with 9 nodes in it.
> */
> diff --git a/include/linux/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> similarity index 100%
> rename from include/linux/nfsd/nfsd.h
> rename to fs/nfsd/nfsd.h
> diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
> index 4ef4601..2bf9efb 100644
> --- a/fs/nfsd/nfsfh.c
> +++ b/fs/nfsd/nfsfh.c
> @@ -12,7 +12,7 @@
> #include <linux/exportfs.h>
>
> #include <linux/sunrpc/svcauth_gss.h>
> -#include <linux/nfsd/nfsd.h>
> +#include "nfsd.h"
> #include "vfs.h"
> #include "auth.h"
>
> diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
> index b6bd9e0..21a5f79 100644
> --- a/fs/nfsd/nfsproc.c
> +++ b/fs/nfsd/nfsproc.c
> @@ -9,8 +9,8 @@
>
> #include <linux/namei.h>
>
> -#include <linux/nfsd/cache.h>
> -#include <linux/nfsd/xdr.h>
> +#include "cache.h"
> +#include "xdr.h"
> #include "vfs.h"
>
> typedef struct svc_rqst svc_rqst;
> diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
> index b2d7ffa..b520ce1 100644
> --- a/fs/nfsd/nfssvc.c
> +++ b/fs/nfsd/nfssvc.c
> @@ -15,11 +15,11 @@
>
> #include <linux/sunrpc/stats.h>
> #include <linux/sunrpc/svcsock.h>
> -#include <linux/nfsd/nfsd.h>
> -#include <linux/nfsd/cache.h>
> #include <linux/lockd/bind.h>
> #include <linux/nfsacl.h>
> #include <linux/seq_file.h>
> +#include "nfsd.h"
> +#include "cache.h"
> #include "vfs.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_SVC
> diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
> index 5e0603d..3bec831 100644
> --- a/fs/nfsd/nfsxdr.c
> +++ b/fs/nfsd/nfsxdr.c
> @@ -6,7 +6,7 @@
> * Copyright (C) 1995, 1996 Olaf Kirch <okir@...>
> */
>
> -#include <linux/nfsd/xdr.h>
> +#include "xdr.h"
> #include "auth.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_XDR
> diff --git a/include/linux/nfsd/state.h b/fs/nfsd/state.h
> similarity index 100%
> rename from include/linux/nfsd/state.h
> rename to fs/nfsd/state.h
> diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c
> index e3e411e..3fc69df 100644
> --- a/fs/nfsd/stats.c
> +++ b/fs/nfsd/stats.c
> @@ -25,11 +25,11 @@
>
> #include <linux/seq_file.h>
> #include <linux/module.h>
> -
> #include <linux/sunrpc/stats.h>
> -#include <linux/nfsd/nfsd.h>
> #include <linux/nfsd/stats.h>
>
> +#include "nfsd.h"
> +
> struct nfsd_stats nfsdstats;
> struct svc_stat nfsd_svcstats = {
> .program = &nfsd_program,
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index 81ce108..04bdba1 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -22,23 +22,25 @@
> #include <linux/fcntl.h>
> #include <linux/namei.h>
> #include <linux/delay.h>
> -#include <linux/nfsd/nfsd.h>
> -#ifdef CONFIG_NFSD_V3
> -#include <linux/nfsd/xdr3.h>
> -#endif /* CONFIG_NFSD_V3 */
> #include <linux/quotaops.h>
> #include <linux/fsnotify.h>
> #include <linux/posix_acl_xattr.h>
> #include <linux/xattr.h>
> +#include <linux/jhash.h>
> +#include <linux/ima.h>
> +#include <asm/uaccess.h>
> +
> +#ifdef CONFIG_NFSD_V3
> +#include "xdr3.h"
> +#endif /* CONFIG_NFSD_V3 */
> +
> #ifdef CONFIG_NFSD_V4
> #include <linux/nfs4_acl.h>
> #include <linux/nfsd_idmap.h>
> #endif /* CONFIG_NFSD_V4 */
> -#include <linux/jhash.h>
> -#include <linux/ima.h>
> -#include "vfs.h"
>
> -#include <asm/uaccess.h>
> +#include "nfsd.h"
> +#include "vfs.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_FILEOP
>
> diff --git a/include/linux/nfsd/xdr.h b/fs/nfsd/xdr.h
> similarity index 99%
> rename from include/linux/nfsd/xdr.h
> rename to fs/nfsd/xdr.h
> index 58f824d..235ee5c 100644
> --- a/include/linux/nfsd/xdr.h
> +++ b/fs/nfsd/xdr.h
> @@ -8,7 +8,7 @@
> #define LINUX_NFSD_H
>
> #include <linux/vfs.h>
> -#include <linux/nfsd/nfsd.h>
> +#include "nfsd.h"
>
> struct nfsd_fhandle {
> struct svc_fh fh;
> diff --git a/include/linux/nfsd/xdr3.h b/fs/nfsd/xdr3.h
> similarity index 99%
> rename from include/linux/nfsd/xdr3.h
> rename to fs/nfsd/xdr3.h
> index 421eddd..b330756 100644
> --- a/include/linux/nfsd/xdr3.h
> +++ b/fs/nfsd/xdr3.h
> @@ -9,7 +9,7 @@
> #ifndef _LINUX_NFSD_XDR3_H
> #define _LINUX_NFSD_XDR3_H
>
> -#include <linux/nfsd/xdr.h>
> +#include "xdr.h"
>
> struct nfsd3_sattrargs {
> struct svc_fh fh;
> diff --git a/include/linux/nfsd/xdr4.h b/fs/nfsd/xdr4.h
> similarity index 99%
> rename from include/linux/nfsd/xdr4.h
> rename to fs/nfsd/xdr4.h
> index 1bf2662..83202a1 100644
> --- a/include/linux/nfsd/xdr4.h
> +++ b/fs/nfsd/xdr4.h
> @@ -39,8 +39,8 @@
> #ifndef _LINUX_NFSD_XDR4_H
> #define _LINUX_NFSD_XDR4_H
>
> -#include <linux/nfsd/state.h>
> -#include <linux/nfsd/nfsd.h>
> +#include "state.h"
> +#include "nfsd.h"
>
> #define NFSD4_MAX_TAGLEN 128
> #define XDR_LEN(n) (((n) + 3) & ~3)
> --
> 1.6.5.2
>
>

Re: [PATCH 5/5] vfs: nfsctl.c unused nfsd #includes

2009-11-25T12:13:15Z

On Tue, Nov 24, 2009 at 08:04:12PM +0200, Boaz Harrosh wrote:
>
> Only linux/nfsd/syscall.h is actually used. Remove the
> other nfsd #includes, so they can be moved to source
> directory.

I guess I'll take this one too.

The arch-specific ones I'm assuming are someone else's problem unless I
hear otherwise.

--b.

>
> Signed-off-by: Boaz Harrosh <bharrosh@...>
> ---
> fs/nfsctl.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsctl.c b/fs/nfsctl.c
> index 8f9a205..d3854d9 100644
> --- a/fs/nfsctl.c
> +++ b/fs/nfsctl.c
> @@ -7,8 +7,6 @@
> #include <linux/types.h>
> #include <linux/file.h>
> #include <linux/fs.h>
> -#include <linux/sunrpc/svc.h>
> -#include <linux/nfsd/nfsd.h>
> #include <linux/nfsd/syscall.h>
> #include <linux/cred.h>
> #include <linux/sched.h>
> --
> 1.6.5.2
>
>

Re: [PATCH][GIT PULL][v2.6.32] tracing/x86: Add check to detect GCC messing with mcount prologue

2009-11-25T12:12:49Z

On 11/25/2009 08:44 AM, Jakub Jelinek wrote:

>
> If you compile kernels 90%+ people out there run with -p on i?86/x86_64,
> then certainly coming up with a new gcc switch and new profiling ABI is
> desirable. -p on i?86/x86_64 e.g. forces -fno-omit-frame-pointer, which
> makes code on these register starved arches significantly worse.
> Making GCC output profiling call before prologue instead of after prologue
> is a 4 liner in generic code and a few lines in target specific code.
> The important thing is that we shouldn't have 100 different profiling ABIs,
> so it is desirable to agree on something that will be generally useful not
> just for the kernel, but perhaps for other purposes.
>

There is really just one that makes sense, which is providing the
ABI-defined entry state, which means intercepting at the point of entry.

Anything else is/was a mistake.

-hpa

--
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel. I don't speak on their behalf.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH] spi: SuperH MSIOF SPI Master driver

2009-11-25T12:11:52Z

On Tue, 24 Nov 2009 21:55:31 +0900
Magnus Damm <magnus.damm@...> wrote:

> From: Magnus Damm <damm@...>
>
> This patch adds SPI Master support for the SuperH MSIOF
> hardware block. Full duplex, spi mode 0-3, active high cs,
> 3-wire and lsb first should all be supported, but the driver
> has so far only been tested with "mmc_spi".
>
> The MSIOF hardware comes with 32-bit FIFOs for receive and
> transmit, and this driver simply breaks the SPI messages
> into FIFO-sized chunks. The MSIOF hardware manages the pins
> for clock, receive and transmit (sck/miso/mosi), but the chip
> select pin is managed by software and must be configured as
> a regular GPIO pin by the board code.
>
> Performance wise there is still room for improvement, but
> on a Ecovec board with the built-in sh7724 MSIOF0 this driver
> gets Mini-sd read speeds of about half a megabyte per second.
>
> Future work include better clock setup and merging of 8-bit
> transfers into 32-bit words to reduce interrupt load and
> improve throughput.
>
>
> ...
>
> --- 0001/drivers/spi/spi.c
> +++ work/drivers/spi/spi.c 2009-11-24 20:39:48.000000000 +0900
> @@ -17,7 +17,6 @@
> * along with this program; if not, write to the Free Software
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
> -
> #include <linux/kernel.h>
> #include <linux/device.h>
> #include <linux/init.h>

whoops?

> --- /dev/null
> +++ work/drivers/spi/spi_sh_msiof.c 2009-11-24 20:39:49.000000000 +0900
> @@ -0,0 +1,675 @@
> +/*
> + * SuperH MSIOF SPI Master Interface
> + *
> + * Copyright (c) 2009 Magnus Damm
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + */
> +
> +#include <linux/kernel.h>

But not consistently.

> +#include <linux/init.h>
> +#include <linux/delay.h>
> +#include <linux/interrupt.h>
> +#include <linux/platform_device.h>
> +#include <linux/completion.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/gpio.h>
> +#include <linux/bitmap.h>
> +#include <linux/clk.h>
> +#include <linux/io.h>
> +
> +#include <linux/spi/spi.h>
> +#include <linux/spi/spi_bitbang.h>
> +#include <linux/spi/sh_msiof.h>
> +
> +#include <asm/spi.h>
> +#include <asm/unaligned.h>
> +
> +struct sh_msiof_spi_priv {
> + struct spi_bitbang bitbang; /* must be first for spi_bitbang.c */

Well if that's the case then spi_bitbang.c needs smacking. What causes
this requirement?

> + void __iomem *mapbase;
> + struct clk *clk;
> + struct platform_device *pdev;
> + struct sh_msiof_spi_info *info;
> + struct completion done;
> + unsigned long flags;
> + int tx_fifo_size;
> + int rx_fifo_size;
> +};
> +
>
> ...
>
> +static void sh_msiof_modify_ctr_wait(struct sh_msiof_spi_priv *p,
> + unsigned long clr, unsigned long set)
> +{
> + unsigned long mask = clr | set;
> + unsigned long data;
> +
> + data = sh_msiof_read(p, CTR);
> + data &= ~clr;
> + data |= set;
> + sh_msiof_write(p, CTR, data);
> +
> + while ((sh_msiof_read(p, CTR) & mask) != set)
> + ;

hm, confidence. No timeout needed here?

> +}
> +
> +static irqreturn_t sh_msiof_spi_irq(int irq, void *data)
> +{
> + struct sh_msiof_spi_priv *p = data;
> +
> + /* just disable the interrupt and wake up */
> + sh_msiof_write(p, IER, 0);
> +
> + complete(&p->done);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static struct {
> + unsigned short div;
> + unsigned short scr;
> +} sh_msiof_spi_clk_table[] = {
> + { 1, 0x0007 },
> + { 2, 0x0000 },
> + { 4, 0x0001 },
> + { 8, 0x0002 },
> + { 16, 0x0003 },
> + { 32, 0x0004 },
> + { 64, 0x1f00 },
> + { 128, 0x1f01 },
> + { 256, 0x1f02 },
> + { 512, 0x1f03 },
> + { 1024, 0x1f04 },
> +};

Could be const (to save some .data) btu I think the compiler does that
itself nowadays.

> +static void sh_msiof_spi_set_clk_regs(struct sh_msiof_spi_priv *p,
> + unsigned long parent_rate,
> + unsigned long spi_hz)
> +{
> + unsigned long div = 1024;
> + int k;
> +
> + if (!spi_hz || !parent_rate)
> + WARN_ON(1);
> + else
> + div = parent_rate / spi_hz;

This could be more neatly coded as

if (!WARN_ON(!spi_hz || !parent_rate))
div = parent_rate / spi_hz;

also, if this warning ever triggers, you won't know whether it was due
to !spi_hx or to !parent_rate, which might make you sad.

Can spi_hz and parent_rate ever be zero here anyway? If not, zap it.
If so, why? Programming bug?

> + /* TODO: make more fine grained */
> +
> + for (k = 0; k < ARRAY_SIZE(sh_msiof_spi_clk_table); k++) {
> + if (sh_msiof_spi_clk_table[k].div >= div)
> + break;
> + }
> +
> + k = min_t(int, k, ARRAY_SIZE(sh_msiof_spi_clk_table) - 1);

actually it's pretty obvious from all the above that k should have been
size_t.

> + sh_msiof_write(p, TSCR, sh_msiof_spi_clk_table[k].scr);
> + sh_msiof_write(p, RSCR, sh_msiof_spi_clk_table[k].scr);
> +}
> +
> +static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,
> + int cpol, int cpha,
> + int tx_hi_z, int lsb_first)
> +{
> + unsigned long tmp;
> + int edge;
> +
> + /*
> + * CPOL CPHA TSCKIZ RSCKIZ TEDG REDG(!)
> + * 0 0 10 10 1 0
> + * 0 1 10 10 0 1
> + * 1 0 11 11 0 1
> + * 1 1 11 11 1 0
> + *
> + * (!) Note: REDG is inverted recommended data sheet setting
> + */
> +
> + sh_msiof_write(p, FCTR, 0);
> + sh_msiof_write(p, TMDR1, 0xe2000005 | (lsb_first << 24));
> + sh_msiof_write(p, RMDR1, 0x22000005 | (lsb_first << 24));
> +
> + tmp = 0xa0000000;
> + tmp |= cpol << 30; /* TSCKIZ */
> + tmp |= cpol << 28; /* RSCKIZ */
> +
> + edge = cpol ? cpha : !cpha;
> +
> + tmp |= edge << 27; /* TEDG */
> + tmp |= !edge << 26; /* REDG */

um, OK. This mixture of logical-not with bit-operations is a bit woozy
but I don't see any actual bugs there.

> + tmp |= (tx_hi_z ? 2 : 0) << 22; /* TXDIZ */
> + sh_msiof_write(p, CTR, tmp);
> +}
> +
>
> ...
>
> +static u32 sh_msiof_spi_txrx_word(struct spi_device *spi, unsigned nsecs,
> + u32 word, u8 bits)
> +{
> + BUG_ON(1); /* unused but needed by bitbang code */

BUG();

> + return 0;
> +}
> +
>
> ...
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH 4/5] lockd: Remove unused nfsd headers #includes

2009-11-25T12:09:54Z

On Tue, Nov 24, 2009 at 08:03:12PM +0200, Boaz Harrosh wrote:
>
> In what history where these ever needed? Well not
> any more.

Applied, thanks.--b.

>
> Signed-off-by: Boaz Harrosh <bharrosh@...>
> ---
> fs/lockd/svc4proc.c | 4 ----
> fs/lockd/svcproc.c | 4 ----
> 2 files changed, 0 insertions(+), 8 deletions(-)
>
> diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
> index bd173a6..a7966ee 100644
> --- a/fs/lockd/svc4proc.c
> +++ b/fs/lockd/svc4proc.c
> @@ -11,10 +11,6 @@
> #include <linux/time.h>
> #include <linux/slab.h>
> #include <linux/smp_lock.h>
> -#include <linux/in.h>
> -#include <linux/sunrpc/svc.h>
> -#include <linux/sunrpc/clnt.h>
> -#include <linux/nfsd/nfsd.h>
> #include <linux/lockd/lockd.h>
> #include <linux/lockd/share.h>
>
> diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
> index e1d28dd..56c9519 100644
> --- a/fs/lockd/svcproc.c
> +++ b/fs/lockd/svcproc.c
> @@ -11,10 +11,6 @@
> #include <linux/time.h>
> #include <linux/slab.h>
> #include <linux/smp_lock.h>
> -#include <linux/in.h>
> -#include <linux/sunrpc/svc.h>
> -#include <linux/sunrpc/clnt.h>
> -#include <linux/nfsd/nfsd.h>
> #include <linux/lockd/lockd.h>
> #include <linux/lockd/share.h>
>
> --
> 1.6.5.2
>
>

Re: Purpose of parameter in sysfs binary read

2009-11-25T12:08:07Z

> I have the display as a framebuffer device now (based on fbdefio with the
> hid device as the parent).
>
> Do I really need a separate console device or can I just use fbcon?

fbcon should do what you want.

ALan
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH][GIT PULL][v2.6.32] tracing/x86: Add check to detect GCC messing with mcount prologue

2009-11-25T12:05:33Z

On 11/24/2009 09:30 AM, Steven Rostedt wrote:
>
> For other archs, Linus showed some examples:
>
> http://lkml.org/lkml/2009/11/19/349
>

Yes; the key here is that the ABI-defined entry state is readily
mappable onto the state on entry to the __fentry__ function.

-hpa

--
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel. I don't speak on their behalf.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 9/9] pci: pciehp second try to get big range for pcie devices

2009-11-25T11:59:52Z

handle the case the slot bridge that doesn't get pre-allocated big enough res
from FW.
for example pcie devices need 256M, but the bridge only get preallocated 2M...

Signed-off-by: Yinghai Lu <yinghai@...>

---
drivers/pci/setup-bus.c | 41 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -970,13 +970,52 @@ void pci_assign_unassigned_bridge_resour
{
struct pci_bus *bus;
struct pci_bus *parent = bridge->subordinate;
+ bool second_tried = false;
+ struct resource_list head, *list, *tmp;
int retval;
+ unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
+ IORESOURCE_PREFETCH;
+
+again:
+ head.next = NULL;

pci_bus_size_bridges(parent);
pci_clear_master(bridge);
- __pci_bridge_assign_resources(bridge, NULL);
+ __pci_bridge_assign_resources(bridge, &head);
retval = pci_reenable_device(bridge);
pci_set_master(bridge);
pci_enable_bridges(parent);
+
+ /* any device complain? */
+ if (!head.next)
+ return;
+
+ if (second_tried) {
+ /* still fail, don't want to try more */
+ free_failed_list(&head);
+ return;
+ }
+
+ second_tried = true;
+ printk(KERN_DEBUG "PCI: second try to assign unassigned res\n");
+
+ /*
+ * Try to release leaf bridge's resources that doesn't fit resource of
+ * child device under that bridge
+ */
+ for (list = head.next; list;) {
+ unsigned long flags = list->res->flags;
+
+ bus = list->dev->bus;
+ if (list->dev->subordinate)
+ list->res->flags = 0;
+ pci_bus_release_unused_bridge_res(bus, flags & type_mask, 0);
+
+ tmp = list;
+ list = list->next;
+ kfree(tmp);
+ }
+
+ goto again;
}
EXPORT_SYMBOL_GPL(pci_assign_unassigned_bridge_resources);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 8/9] pci: pciehp clean flow in pciehp_configure_device

2009-11-25T11:59:48Z

move out bus_size_bridges and assign resources out of pciehp_add_bridge()
and at last do them all together one time including slot bridge, to avoid to
call assign resources several times, when there are several bridges under the
slot bridge.
use pci_assign_nassigned_bridge_resources

Signed-off-by: Yinghai Lu <yinghai@...>

---
drivers/pci/hotplug/pciehp_pci.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)

Index: linux-2.6/drivers/pci/hotplug/pciehp_pci.c
===================================================================
--- linux-2.6.orig/drivers/pci/hotplug/pciehp_pci.c
+++ linux-2.6/drivers/pci/hotplug/pciehp_pci.c
@@ -53,17 +53,15 @@ static int __ref pciehp_add_bridge(struc
busnr = pci_scan_bridge(parent, dev, busnr, pass);
if (!dev->subordinate)
return -1;
- pci_bus_size_bridges(dev->subordinate);
- pci_bus_assign_resources(parent);
- pci_enable_bridges(parent);
- pci_bus_add_devices(parent);
+
return 0;
}

int pciehp_configure_device(struct slot *p_slot)
{
struct pci_dev *dev;
- struct pci_bus *parent = p_slot->ctrl->pcie->port->subordinate;
+ struct pci_dev *bridge = p_slot->ctrl->pcie->port;
+ struct pci_bus *parent = bridge->subordinate;
int num, fn;
struct controller *ctrl = p_slot->ctrl;

@@ -96,12 +94,25 @@ int pciehp_configure_device(struct slot
(dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
pciehp_add_bridge(dev);
}
+ pci_dev_put(dev);
+ }
+
+ pci_assign_unassigned_bridge_resources(bridge);
+
+ for (fn = 0; fn < 8; fn++) {
+ dev = pci_get_slot(parent, PCI_DEVFN(0, fn));
+ if (!dev)
+ continue;
+ if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
+ pci_dev_put(dev);
+ continue;
+ }
pci_configure_slot(dev);
pci_dev_put(dev);
}

- pci_bus_assign_resources(parent);
pci_bus_add_devices(parent);
+
return 0;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 7/9] pci: introduce pci_assign_unassigned_bridge_resources

2009-11-25T11:59:43Z

for pciehp to use it later

pci_setup_bridge() will not check enabled for the slot bridge, otherwise
update res is not updated to bridge BAR. that is bridge is enabled already for
port service.

Signed-off-by: Yinghai Lu <yinghai@...>

---
drivers/pci/setup-bus.c | 94 +++++++++++++++++++++++++++++++++++++++++++++---
include/linux/pci.h | 1
2 files changed, 91 insertions(+), 4 deletions(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -68,6 +68,51 @@ static void free_failed_list(struct reso
head->next = NULL;
}

+static void pdev_assign_resources_sorted(struct pci_dev *dev,
+ struct resource_list *fail_head)
+{
+ struct resource *res;
+ struct resource_list head, *list, *tmp;
+ int idx;
+ u16 class = dev->class >> 8;
+
+ head.next = NULL;
+
+ /* Don't touch classless devices or host bridges or ioapics. */
+ if (class == PCI_CLASS_NOT_DEFINED || class == PCI_CLASS_BRIDGE_HOST)
+ return;
+
+ /* Don't touch ioapic devices already enabled by firmware */
+ if (class == PCI_CLASS_SYSTEM_PIC) {
+ u16 command;
+ pci_read_config_word(dev, PCI_COMMAND, &command);
+ if (command & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY))
+ return;
+ }
+
+ pdev_sort_resources(dev, &head);
+
+ for (list = head.next; list;) {
+ res = list->res;
+ idx = res - &list->dev->resource[0];
+ if (pci_assign_resource(list->dev, idx)) {
+ if (fail_head && !pci_is_root_bus(list->dev->bus)) {
+ /*
+ * device need to keep flags and size
+ * for second try
+ */
+ add_to_failed_list(fail_head, list->dev, res);
+ } else {
+ res->start = 0;
+ res->end = 0;
+ res->flags = 0;
+ }
+ }
+ tmp = list;
+ list = list->next;
+ kfree(tmp);
+ }
+}
static void pbus_assign_resources_sorted(const struct pci_bus *bus,
struct resource_list *fail_head)
{
@@ -281,9 +326,6 @@ static void __pci_setup_bridge(struct pc
{
struct pci_dev *bridge = bus->self;

- if (pci_is_enabled(bridge))
- return;
-
dev_info(&bridge->dev, "PCI bridge to [bus %02x-%02x]\n",
bus->secondary, bus->subordinate);

@@ -646,7 +688,8 @@ static void __ref __pci_bus_assign_resou

switch (dev->class >> 8) {
case PCI_CLASS_BRIDGE_PCI:
- pci_setup_bridge(b);
+ if (!pci_is_enabled(dev))
+ pci_setup_bridge(b);
break;

case PCI_CLASS_BRIDGE_CARDBUS:
@@ -667,6 +710,34 @@ void __ref pci_bus_assign_resources(cons
}
EXPORT_SYMBOL(pci_bus_assign_resources);

+static void __ref __pci_bridge_assign_resources(const struct pci_dev *bridge,
+ struct resource_list *fail_head)
+{
+ struct pci_bus *b;
+
+ pdev_assign_resources_sorted((struct pci_dev *)bridge, fail_head);
+
+ b = bridge->subordinate;
+ if (!b)
+ return;
+
+ __pci_bus_assign_resources(b, fail_head);
+
+ switch (bridge->class >> 8) {
+ case PCI_CLASS_BRIDGE_PCI:
+ pci_setup_bridge(b);
+ break;
+
+ case PCI_CLASS_BRIDGE_CARDBUS:
+ pci_setup_cardbus(b);
+ break;
+
+ default:
+ dev_info(&bridge->dev, "not setting up bridge for bus "
+ "%04x:%02x\n", pci_domain_nr(b), b->number);
+ break;
+ }
+}
static void release_children_resource(struct resource *r)
{
struct resource *p;
@@ -894,3 +965,18 @@ enable_and_dump:
pci_bus_dump_resources(bus);
}
}
+
+void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
+{
+ struct pci_bus *bus;
+ struct pci_bus *parent = bridge->subordinate;
+ int retval;
+
+ pci_bus_size_bridges(parent);
+ pci_clear_master(bridge);
+ __pci_bridge_assign_resources(bridge, NULL);
+ retval = pci_reenable_device(bridge);
+ pci_set_master(bridge);
+ pci_enable_bridges(parent);
+}
+EXPORT_SYMBOL_GPL(pci_assign_unassigned_bridge_resources);
Index: linux-2.6/include/linux/pci.h
===================================================================
--- linux-2.6.orig/include/linux/pci.h
+++ linux-2.6/include/linux/pci.h
@@ -768,6 +768,7 @@ void pci_bus_assign_resources(const stru
void pci_bus_size_bridges(struct pci_bus *bus);
int pci_claim_resource(struct pci_dev *, int);
void pci_assign_unassigned_resources(void);
+void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge);
void pdev_enable_device(struct pci_dev *);
void pdev_sort_resources(struct pci_dev *, struct resource_list *);
int pci_enable_resources(struct pci_dev *, int mask);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 6/9] pci: don't shrink bridge resources

2009-11-25T11:59:39Z

when we are clearing leaf bridge resource and try to get big one, we could shrink the bridge if
there is no resource under it.

let check with old resource size and make sure we are trying to get big one.

Signed-off-by: Yinghai Lu <yinghai@...>

---
drivers/pci/setup-bus.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -390,7 +390,7 @@ static void pbus_size_io(struct pci_bus
{
struct pci_dev *dev;
struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO);
- unsigned long size = 0, size1 = 0;
+ unsigned long size = 0, size1 = 0, old_size;

if (!b_res)
return;
@@ -415,17 +415,18 @@ static void pbus_size_io(struct pci_bus
}
if (size < min_size)
size = min_size;
+ old_size = resource_size(b_res);
+ if (old_size == 1)
+ old_size = 0;
/* To be fixed in 2.5: we should have sort of HAVE_ISA
flag in the struct pci_bus. */
#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
size = (size & 0xff) + ((size & ~0xffUL) << 2);
#endif
size = ALIGN(size + size1, 4096);
+ if (size < old_size)
+ size = old_size;
if (!size) {
- if (b_res->start || b_res->end)
- dev_info(&bus->self->dev, "disabling bridge window "
- "%pR to [bus %02x-%02x] (unused)\n", b_res,
- bus->secondary, bus->subordinate);
b_res->flags = 0;
return;
}
@@ -441,7 +442,7 @@ static int pbus_size_mem(struct pci_bus
unsigned long type, resource_size_t min_size)
{
struct pci_dev *dev;
- resource_size_t min_align, align, size;
+ resource_size_t min_align, align, size, old_size;
resource_size_t aligns[12]; /* Alignments from 1Mb to 2Gb */
int order, max_order;
struct resource *b_res = find_free_bus_resource(bus, type);
@@ -491,6 +492,11 @@ static int pbus_size_mem(struct pci_bus
}
if (size < min_size)
size = min_size;
+ old_size = resource_size(b_res);
+ if (old_size == 1)
+ old_size = 0;
+ if (size < old_size)
+ size = old_size;

align = 0;
min_align = 0;
@@ -507,10 +513,6 @@ static int pbus_size_mem(struct pci_bus
}
size = ALIGN(size, min_align);
if (!size) {
- if (b_res->start || b_res->end)
- dev_info(&bus->self->dev, "disabling bridge window "
- "%pR to [bus %02x-%02x] (unused)\n", b_res,
- bus->secondary, bus->subordinate);
b_res->flags = 0;
return 1;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 5/9] pci: update leaf bridge res to get more big range in pci assign unssign

2009-11-25T11:59:34Z

BIOS separate IO range between several IOHs, and on some slots, BIOS assign the resource to the bridge, but stop
assigning resource to the device under that bridge, because the device need big resource.

1. pci assign unassign and record the failed device resource.
2. clear the BIOS assigned resource of the parent bridge of fail device
3. go back and call pci assign unsigned
4. if it still fail, will go up more bridges. and clear and try again.

use pci_try_num to control back track bridge levels.

Signed-off-by: Yinghai Lu <yinghai@...>

---
drivers/pci/pci.c | 5 +++
drivers/pci/pci.h | 2 +
drivers/pci/setup-bus.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 74 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -805,10 +805,25 @@ static void pci_bus_dump_resources(struc
}
}

+/*
+ * first try will not touch pci bridge res
+ * second try will clear small leaf bridge res
+ * third try will clear related bridge: some aggressive
+ */
+/* assume we only have 4 level bridges, so only try 5 times */
+int pci_try_num = 5;
void __init
pci_assign_unassigned_resources(void)
{
struct pci_bus *bus;
+ int tried_times = 0;
+ int check_leaf = 1;
+ struct resource_list head, *list, *tmp;
+ unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
+ IORESOURCE_PREFETCH;
+ unsigned long failed_type;
+again:
+ head.next = NULL;

/* Depth first, calculate sizes and alignments of all
subordinate buses. */
@@ -817,7 +832,58 @@ pci_assign_unassigned_resources(void)
}
/* Depth last, allocate resources and update the hardware. */
list_for_each_entry(bus, &pci_root_buses, node) {
- pci_bus_assign_resources(bus);
+ __pci_bus_assign_resources(bus, &head);
+ }
+ tried_times++;
+
+ /* any device complain? */
+ if (!head.next)
+ goto enable_and_dump;
+ failed_type = 0;
+ for (list = head.next; list;) {
+ unsigned long flags = list->res->flags;
+
+ failed_type |= flags;
+ list = list->next;
+ }
+ /*
+ * io port are tight, don't try extra
+ * or if reach the limit, don't want to try more
+ */
+ failed_type &= type_mask;
+ if ((failed_type == IORESOURCE_IO) || (tried_times >= pci_try_num)) {
+ free_failed_list(&head);
+ goto enable_and_dump;
+ }
+
+ printk(KERN_DEBUG "PCI: No. %d try to assign unassigned res\n",
+ tried_times + 1);
+
+ /*
+ * Try to release leaf bridge's resources that doesn't fit resource of
+ * child device under that bridge
+ */
+ /* third times and later will not check if it is leaf */
+ if ((tried_times + 1) > 2)
+ check_leaf = 0;
+ for (list = head.next; list;) {
+ unsigned long flags = list->res->flags;
+
+ bus = list->dev->bus;
+ if (list->dev->subordinate)
+ list->res->flags = 0;
+ pci_bus_release_unused_bridge_res(bus, flags & type_mask,
+ check_leaf);
+ tmp = list;
+ list = list->next;
+ kfree(tmp);
+ }
+
+ goto again;
+
+enable_and_dump:
+ /* Depth last, update the hardware. */
+ list_for_each_entry(bus, &pci_root_buses, node) {
pci_enable_bridges(bus);
}

Index: linux-2.6/drivers/pci/pci.c
===================================================================
--- linux-2.6.orig/drivers/pci/pci.c
+++ linux-2.6/drivers/pci/pci.c
@@ -2779,6 +2779,11 @@ static int __init pci_setup(char *str)
pci_no_aer();
} else if (!strcmp(str, "nodomains")) {
pci_no_domains();
+ } else if (!strncmp(str, "try=", 4)) {
+ int try_num = memparse(str + 4, &str);
+
+ if (try_num > 0 && try_num < 10)
+ pci_try_num = try_num;
} else if (!strncmp(str, "cbiosize=", 9)) {
pci_cardbus_io_size = memparse(str + 9, &str);
} else if (!strncmp(str, "cbmemsize=", 10)) {
Index: linux-2.6/drivers/pci/pci.h
===================================================================
--- linux-2.6.orig/drivers/pci/pci.h
+++ linux-2.6/drivers/pci/pci.h
@@ -203,6 +203,8 @@ static inline int pci_ari_enabled(struct
return bus->self && bus->self->ari_enabled;
}

+extern int pci_try_num;
+
#ifdef CONFIG_PCI_QUIRKS
extern int pci_is_reassigndev(struct pci_dev *dev);
resource_size_t pci_specified_resource_alignment(struct pci_dev *dev);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 4/9] pci: add failed_list to record failed one for pci_bus_assign_resources

2009-11-25T11:59:30Z

so later we can do sth with those failed one

Signed-off-by: Yinghai Lu <yinghai@...>

---
drivers/pci/setup-bus.c | 70 +++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 63 insertions(+), 7 deletions(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -27,7 +27,49 @@
#include <linux/slab.h>
#include "pci.h"

-static void pbus_assign_resources_sorted(const struct pci_bus *bus)
+
+static void add_to_failed_list(struct resource_list *head, struct pci_dev *dev,
+ struct resource *res)
+{
+ struct resource_list *list = head;
+ struct resource_list *ln = list->next;
+ struct resource_list *tmp;
+
+ tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
+ if (!tmp) {
+ pr_warning("add_to_failed_list: kmalloc() failed!\n");
+ return;
+ }
+
+ tmp->next = ln;
+ tmp->res = res;
+ tmp->dev = dev;
+ list->next = tmp;
+}
+
+static void free_failed_list(struct resource_list *head)
+{
+ struct resource_list *list, *tmp;
+ struct resource *res;
+ /*
+ * Try to release leaf bridge's resources that there is no child
+ * under it
+ */
+ for (list = head->next; list;) {
+ res = list->res;
+ res->start = 0;
+ res->end = 0;
+ res->flags = 0;
+ tmp = list;
+ list = list->next;
+ kfree(tmp);
+ }
+
+ head->next = NULL;
+}
+
+static void pbus_assign_resources_sorted(const struct pci_bus *bus,
+ struct resource_list *fail_head)
{
struct pci_dev *dev;
struct resource *res;
@@ -58,9 +100,17 @@ static void pbus_assign_resources_sorted
res = list->res;
idx = res - &list->dev->resource[0];
if (pci_assign_resource(list->dev, idx)) {
- res->start = 0;
- res->end = 0;
- res->flags = 0;
+ if (fail_head && !pci_is_root_bus(list->dev->bus)) {
+ /*
+ * device need to keep flags and size
+ * for next try
+ */
+ add_to_failed_list(fail_head, list->dev, res);
+ } else {
+ res->start = 0;
+ res->end = 0;
+ res->flags = 0;
+ }
}
tmp = list;
list = list->next;
@@ -577,19 +627,20 @@ void __ref pci_bus_size_bridges(struct p
}
EXPORT_SYMBOL(pci_bus_size_bridges);

-void __ref pci_bus_assign_resources(const struct pci_bus *bus)
+static void __ref __pci_bus_assign_resources(const struct pci_bus *bus,
+ struct resource_list *fail_head)
{
struct pci_bus *b;
struct pci_dev *dev;

- pbus_assign_resources_sorted(bus);
+ pbus_assign_resources_sorted(bus, fail_head);

list_for_each_entry(dev, &bus->devices, bus_list) {
b = dev->subordinate;
if (!b)
continue;

- pci_bus_assign_resources(b);
+ __pci_bus_assign_resources(b, fail_head);

switch (dev->class >> 8) {
case PCI_CLASS_BRIDGE_PCI:
@@ -607,6 +658,11 @@ void __ref pci_bus_assign_resources(cons
}
}
}
+
+void __ref pci_bus_assign_resources(const struct pci_bus *bus)
+{
+ __pci_bus_assign_resources(bus, NULL);
+}
EXPORT_SYMBOL(pci_bus_assign_resources);

static void release_children_resource(struct resource *r)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 3/9] pci: don't dump it when bus resource flags is not set

2009-11-25T11:59:24Z

mean it is not used, so skip it.

Signed-off-by: Yinghai Lu <yinghai@...>
---
drivers/pci/setup-bus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -725,7 +725,7 @@ static void pci_bus_dump_res(struct pci_
for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
struct resource *res = bus->resource[i];

- if (!res || !res->end)
+ if (!res || !res->end || !res->flags)
continue;

dev_printk(KERN_DEBUG, &bus->dev, "resource %d %pR\n", i, res);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 2/9] pci: add pci_bridge_release_unused_res and pci_bus_release_unused_bridge_res

2009-11-25T11:59:16Z

so later we could use it to release small resource before pci assign unassign res

Signed-off-by: Yinghai Lu <yinghai@...>

---
drivers/pci/setup-bus.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 111 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -609,13 +609,123 @@ void __ref pci_bus_assign_resources(cons
}
EXPORT_SYMBOL(pci_bus_assign_resources);

+static void release_children_resource(struct resource *r)
+{
+ struct resource *p;
+ resource_size_t size;
+
+ p = r->child;
+ while (p) {
+ release_children_resource(p);
+ release_resource(p);
+ printk(KERN_DEBUG "PCI: release child resource %pRt\n", p);
+ /* need to restore size, and keep flags */
+ size = resource_size(p);
+ p->start = 0;
+ p->end = size - 1;
+ p = r->child;
+ }
+}
+
+static void pci_bridge_release_unused_res(struct pci_bus *bus,
+ unsigned long type)
+{
+ int idx;
+ bool changed = false;
+ struct pci_dev *dev;
+ struct resource *r;
+ unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
+ IORESOURCE_PREFETCH;
+
+ /* for pci bridges res only */
+ dev = bus->self;
+ for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_BRIDGE_RESOURCES + 3;
+ idx++) {
+ r = &dev->resource[idx];
+ if ((r->flags & type_mask) != type)
+ continue;
+ if (!r->parent)
+ continue;
+ /*
+ * if there are children under that, we should release them
+ * all
+ */
+ release_children_resource(r);
+ if (!release_resource(r)) {
+ dev_printk(KERN_DEBUG, &dev->dev,
+ "resource %d %pRt released\n", idx, r);
+ r->flags = 0;
+ changed = true;
+ }
+ }
+
+ if (changed) {
+ if (type & IORESOURCE_PREFETCH) {
+ /* avoiding touch the one without PREF */
+ type = IORESOURCE_PREFETCH;
+ }
+ __pci_setup_bridge(bus, type);
+ }
+}
+
+/*
+ * try to release pci bridge resources that is from leaf bridge,
+ * so we can allocate big new one later
+ * check:
+ * 0: only release the bridge and only the bridge is leaf
+ * 1: release all down side bridge for third shoot
+ */
+static void __ref pci_bus_release_unused_bridge_res(struct pci_bus *bus,
+ unsigned long type,
+ int check_leaf)
+{
+ struct pci_dev *dev;
+ bool is_leaf_bridge = true;
+
+ list_for_each_entry(dev, &bus->devices, bus_list) {
+ struct pci_bus *b = dev->subordinate;
+ if (!b)
+ continue;
+
+ switch (dev->class >> 8) {
+ case PCI_CLASS_BRIDGE_CARDBUS:
+ is_leaf_bridge = false;
+ break;
+
+ case PCI_CLASS_BRIDGE_PCI:
+ default:
+ is_leaf_bridge = false;
+ if (!check_leaf)
+ pci_bus_release_unused_bridge_res(b, type,
+ check_leaf);
+ break;
+ }
+ }
+
+ /* The root bus? */
+ if (!bus->self)
+ return;
+
+ switch (bus->self->class >> 8) {
+ case PCI_CLASS_BRIDGE_CARDBUS:
+ break;
+
+ case PCI_CLASS_BRIDGE_PCI:
+ default:
+ if ((check_leaf && is_leaf_bridge) || !check_leaf)
+ pci_bridge_release_unused_res(bus, type);
+ break;
+ }
+}
+
static void pci_bus_dump_res(struct pci_bus *bus)
{
int i;

for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
struct resource *res = bus->resource[i];
- if (!res || !res->end)
+
+ if (!res || !res->end)
continue;

dev_printk(KERN_DEBUG, &bus->dev, "resource %d %pR\n", i, res);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 1/9] pci: separate pci_setup_bridge to small functions

2009-11-25T11:59:12Z

prepare to use those small functions according to resource type later

Signed-off-by: Yinghai Lu <yinghai@...>

---
drivers/pci/setup-bus.c | 54 +++++++++++++++++++++++++++++++++++++++---------
1 file changed, 44 insertions(+), 10 deletions(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -134,19 +134,12 @@ EXPORT_SYMBOL(pci_setup_cardbus);
config space writes, so it's quite possible that an I/O window of
the bridge will have some undesirable address (e.g. 0) after the
first write. Ditto 64-bit prefetchable MMIO. */
-static void pci_setup_bridge(struct pci_bus *bus)
+static void pci_setup_bridge_io(struct pci_bus *bus)
{
struct pci_dev *bridge = bus->self;
struct resource *res;
struct pci_bus_region region;
- u32 l, bu, lu, io_upper16;
- int pref_mem64;
-
- if (pci_is_enabled(bridge))
- return;
-
- dev_info(&bridge->dev, "PCI bridge to [bus %02x-%02x]\n",
- bus->secondary, bus->subordinate);
+ u32 l, io_upper16;

/* Set up the top and bottom of the PCI I/O segment for this bus. */
res = bus->resource[0];
@@ -172,7 +165,13 @@ static void pci_setup_bridge(struct pci_
pci_write_config_dword(bridge, PCI_IO_BASE, l);
/* Update upper 16 bits of I/O base/limit. */
pci_write_config_dword(bridge, PCI_IO_BASE_UPPER16, io_upper16);
-
+}
+static void pci_setup_bridge_mmio(struct pci_bus *bus)
+{
+ struct pci_dev *bridge = bus->self;
+ struct resource *res;
+ struct pci_bus_region region;
+ u32 l;
/* Set up the top and bottom of the PCI Memory segment
for this bus. */
res = bus->resource[1];
@@ -187,6 +186,14 @@ static void pci_setup_bridge(struct pci_
dev_info(&bridge->dev, " bridge window [mem disabled]\n");
}
pci_write_config_dword(bridge, PCI_MEMORY_BASE, l);
+}
+static void pci_setup_bridge_mmio_pref(struct pci_bus *bus)
+{
+ struct pci_dev *bridge = bus->self;
+ struct resource *res;
+ struct pci_bus_region region;
+ u32 l, bu, lu;
+ int pref_mem64;

/* Clear out the upper 32 bits of PREF limit.
If PCI_PREF_BASE_UPPER32 was non-zero, this temporarily
@@ -219,10 +226,37 @@ static void pci_setup_bridge(struct pci_
pci_write_config_dword(bridge, PCI_PREF_BASE_UPPER32, bu);
pci_write_config_dword(bridge, PCI_PREF_LIMIT_UPPER32, lu);
}
+}
+static void __pci_setup_bridge(struct pci_bus *bus, unsigned long type)
+{
+ struct pci_dev *bridge = bus->self;
+
+ if (pci_is_enabled(bridge))
+ return;
+
+ dev_info(&bridge->dev, "PCI bridge to [bus %02x-%02x]\n",
+ bus->secondary, bus->subordinate);
+
+ if (type & IORESOURCE_IO)
+ pci_setup_bridge_io(bus);
+
+ if (type & IORESOURCE_MEM)
+ pci_setup_bridge_mmio(bus);
+
+ if (type & IORESOURCE_PREFETCH)
+ pci_setup_bridge_mmio_pref(bus);

pci_write_config_word(bridge, PCI_BRIDGE_CONTROL, bus->bridge_ctl);
}

+static void pci_setup_bridge(struct pci_bus *bus)
+{
+ unsigned long type = IORESOURCE_IO | IORESOURCE_MEM |
+ IORESOURCE_PREFETCH;
+
+ __pci_setup_bridge(bus, type);
+}
+
/* Check whether the bridge supports optional I/O and
prefetchable memory ranges. If not, the respective
base/limit registers must be read-only and read as 0. */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH 0/9] pci: update pci bridge resource to get more big range for devices under it - v12

2009-11-25T11:58:59Z

split the two patches in to 9 for easy review...

please check

1. boot time:

BIOS separate IO range between several IOHs, and on some slots, BIOS assign the resource to the bridge, but stop
assigning resource to the device under that bridge, because the device need big resource.

so patches (first 6) are trying to
a. pci assign unassign and record the failed device resource.
b. clear the BIOS assigned resource of the parent bridge of fail device
c. go back and call pci assign unsigned
d. if it still fail, will go up more bridges. and clear and try again.

v2: Jesse doesn't like it is in find_free_bus_resource...
try to move out of pci_bus_size_bridges loop.
v3: add pci_setup_bridge calling after pci_bridge_release_not_used_res.
only clear release those res for x86.
v4: Bjorn want to release use dev instead of bus.
v5: Kenji pointed out it will have problem with several level bridge.
so let only handle leaf bridge.
v6: address Kenji's request (new pci_bus_release...). and change applying order
move back release to pci_assign_unassigned_resource
v7: change functions name pci_bus_release_unused_bridge_res according to Jesse
v8: address Eric's concern, only overwrite leaf bridge resource that is not big
enough need to do it in two steps, and first step recore the failed res,
and don't touch bridge res that programmed by firmware. second step will
try to release bridge resource that is too small at first.
v9: refresh to be applied after bjorn's patch, and remove trick about save
size and restore resource second try.
v11:add pci=try=5, about more try to change more bridge
v12:not shrink pci bridge resource

2. hotplug:
BIOS separate IO range between several IOHs, and on some slots, BIOS assign the resource to every bridge. (8M)
but when insert one card that big resource, the card can not get resource. because kernel will not touch the
bridge resource.

so patches (last 3) are trying to
a. assign resource to devices with that slot. and record fail devices
b. if there is some failed, will clear sepcifically io port of bridge, or mmio of bridge, or mmio pref of bridge.
c. try to assign the parent bridge of the slot.

v2: address Alex's concern about pci remove/rescan feature about
pci_setup_bridge changes.
v3: Kenji pointed out that pci_config_slot need to be called before
pci_bus_add_devices()
v4: move out pci_is_enabled checkout of pci_setup_bridge()
v5: change the applying sequence.
v6: change the functions name according to Jesse
v8: address Eric's concern, only overwrite leaf bridge resource that is not
big enough
v9: refresh to be applied after bjorn's patch, and remove trick about save
size and restore resource second try.
v10:alex found need to have export for pci_assign_unassigned_bridge_resources
v11: pass check_leaf with pci_bus_release_unused_bridge_res

Thanks

Yinghai

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH 1/2] hrtimer: correct a few numbers in comments and printk outputs

2009-11-25T11:56:01Z

On Tue, 24 Nov 2009 11:14:03 +0100
Uwe Kleine-K__nig <u.kleine-koenig@...> wrote:

> Hello Andrew,
>
> On Mon, Nov 23, 2009 at 03:25:16PM -0800, Andrew Morton wrote:
> > On Fri, 20 Nov 2009 20:23:39 +0100
> > Uwe Kleine-K__nig <u.kleine-koenig@...> wrote:
> >
> > > @@ -52,7 +52,7 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires,
> > > printk(KERN_WARNING
> > > "CE: %s increasing min_delta_ns to %lu nsec\n",
> > > dev->name ? dev->name : "?",
> > > - dev->min_delta_ns << 1);
> > > + dev->min_delta_ns);
> > >
> > > i = 0;
> > > }
> >
> > This one's already in linux-next:
> >
> > @@ -50,9 +50,9 @@ int tick_dev_program_event(struct clock_
> > dev->min_delta_ns += dev->min_delta_ns >> 1;
> >
> > printk(KERN_WARNING
> > - "CE: %s increasing min_delta_ns to %lu nsec\n",
> > + "CE: %s increasing min_delta_ns to %llu nsec\n",
> > dev->name ? dev->name : "?",
> > - dev->min_delta_ns << 1);
> > + (unsigned long long) dev->min_delta_ns << 1);
> '<< 1' is wrong here, too.
>

What's wrong with it? That leftshift appears to be to compensate for
the rightshift a few lines above.

That change was unobvious and unchangelogged, so here we are again.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH 82/86] pata_via: clear UDMA transfer mode bit for PIO and MWDMA

2009-11-25T11:53:09Z

On Wednesday 25 November 2009 08:34:19 pm Alan Cox wrote:

> On Wed, 25 Nov 2009 19:10:06 +0100
> Bartlomiej Zolnierkiewicz <bzolnier@...> wrote:
>
> > On Wednesday 25 November 2009 07:06:48 pm Alan Cox wrote:
> > > > Do you really find such tidy patch hard to review?
> > >
> > > When doing it at speed - yes.
> >
> > Do you review everybody else patches 'at speed' or only mine?
>
> All of them when I've got a lot of stuff to do. Owing to a lack of time
> machine and 500 hour days it's neccessary.
>
> Also btw take it is a compliment - there are some people's patches I
> always review in detail and it isn't the patches you expect to be *right*
> that you spend the time on...

Well, you don't really have to review every single patch touching areas
that you're just interested in (and if you're maintaining those drivers
please document it in MAINTAINERS file, thanks).

The problem is that in case you're not entirely correct, which is much
more likely when doing things 'at speed', you're will be wasting time
for everybody (not that I really care that much about others' time but
I do care about mine).

--
Bartlomiej Zolnierkiewicz
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH 1/3]fs/inode: iunique() Optimize Performance

2009-11-25T11:52:57Z

On Wed, Nov 25, 2009 at 08:20:02PM +0100, J?r?my Cochoy wrote:
> Hello,
>
> There is something strange in iunique : what will happend if all inode
> between max_reserved+1 and (unsinged in)(0-1) ? Will it make an
> infinite loop or an interruption can happen and make an inode become
> free?

Another process can free an inode while this loop is executing.

> In that case, it will be better to stop search when counter overflow, no?

If you have all four billion inodes allocated, you have significantly
bigger problems than this loop. For a start, at 600 bytes per inode,
I'd like to see your machine with 2.4TB of memory. Then there's the
size of your inode hash, and the depth of the chains within it.

> Will it not be better to use a field max_ino_used (in superblock, for
> exemple) where we store the last inode allocated with iunique and make
> a search only if max_ino_used become to (unsigned)(-1) ?
>
> But, if iunique is here to provide a solution in order to generate
> unused inode in filesystem which have various inode number, it's
> better to use a list of used ino, in a short hash table which use the
> first 8 bits of the inode, always use the same function to create a
> new inode and look at the head if we can add a new inode with bigger
> ino and still in the range. (But i think filesystems developper prefer
> to write ther own functions in order to do that, no?)
>
> Well, if we want to stop in case of full inode filesystem, we can put
> the first condition in the head and add change return as :
> return inode->i_ino > max_reserved ? res : 0; // 0 might "i can't find
> an inode after max_reserved"

Gloves.

http://thedailywtf.com/Articles/The_Complicator_0x27_s_Gloves.aspx

--
Matthew Wilcox Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours. We can't possibly take such
a retrograde step."
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH] kbuild: Steppeing down as Maintainer

2009-11-25T11:50:42Z

On Tue, 24 Nov 2009 10:15:47 +0100
maximilian attems <max@...> wrote:

> On Mon, Nov 23, 2009 at 03:05:24PM -0800, Andrew Morton wrote:
> >
> > The current queue is:
> >
> > kbuild-generate-modulesbuiltin.patch
> > kbuild-rebuild-fix-for-makefilemodbuiltin.patch
> > kbuild-generate-modulesbuiltin-fix-2.patch
> > kbuild-generate-modulesbuiltin-fix-2-checkpatch-fixes.patch
> > kconfig-cross_compile-option.patch
> > kbuild-clean-up-marker.patch
> > kbuild-clear-marker-out-of-modpost.patch
> > kbuild-genksyms-properly-consider-export_unused_symbol_gpl.patch
> >
> >
>
> please add the following fakeroot usage to -next for 2.6.33 as
> package target enhancement:
> http://marc.info/?l=linux-kbuild&m=125561337922614&w=2
> http://marc.info/?l=linux-kbuild&m=125561358622933&w=2

I don't have a copy.

> patch got tested inbetween and with both acks:
> Acked-by: Frans Pop <elendil@...>
> Acked-by: maximilian attems <max@...>
> see http://marc.info/?l=linux-kbuild&m=125551864712151&w=2

Please refresh, retest and resend. Update the acks in the changelog, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH v4] k10temp: temperature sensor for AMD Family 10h/11h CPUs

2009-11-25T11:45:44Z

On Tue, 24 Nov 2009 09:43:39 +0100
Clemens Ladisch <clemens@...> wrote:

> This adds a driver for the internal temperature sensor of AMD Family 10h
> and 11h CPUs.
>
> Signed-off-by: Clemens Ladisch <clemens@...>
> ---
> v3: added 'force' parameter for CPUs with buggy sensor; more documentation
> v4: added max/crit values, other changes suggested by Jean Delvare

Pierre's happy now?

>
> ...
>
> +#define REG_HARDWARE_THERMAL_CONTROL 0x64
> +#define HTC_ENABLE 0x00000001
> +
> +#define REG_REPORTED_TEMPERATURE 0xa4
> +
> +#define REG_NORTHBRIDGE_CAPABILITIES 0xe8
> +#define NB_CAP_HTC 0x00000400

These definitions relate to register addresses within the AMD CPUs,
yes? I wonder if these should be placed in some header file in
arch/x86/include/asm/ where other such things are described.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH] Port ricoh_mmc from driver to pci quirk.

2009-11-25T11:35:01Z

On Wed, 25 Nov 2009 08:53:24 -0800
Philip Langdale <philipl@...> wrote:

> On Wed, 25 Nov 2009 16:58:41 +0200
> Maxim Levitsky <maximlevitsky@...> wrote:
>
> > >From 5c5e6f5ab1a5a09a430f410cab4b160a5e65501c Mon Sep 17 00:00:00
> > >2001
> > From: Maxim Levitsky <maximlevitsky@...>
> > Date: Wed, 25 Nov 2009 16:37:46 +0200
> > Subject: [PATCH] Port ricoh_mmc from driver to pci quirk.
> > This is much cleaner and correct solution

This patch actually fixes a bug but the changelog forgot to tell us
this important fact.

> I'm fine with the concept, but when I originally started work on
> Ricoh support, Pierre specifically didn't want a pci quirk.
>
> Pierre wrote:
> > I'd rather we didn't. The current style of quirks are bad enough,
> > making them even more vendor or device specific is a bit more than I'm
> > willing to accept right now (seriously, how hard can it be to follow
> > the damn spec?).

Can the bug be fixed by other means, within ricoh_mmc.c?

It's a bit sad to add a lump of code to everyone's kernel like this -
what percentage of those machines actually have a ricoh mmc controller?

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [PATCH 82/86] pata_via: clear UDMA transfer mode bit for PIO and MWDMA

2009-11-25T11:33:29Z

On Wed, 25 Nov 2009 19:10:06 +0100
Bartlomiej Zolnierkiewicz <bzolnier@...> wrote:

> On Wednesday 25 November 2009 07:06:48 pm Alan Cox wrote:
> > > Do you really find such tidy patch hard to review?
> >
> > When doing it at speed - yes.
>
> Do you review everybody else patches 'at speed' or only mine?

All of them when I've got a lot of stuff to do. Owing to a lack of time
machine and 500 hour days it's neccessary.

Also btw take it is a compliment - there are some people's patches I
always review in detail and it isn't the patches you expect to be *right*
that you spend the time on...

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Re: [RFC] Should we create a raw input interface for IR's ? - Was: Re: [PATCH 1/3 v2] lirc core device driver infrastructure

2009-11-25T11:27:52Z

Jarod Wilson <jarod@...> writes:

> Ah, but the approach I'd take to converting to in-kernel decoding[*]
> would be this:
>
> 1) bring drivers in in their current state
> - users keep using lirc as they always have
>
> 2) add in-kernel decoding infra that feeds input layer

Well. I think the above is fine enough.

> 3) add option to use in-kernel decoding to existing lirc drivers
> - users can keep using lirc as they always have
> - users can optionally try out in-kernel decoding via a modparam
>
> 4) switch the default mode from lirc decode to kernel decode for each lirc driver
> - modparam can be used to continue using lirc interface instead
>
> 5) assuming users aren't coming at us with pitchforks, because things don't actually work reliably with in-kernel decoding, deprecate the lirc interface in driver
>
> 6) remove lirc interface from driver, its now a pure input device

But 3-6 are IMHO not useful. We don't need lirc _or_ input. We need
both at the same time: input for the general, simple case and for
consistency with receivers decoding in firmware/hardware; input for
special cases such as mapping the keys, protocols not supported by the
kernel and so on (also for in-tree media drivers where applicable).

> [*] assuming, of course, that it was actually agreed upon that
> in-kernel decoding was the right way, the only way, all others will be
> shot on sight. ;)

I think: in-kernel decoding only as the general, primary means. Not the
only one.
--
Krzysztof Halasa
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/