[PATCH Linux-2.6.8-rc1] prism54 Refix TRDY/RETRY_TIMEOUT

[PATCH Linux-2.6.8-rc1] prism54 Refix TRDY/RETRY_TIMEOUT

[Margit Schubert-While]

[-- Attachment #1: Type: text/plain, Size: 588 bytes --]

2004-07-21 Margit Schubert-While <margitsw@t-online.de>

* Reintroduce pushing 0 into the TRDY_TIMEOUT and RETRY_TIMEOUT
  registers. Make this configurable with module parameter
  init_pcitm.

* We now have the ludicrous situation that some hardware setups
  require this (not even pushing 0xFF helps), whilst others
  don't care either way (the majority), and yet others bork
  if anything is pushed into these regs.
  If anybody can explain this (including Conexant :-) ), my ears
  are open.

Jeff, this patch together with the mgtframeptr patch from 07/15 are
pretty urgent.

Margit

[-- Attachment #2: pciretry.patch --]
[-- Type: text/x-diff, Size: 1414 bytes --]

diff -Naur linux-2.6.8-01/drivers/net/wireless/prism54/islpci_hotplug.c linux-2.6.8-04/drivers/net/wireless/prism54/islpci_hotplug.c
--- linux-2.6.8-01/drivers/net/wireless/prism54/islpci_hotplug.c	2004-07-01 07:23:52.000000000 +0200
+++ linux-2.6.8-04/drivers/net/wireless/prism54/islpci_hotplug.c	2004-07-20 19:07:30.000000000 +0200
@@ -36,6 +36,9 @@
 MODULE_DESCRIPTION("The Prism54 802.11 Wireless LAN adapter");
 MODULE_LICENSE("GPL");
 
+static int	init_pcitm = 0;
+module_param(init_pcitm, int, 0);
+
 /* In this order: vendor, device, subvendor, subdevice, class, class_mask,
  * driver_data 
  * If you have an update for this please contact prism54-devel@prism54.org 
@@ -292,14 +295,14 @@
 	 *
 	 * 	Writing zero to both these two registers will disable both timeouts and
 	 * 	*can* solve problems caused by devices that are slow to respond.
+	 *	Make this configurable - MSW
 	 */
-	/*	I am taking these out, we should not be poking around in the
-	 *	programmable timers - MSW
-	*/
-/*	Do not zero the programmable timers
-	pci_write_config_byte(pdev, 0x40, 0);
-	pci_write_config_byte(pdev, 0x41, 0);
-*/
+	if ( init_pcitm >= 0 ) {
+		pci_write_config_byte(pdev, 0x40, (u8)init_pcitm);
+		pci_write_config_byte(pdev, 0x41, (u8)init_pcitm);
+	} else {
+		printk(KERN_INFO "PCI TRDY/RETRY unchanged\n");
+	}
 
 	/* request the pci device I/O regions */
 	rvalue = pci_request_regions(pdev, DRV_NAME);

[-- Attachment #3: Type: text/plain, Size: 151 bytes --]

_______________________________________________
Prism54-devel mailing list
Prism54-devel@prism54.org
http://prism54.org/mailman/listinfo/prism54-devel

Re: [PATCH Linux-2.6.8-rc1] prism54 Refix TRDY/RETRY_TIMEOUT

[Jeff Garzik]

applied