* Re: 2.6.33-rc0 regression: 256MB CF card no longer recognized in PCMCIA slot
2009-12-19 22:34 ` Jeff Garzik
@ 2009-12-20 9:52 ` Dominik Brodowski
2009-12-27 11:10 ` Pavel Machek
2010-01-07 21:49 ` Pavel Machek
1 sibling, 1 reply; 5+ messages in thread
From: Dominik Brodowski @ 2009-12-20 9:52 UTC (permalink / raw)
To: Jeff Garzik, Pavel Machek; +Cc: kernel list, Rafael J. Wysocki
Hey,
On Sat, Dec 19, 2009 at 05:34:15PM -0500, Jeff Garzik wrote:
> On 12/19/2009 04:55 PM, Pavel Machek wrote:
> >Hi!
> >
> >Subject pretty much says it all... I do get some messages on the
> >console, I'll try to gather them.
>
> Which driver(s) no longer see it? Do you think it's the PCMCIA
> subsystem, IDE, libata or other?
My suspicion is that it might be kernel/resource.c -- Pavel, does this patch
fix the issue you're seeing?
Best,
Dominik
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sun, 20 Dec 2009 10:04:56 +0100
Subject: [PATCH] resources: fix call to alignf() in allocate_resource()
The second parameter to alignf() in allocate_resource() must
reflect what new resource is attempted to be allocated, else
functions like pcibios_align_resource() (at least on x86) or
pcmcia_align() can't work correctly.
Commit 1e5ad9679016275d422e36b12a98b0927d76f556 broke this by
setting the "new" resource until we're about to return success.
To keep the resource untouched when allocate_resource() fails,
a "tmp" resource is introduced.
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Yinghai Lu <yhlu.kernel@gmail.com>
CC: Bjorn Helgaas <bjorn.helgaas@hp.com>
CC: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
diff --git a/kernel/resource.c b/kernel/resource.c
index dc15686..af96c1e 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -308,37 +308,37 @@ static int find_resource(struct resource *root, struct resource *new,
void *alignf_data)
{
struct resource *this = root->child;
- resource_size_t start, end;
+ struct resource tmp = *new;
- start = root->start;
+ tmp.start = root->start;
/*
* Skip past an allocated resource that starts at 0, since the assignment
- * of this->start - 1 to new->end below would cause an underflow.
+ * of this->start - 1 to tmp->end below would cause an underflow.
*/
if (this && this->start == 0) {
- start = this->end + 1;
+ tmp.start = this->end + 1;
this = this->sibling;
}
for(;;) {
if (this)
- end = this->start - 1;
+ tmp.end = this->start - 1;
else
- end = root->end;
- if (start < min)
- start = min;
- if (end > max)
- end = max;
- start = ALIGN(start, align);
+ tmp.end = root->end;
+ if (tmp.start < min)
+ tmp.start = min;
+ if (tmp.end > max)
+ tmp.end = max;
+ tmp.start = ALIGN(tmp.start, align);
if (alignf)
- alignf(alignf_data, new, size, align);
- if (start < end && end - start >= size - 1) {
- new->start = start;
- new->end = start + size - 1;
+ alignf(alignf_data, &tmp, size, align);
+ if (tmp.start < tmp.end && tmp.end - tmp.start >= size - 1) {
+ new->start = tmp.start;
+ new->end = tmp.start + size - 1;
return 0;
}
if (!this)
break;
- start = this->end + 1;
+ tmp.start = this->end + 1;
this = this->sibling;
}
return -EBUSY;
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: 2.6.33-rc0 regression: 256MB CF card no longer recognized in PCMCIA slot
2009-12-19 22:34 ` Jeff Garzik
2009-12-20 9:52 ` Dominik Brodowski
@ 2010-01-07 21:49 ` Pavel Machek
1 sibling, 0 replies; 5+ messages in thread
From: Pavel Machek @ 2010-01-07 21:49 UTC (permalink / raw)
To: Jeff Garzik; +Cc: kernel list, Rafael J. Wysocki
On Sat 2009-12-19 17:34:15, Jeff Garzik wrote:
> On 12/19/2009 04:55 PM, Pavel Machek wrote:
> >Hi!
> >
> >Subject pretty much says it all... I do get some messages on the
> >console, I'll try to gather them.
>
> Which driver(s) no longer see it? Do you think it's the PCMCIA
> subsystem, IDE, libata or other?
Not sure. The messages I get with -rc1 are:
Dec 26 10:51:43 amd log1n[1798]: ROOT LOGIN on `tty8'
Dec 26 10:51:59 amd kernel: pcmcia_socket pcmcia_socket0: pccard:
PCMCIA card inserted into slot 0
Dec 26 10:51:59 amd kernel: pcmcia_socket pcmcia_socket0: cs: memory
probe 0xe0000000-0xe3ffffff: excluding 0xe0000000-0xe3ffffff
Dec 26 10:51:59 amd kernel: pcmcia_socket pcmcia_socket0: cs: memory
probe 0xe4300000-0xe7ffffff: excluding 0xe4300000-0xe46cffff
0xe4e70000-0xe523ffff 0xe5db0000-0xe617ffff 0xe6cf0000-0xe70bffff
2.6.33-rc2 says:
Dec 26 10:54:38 amd kernel: pcmcia_socket pcmcia_socket0: pccard:
PCMCIA card inserted into slot 0
Dec 26 10:54:38 amd kernel: pcmcia_socket pcmcia_socket0: cs: memory
probe 0xe0000000-0xe3ffffff: excluding 0xe0000000-0xe3ffffff
Dec 26 10:54:38 amd kernel: pcmcia_socket pcmcia_socket0: cs: memory
probe 0xe4300000-0xe7ffffff: excluding 0xe4300000-0xe46cffff
0xe4e70000-0xe523ffff 0xe5db0000-0xe617ffff 0xe6cf0000-0xe70bffff
Dec 26 10:54:38 amd kernel: pcmcia 0.0: pcmcia: registering new device
pcmcia0.0
Dec 26 10:54:38 amd kernel: scsi6 : pata_pcmcia
Dec 26 10:54:38 amd kernel: ata7: PATA max PIO0 cmd 0x9100 ctl 0x910e
irq 16
Dec 26 10:54:39 amd kernel: ata7.00: CFA: Transcend, 2N3-0925, max
PIO2
Dec 26 10:54:39 amd kernel: ata7.00: 503808 sectors, multi 0: LBA
Dec 26 10:54:39 amd kernel: ata7.00: configured for PIO0
Dec 26 10:54:39 amd kernel: ata7.00: configured for PIO0
Dec 26 10:54:39 amd kernel: ata7: EH complete
Dec 26 10:54:39 amd kernel: isa bounce pool size: 16 pages
Dec 26 10:54:39 amd kernel: scsi 6:0:0:0: Direct-Access ATA
Transcend 2N3- PQ: 0 ANSI: 5
Dec 26 10:54:39 amd kernel: sd 6:0:0:0: Attached scsi generic sg1 type
0
Dec 26 10:54:39 amd kernel: sd 6:0:0:0: [sdb] 503808 512-byte logical
blocks: (257 MB/246 MiB)
Dec 26 10:54:39 amd kernel: sd 6:0:0:0: [sdb] Write Protect is off
Dec 26 10:54:39 amd kernel: sd 6:0:0:0: [sdb] Mode Sense: 00 3a 00 00
Dec 26 10:54:39 amd kernel: sd 6:0:0:0: [sdb] Write cache: disabled,
read cache: enabled, doesn't support DPO or FUA
Dec 26 10:54:39 amd kernel: sdb: sdb1
Dec 26 10:54:39 amd kernel: sd 6:0:0:0: [sdb] Attached SCSI removable
disk
Dec 26 10:54:56 amd kernel: wlan0: deauthenticated from
00:11:95:05:30:d7 (Reason: 3)
...so this can be closed as "fixed in -rc2".
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 5+ messages in thread