Major problem with PCMCIA/Yenta system
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 2 lines · Andrew Morton
Do you think your recent work on
ti12xx_hook()will help this guy?
may be. it really sounds like the exact same problem..
Quoted 2 lines
(Did a patch come out of that, btw?)
the one i sent was buggy for those reasons:
- the TI hook function override that of yenta which does the very wrong thing in a system with mixed TI/non TI bridges (which actually exists)
- it can only handle TI's with just one slot
- it fails on older TI's (125x series)
another problem is that those things can have 1001 configurations. single slot devices are not a problem but dual-slot are. with recent bridges in "normal" mode (function 0 uses INTA, function 1 uses INTB) it's also not a problem. but the modes INTRTIE and ALL_SERIAL are because disabling that will cause regressions with a working card inserted. and the older bridges habe more that one pin that can be configured as INTA / INTB. i can code it up, no problem (minus ALL_SERIAL and INTRTIE for dual-slots)
a slightly different approach is just to return IRQ_HANDLED for every interrupt durning power-on of the card. doesn't solve the interrupt storm of course...the kernel 2.4 behavior...patch attached... it compiles and boots here but is otherwise untested (i don't have a TI bridge around anymore)
rgds
-daniel
Quoted 43 lines
Begin forwarded message:
Date: Sun, 20 Mar 2005 18:53:47 -0500
From: Ron Gage <[email protected]>
To: [email protected]
Subject: Major problem with PCMCIA/Yenta systemGreetings:
I have been trying to get a recently acquired Cardbus based USB 2.0 card working under 2.6 for the past weekend. It's not going well.
Everytime I plug the card into the computer, the entire PCMCIA system just dies, taking my network connectivity with it. I have to do a power off reset to recover.
The cardbus card is based on the ALI USB chipset. This shows up as both an EHCI and an OHCI device under 2.6.11.5. My laptop, an older HP Pavilion N5150 has a UHCI based chipset:
00:00.0 Host bridge: Intel Corp. 440BX/ZX/DX - 82443BX/ZX/DX Host bridge (rev
03)
00:01.0 PCI bridge: Intel Corp. 440BX/ZX/DX - 82443BX/ZX/DX AGP bridge (rev
03)
00:04.0 CardBus bridge: Texas Instruments PCI1420
00:04.1 CardBus bridge: Texas Instruments PCI1420
00:07.0 ISA bridge: Intel Corp. 82371AB/EB/MB PIIX4 ISA (rev 02) 00:07.1 IDE interface: Intel Corp. 82371AB/EB/MB PIIX4 IDE (rev 01) 00:07.2 USB Controller: Intel Corp. 82371AB/EB/MB PIIX4 USB (rev 01) 00:07.3 Bridge: Intel Corp. 82371AB/EB/MB PIIX4 ACPI (rev 03) 00:08.0 Multimedia audio controller: ESS Technology ES1988 Allegro-1 (rev 12) 01:01.0 VGA compatible controller: S3 Inc. 86C270-294 Savage/IX-MV (rev 11) 02:00.0 Ethernet controller: Digital Equipment Corporation DECchip 21142/43 (rev 41)My ethernet card is a generic cardbus device.
When I insert the new USB 2.0 card, the kernel reports that it's killing off IRQ 11. Here is the actual dump from dmesg:
[...]
Quoted 10 lines
Again, when the USB card in inserted, the entire PCMCIA system shuts down and remains unusuable until powered off.
Kernel is stock 2.6.11.5. I also tried with 2.6.11, 2.6.10, 2.6.9 and 2.6.7 - same result. Distribution is Slackware 9.1 - gcc is 3.2.3
HELP!!!
drivers/pcmcia/yenta_socket.c +29 -0
@@ -405,6 +405,30 @@ } +static int yenta_generic_hook (struct pcmcia_socket *sock,int operation) +{ + struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket); + +switch (operation) { +case HOOK_POWER_PRE : +/* +* re-user probe_status to tell the interrupt handler to ack +* everything +*/ + socket->probe_status =0x0f0f0f0f ; +break ; + +case HOOK_POWER_POST : + socket->probe_status =0 ; +break ; + +default : +break ; + } + +return 0 ; +} +static unsigned int yenta_events (struct yenta_socket *socket) {u8 csc;
@@ -440,6 +464,10 @@pcmcia_parse_events (&socket->socket, events);return IRQ_HANDLED ; } + +if (socket->probe_status ==0x0f0f0f0f ) +return IRQ_HANDLED ; +return IRQ_NONE ; }
@@ -673,6 +701,7 @@ .set_socket = yenta_set_socket, .set_io_map = yenta_set_io_map, .set_mem_map = yenta_set_mem_map, + .generic_hook = yenta_generic_hook, };
drivers/pcmcia/cs.c +10 -1
@@ -508,6 +508,10 @@cs_err (skt,"unsupported voltage key.\n" );return CS_BAD_TYPE ; } + +if (skt->ops->generic_hook) + skt->ops->generic_hook (skt,HOOK_POWER_PRE ); + skt->socket.flags =0 ; skt->ops->set_socket (skt, &skt->socket);
@@ -522,7 +526,12 @@return CS_BAD_TYPE ; } -return socket_reset (skt); + status =socket_reset (skt); + +if (skt->ops->generic_hook) + skt->ops->generic_hook (skt,HOOK_POWER_POST ); + +return status; }/*
include/pcmcia/ss.h +6 -0
@@ -77,6 +77,11 @@/* Use this just for bridge windows */ #define MAP_IOSPACE 0x20 +/* generic hook operations */ +#define HOOK_POWER_PRE 0x01 +#define HOOK_POWER_POST 0x02 + + typedef struct pccard_io_map { u_char map; u_char flags;
@@ -113,6 +118,7 @@int (*set_socket)(struct pcmcia_socket *sock,socket_state_t *state);int (*set_io_map)(struct pcmcia_socket *sock,struct pccard_io_map *io);int (*set_mem_map)(struct pcmcia_socket *sock,struct pccard_mem_map *mem); +int (*generic_hook)(struct pcmcia_socket *sock,int operation); };struct pccard_resource_ops {
The patch in it's second revision (where the config register is NOT set to 0) appears to work. Testing further (but I can say that the PCMCIA system is not shut down right now).
Testing with a thumb drive now... More later tonight...
Quoted 184 lines · Daniel Ritz
Quoted 1 line · Andrew Morton
Do you think your recent work on
ti12xx_hook()will help this guy?may be. it really sounds like the exact same problem..
Quoted 1 line
(Did a patch come out of that, btw?)
the one i sent was buggy for those reasons:
- the TI hook function override that of yenta which does the very wrong thing in a system with mixed TI/non TI bridges (which actually exists)
- it can only handle TI's with just one slot
- it fails on older TI's (125x series)another problem is that those things can have 1001 configurations. single slot devices are not a problem but dual-slot are. with recent bridges in "normal" mode (function 0 uses INTA, function 1 uses INTB) it's also not a problem. but the modes INTRTIE and
ALL_SERIALare because disabling that will cause regressions with a working card inserted. and the older bridges habe more that one pin that can be configured as INTA / INTB. i can code it up, no problem (minusALL_SERIALand INTRTIE for dual-slots)a slightly different approach is just to return
IRQ_HANDLEDfor every interrupt durning power-on of the card. doesn't solve the interrupt storm of course...the kernel 2.4 behavior...patch attached... it compiles and boots here but is otherwise untested (i don't have a TI bridge around anymore)rgds
-danielQuoted 41 lines
Begin forwarded message:
Date: Sun, 20 Mar 2005 18:53:47 -0500
From: Ron Gage <[email protected]>
To: [email protected]
Subject: Major problem with PCMCIA/Yenta systemGreetings:
I have been trying to get a recently acquired Cardbus based USB 2.0 card working under 2.6 for the past weekend. It's not going well.
Everytime I plug the card into the computer, the entire PCMCIA system just dies, taking my network connectivity with it. I have to do a power off reset to recover.
The cardbus card is based on the ALI USB chipset. This shows up as both an EHCI and an OHCI device under 2.6.11.5. My laptop, an older HP Pavilion N5150 has a UHCI based chipset:
00:00.0 Host bridge: Intel Corp. 440BX/ZX/DX - 82443BX/ZX/DX Host bridge (rev 03)
00:01.0 PCI bridge: Intel Corp. 440BX/ZX/DX - 82443BX/ZX/DX AGP bridge (rev 03)
00:04.0 CardBus bridge: Texas Instruments PCI1420
00:04.1 CardBus bridge: Texas Instruments PCI1420
00:07.0 ISA bridge: Intel Corp. 82371AB/EB/MB PIIX4 ISA (rev 02) 00:07.1 IDE interface: Intel Corp. 82371AB/EB/MB PIIX4 IDE (rev 01) 00:07.2 USB Controller: Intel Corp. 82371AB/EB/MB PIIX4 USB (rev 01) 00:07.3 Bridge: Intel Corp. 82371AB/EB/MB PIIX4 ACPI (rev 03) 00:08.0 Multimedia audio controller: ESS Technology ES1988 Allegro-1 (rev
12) 01:01.0 VGA compatible controller: S3 Inc. 86C270-294 Savage/IX-MV (rev 11) 02:00.0 Ethernet controller: Digital Equipment Corporation DECchip 21142/43 (rev 41)My ethernet card is a generic cardbus device.
When I insert the new USB 2.0 card, the kernel reports that it's killing off IRQ 11. Here is the actual dump from dmesg:
[...]
Quoted 7 lines
Again, when the USB card in inserted, the entire PCMCIA system shuts down and remains unusuable until powered off.
Kernel is stock 2.6.11.5. I also tried with 2.6.11, 2.6.10, 2.6.9 and 2.6.7 - same result. Distribution is Slackware 9.1 - gcc is 3.2.3
HELP!!!
drivers/pcmcia/yenta_socket.c +3
-0@@ -405,6 +405,30 @@ } +static int yenta_generic_hook (struct pcmcia_socket *sock,int operation) +{ + struct yenta_socket *socket = container_of(sock, struct yenta_socket,socket); +
drivers/pcmcia/yenta_socket.c +25
-0+switch (operation) { +case HOOK_POWER_PRE : +/* +* re-user probe_status to tell the interrupt handler to ack +* everything +*/ + socket->probe_status =0x0f0f0f0f ; +break ; + +case HOOK_POWER_POST : + socket->probe_status =0 ; +break ; + +default : +break ; + } + +return 0 ; +} +static unsigned int yenta_events (struct yenta_socket *socket) {u8 csc;@@ -440,6 +464,10 @@pcmcia_parse_events (&socket->socket, events);return IRQ_HANDLED ; } + +if (socket->probe_status ==0x0f0f0f0f ) +return IRQ_HANDLED ; +return IRQ_NONE ; }@@ -673,6 +701,7 @@ .set_socket = yenta_set_socket, .set_io_map = yenta_set_io_map, .set_mem_map = yenta_set_mem_map, + .generic_hook = yenta_generic_hook, };drivers/pcmcia/cs.c +10
-1@@ -508,6 +508,10 @@cs_err (skt,"unsupported voltage key.\n" );return CS_BAD_TYPE ; } + +if (skt->ops->generic_hook) + skt->ops->generic_hook (skt,HOOK_POWER_PRE ); + skt->socket.flags =0 ; skt->ops->set_socket (skt, &skt->socket);@@ -522,7 +526,12 @@return CS_BAD_TYPE ; } -return socket_reset (skt); + status =socket_reset (skt); + +if (skt->ops->generic_hook) + skt->ops->generic_hook (skt,HOOK_POWER_POST ); + +return status; }/* include/pcmcia/ss.h +5
-0@@ -77,6 +77,11 @@/* Use this just for bridge windows */ #define MAP_IOSPACE 0x20 +/* generic hook operations */ +#define HOOK_POWER_PRE 0x01 +#define HOOK_POWER_POST 0x02 + + typedef struct pccard_io_map { u_char map; u_char flags;@@ -113,6 +118,7 @@int (*set_socket)(struct pcmcia_socket *sock,socket_state_t *state);int (*set_io_map)(struct pcmcia_socket *sock,struct pccard_io_map *io);int (*set_mem_map)(struct pcmcia_socket *sock,struct pccard_mem_map *mem); + int (*generic_hook)(struct pcmcia_socket *sock, int operation); };struct pccard_resource_ops {
Signature · 2 lines
Ron Gage - Pontiac, Michigan (MCP, LPIC1, A+, Net+)
Quoted 2 lines · Daniel Ritz
Quoted 1 line · Andrew Morton
Do you think your recent work on
ti12xx_hook()will help this guy?
Everyone:
Let there be no confusion here - Daniel came up with this patch. I am only reporting the aggregate result.
Daniel:
Here is the aggregate patch I am using that is working nicely here...
diff -ur linux-2.6.11.5/drivers/pcmcia/cs.clinux-2.6.11.5.new/drivers/pcmcia/cs.c
drivers/pcmcia/cs.c 2005-03-21 06:49:17.000000000 -0500 renamed from drivers/pcmcia/cs.c 2005-03-19 01:34:53.000000000 -0500 +10 -1
@@ -507,6 +507,10 @@ cs_err(skt, "unsupported voltage key.\n"); return CS_BAD_TYPE; } + + if (skt->ops->generic_hook) + skt->ops->generic_hook(skt,HOOK_POWER_PRE); + skt->socket.flags = 0; skt->ops->set_socket(skt, &skt->socket);
@@ -521,7 +525,12 @@ return CS_BAD_TYPE; } - return socket_reset(skt); + status = socket_reset(skt); + + if (skt->ops->generic_hook) + skt->ops->generic_hook(skt, HOOK_POWER_POST); + + return status; } /*
diff -ur linux-2.6.11.5/drivers/pcmcia/ti113x.h linux-2.6.11.5.new/drivers/pcmcia/ti113x.h
--- linux-2.6.11.5/drivers/pcmcia/ti113x.h 2005-03-19 01:34:55.000000000 -0500 +++ linux-2.6.11.5.new/drivers/pcmcia/ti113x.h 2005-03-21 06:54:40.000000000 -0500
@@ -590,6 +590,38 @@
}
}
+
+/*
+ * TI specifiy parts for generic hook. generic hook really is specifiy to the
+ * chipset so there's no point having it in yenta_socket.c (for now)
+ *
+ * some TI's with some CB's produces interrupt storm on power on. it has been
+ * seen with atheros wlan cards on TI1225 and TI1410. solution is simply to
+ * disable any CB interrupts during this time.
+ */
+static int ti12xx_hook(struct pcmcia_socket *sock, int operation) +{
+ struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket);
+ u32 tmp;
+
+ switch (operation) {
+ case HOOK_POWER_PRE:
+ tmp = config_readl(socket, TI122X_MFUNC); + socket->saved_state[0] = tmp; + config_writel(socket, TI122X_MFUNC, tmp & ~(TI122X_MFUNC0_MASK |
TI122X_MFUNC3_MASK));
+ break;
+
+ case HOOK_POWER_POST:
+ config_writel(socket, TI122X_MFUNC, socket->saved_state[0]);
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+
static int ti12xx_override(struct yenta_socket *socket) {
u32 val, val_orig;
@@ -632,6 +664,7 @@
ti12xx_irqroute_func0(socket);
else
ti12xx_irqroute_func1(socket);
+ socket->socket.ops->generic_hook = ti12xx_hook;
return ti_override(socket);
}
diff -ur linux-2.6.11.5/include/pcmcia/ss.hlinux-2.6.11.5.new/include/pcmcia/ss.h
include/pcmcia/ss.h 2005-03-21 06:51:35.000000000 -0500 renamed from include/pcmcia/ss.h 2005-03-19 01:35:03.000000000 -0500 +5 -0
@@ -77,6 +77,10 @@ /* Use this just for bridge windows */ #define MAP_IOSPACE 0x20 +/* generic hook operations */ +#define HOOK_POWER_PRE 0x01 +#define HOOK_POWER_POST 0x02 + typedef struct pccard_io_map { u_char map; u_char flags;
@@ -113,6 +117,7 @@ int (*set_socket)(struct pcmcia_socket *sock, socket_state_t *state); int (*set_io_map)(struct pcmcia_socket *sock, struct pccard_io_map *io); int (*set_mem_map)(struct pcmcia_socket *sock, struct pccard_mem_map *mem); + int (*generic_hook)(struct pcmcia_socket *sock, int operation); }; struct pccard_resource_ops {
Signature · 2 lines
Ron Gage - Pontiac, Michigan (MCP, LPIC1, A+, Net+)