* [PATCH 2.6] fix pci_update_resource() / IORESOURCE_UNSET on PPC
@ 2003-12-20 13:09 Harald Welte
2003-12-24 3:52 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 3+ messages in thread
From: Harald Welte @ 2003-12-20 13:09 UTC (permalink / raw)
To: prism54-devel, linuxppc-dev
Hi!
The prism54 (http://prism54.org) driver for my cardbus adapter works
with 2.4.x, but not 2.6.x on a Titanium G4 Powerbook IV.
On 2.6.x the error message was
PCI:0001:02:00.0 Resource 0 [00000000-00001fff] is unassigned
After investigating differences in the PCI code of 2.4.x and 2.6.x, i
noticed that 2.4.x/arc/ppc/kernel/pci.c:pcibios_update_resource()
contained a couple of lines that unset the IORESOURCE_UNSET bitflag.
In 2.6.x, this is handled by the generic PCI core in
drivers/pci/setup-res.c:pci_update_resource() code. However, the code
is missing the 'res->flags &= ~IORESOURCE_UNSET' part.
The below fix re-adds that section from 2.4.x.
I'm not sure wether this belongs into the arch-independent PCI api.
Anyway, on PPC it seems to be needed for certain cardbus devices.
Any comments welcome.
diff -Nru linuxppc25bh-031214-plain/drivers/pci/setup-res.c linuxppc25bh-031214-orinoco_monitor/drivers/pci/setup-res.c
--- linuxppc25bh-031214-plain/drivers/pci/setup-res.c 2003-12-05 02:37:16.000000000 +0100
+++ linuxppc25bh-031214-orinoco_monitor/drivers/pci/setup-res.c 2003-12-15 12:08:11.000000000 +0100
@@ -84,6 +84,10 @@
pci_name(dev), resno, new, check);
}
}
+ res->flags &= ~IORESOURCE_UNSET;
+ printk(KERN_INFO "PCI: moved device %s resource %d (%lx) to %x\n",
+ dev->slot_name, resno, res->flags,
+ new & ~PCI_REGION_FLAG_MASK);
}
int __init
--
- Harald Welte <laforge@gnumonks•org> http://www.gnumonks.org/
============================================================================
Programming is like sex: One mistake and you have to support it your lifetime
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2.6] fix pci_update_resource() / IORESOURCE_UNSET on PPC
2003-12-20 13:09 [PATCH 2.6] fix pci_update_resource() / IORESOURCE_UNSET on PPC Harald Welte
@ 2003-12-24 3:52 ` Benjamin Herrenschmidt
2003-12-24 11:08 ` Harald Welte
0 siblings, 1 reply; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2003-12-24 3:52 UTC (permalink / raw)
To: Harald Welte; +Cc: prism54-devel, linuxppc-dev list
On Sun, 2003-12-21 at 00:09, Harald Welte wrote:
> Hi!
>
> The prism54 (http://prism54.org) driver for my cardbus adapter works
> with 2.4.x, but not 2.6.x on a Titanium G4 Powerbook IV.
>
> On 2.6.x the error message was
> PCI:0001:02:00.0 Resource 0 [00000000-00001fff] is unassigned
>
> After investigating differences in the PCI code of 2.4.x and 2.6.x, i
> noticed that 2.4.x/arc/ppc/kernel/pci.c:pcibios_update_resource()
> contained a couple of lines that unset the IORESOURCE_UNSET bitflag.
>
> .../...
Can you submit to lkml ?
Ben.
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2.6] fix pci_update_resource() / IORESOURCE_UNSET on PPC
2003-12-24 3:52 ` Benjamin Herrenschmidt
@ 2003-12-24 11:08 ` Harald Welte
0 siblings, 0 replies; 3+ messages in thread
From: Harald Welte @ 2003-12-24 11:08 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: prism54-devel, linuxppc-dev list
On Wed, Dec 24, 2003 at 02:52:25PM +1100, Benjamin Herrenschmidt wrote:
> On Sun, 2003-12-21 at 00:09, Harald Welte wrote:
> >
> > The prism54 (http://prism54.org) driver for my cardbus adapter works
> > with 2.4.x, but not 2.6.x on a Titanium G4 Powerbook IV.
> >
> > On 2.6.x the error message was PCI:0001:02:00.0 Resource 0
> > [00000000-00001fff] is unassigned
> >
> > After investigating differences in the PCI code of 2.4.x and 2.6.x,
> > i noticed that 2.4.x/arc/ppc/kernel/pci.c:pcibios_update_resource()
> > contained a couple of lines that unset the IORESOURCE_UNSET bitflag.
> >
> > .../...
>
> Can you submit to lkml ?
Sure, I just was unsure if that would have to be discussed on the
ppc-specific list first.
I'll forward my original posting
--
- Harald Welte <laforge@gnumonks•org> http://www.gnumonks.org/
============================================================================
Programming is like sex: One mistake and you have to support it your lifetime
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-12-24 11:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-12-20 13:09 [PATCH 2.6] fix pci_update_resource() / IORESOURCE_UNSET on PPC Harald Welte
2003-12-24 3:52 ` Benjamin Herrenschmidt
2003-12-24 11:08 ` Harald Welte
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox