2002-11-03 16:33:40

by Zwane Mwaikambo

Subject: [PATCH][2.5-AC] cistpl.c pcibios_read_config_dword

Sorry untested :/

Index: linux-2.5.44-ac5/drivers/pcmcia/cistpl.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.44-ac5/drivers/pcmcia/cistpl.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cistpl.c
--- linux-2.5.44-ac5/drivers/pcmcia/cistpl.c 3 Nov 2002 07:19:08 -0000 1.1.1.1
+++ linux-2.5.44-ac5/drivers/pcmcia/cistpl.c 3 Nov 2002 16:32:36 -0000
@@ -429,7 +429,7 @@
#ifdef CONFIG_CARDBUS
if (s->state & SOCKET_CARDBUS) {
u_int ptr;
- pcibios_read_config_dword(s->cap.cb_dev->subordinate->number, 0, 0x28, &ptr);
+ pci_read_config_dword(s->cap.cb_dev, PCI_CARDBUS_CIS, &ptr);
tuple->CISOffset = ptr & ~7;
SPACE(tuple->Flags) = (ptr & 7);
} else

--
function.linuxpower.ca

2002-11-03 17:52:42

by Russell King

Subject: Re: [PATCH][2.5-AC] cistpl.c pcibios_read_config_dword

On Sun, Nov 03, 2002 at 11:43:24AM -0500, Zwane Mwaikambo wrote:
> Sorry untested :/
>
> Index: linux-2.5.44-ac5/drivers/pcmcia/cistpl.c
> ===================================================================
> RCS file: /build/cvsroot/linux-2.5.44-ac5/drivers/pcmcia/cistpl.c,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 cistpl.c
> --- linux-2.5.44-ac5/drivers/pcmcia/cistpl.c 3 Nov 2002 07:19:08 -0000 1.1.1.1
> +++ linux-2.5.44-ac5/drivers/pcmcia/cistpl.c 3 Nov 2002 16:32:36 -0000
> @@ -429,7 +429,7 @@
> #ifdef CONFIG_CARDBUS
> if (s->state & SOCKET_CARDBUS) {
> u_int ptr;
> - pcibios_read_config_dword(s->cap.cb_dev->subordinate->number, 0, 0x28, &ptr);
> + pci_read_config_dword(s->cap.cb_dev, PCI_CARDBUS_CIS, &ptr);
> tuple->CISOffset = ptr & ~7;
> SPACE(tuple->Flags) = (ptr & 7);
> } else

There is a patch that fixes this floating around. The above isn't correct,
because we don't want to read s->cap.cb_dev (which is the bridge), but we
want to read the cardbus device that was just plugged in.

--
Russell King ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html

2002-11-03 18:05:11

by Zwane Mwaikambo

Subject: Re: [PATCH][2.5-AC] cistpl.c pcibios_read_config_dword

On Sun, 3 Nov 2002, Russell King wrote:

> There is a patch that fixes this floating around. The above isn't correct,
> because we don't want to read s->cap.cb_dev (which is the bridge), but we
> want to read the cardbus device that was just plugged in.

Thanks for the correction, i'll look around for the proper fix.

Cheers,
Zwane
--
function.linuxpower.ca