pcmcia: Add disable_clkrun option
PATCH 1/1 pcmcia: Add disable_clkrun option
Hi,
I received report that transmission of Realtek 8139 doesn't work. The cause of this problem was CLKRUN protocols of laptop's TI 12xx CardBus bridge.
And I remember that this problem had happened on Thinkpad before. In the case, problem seems solved by similar workaround of sound/oss/cs46xx.c.
This patch adds "disable_clkrun" option as workaround of problem to yenta_socket.
Please apply.
---
drivers/pcmcia/ti113x.h | 11 ++++++++--- drivers/pcmcia/yenta_socket.c | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-)
drivers/pcmcia/ti113x.h renamed from drivers/pcmcia/ti113x.h~pcmcia-clkrun-disable +8 -3
@@ -592,15 +592,20 @@ out:static int ti12xx_override (struct yenta_socket *socket) { -u32 val; +u32 val, val_orig;/* make sure that memory burst is active */ - val =config_readl (socket,TI113X_SYSTEM_CONTROL ); + val_orig = val =config_readl (socket,TI113X_SYSTEM_CONTROL ); +if (disable_clkrun &&PCI_FUNC (socket->dev->devfn) ==0 ) { +printk (KERN_INFO "Yenta: Disabling CLKRUN feature\n" ); + val |=TI113X_SCR_KEEPCLK ; + }if (!(val &TI122X_SCR_MRBURSTUP )) {printk (KERN_INFO "Yenta: Enabling burst memory read transactions\n" ); val |=TI122X_SCR_MRBURSTUP ; -config_writel (socket,TI113X_SYSTEM_CONTROL , val); } +if (val_orig != val) +config_writel (socket,TI113X_SYSTEM_CONTROL , val);/* * for EnE bridges only: clear testbit TLTEnable. this makes the
drivers/pcmcia/yenta_socket.c renamed from drivers/pcmcia/yenta_socket.c~pcmcia-clkrun-disable +2 -0
@@ -28,6 +28,8 @@#include "yenta_socket.h" #include "i82365.h" +static int disable_clkrun; +module_param (disable_clkrun, bool,0444 );#if 0 #define debug(x,args...) printk(KERN_DEBUG "%s: " x, __func__ , ##args)
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
Quoted 9 lines · OGAWA Hirofumi
Hi,
I received report that transmission of Realtek 8139 doesn't work. The cause of this problem was CLKRUN protocols of laptop's TI 12xx CardBus bridge.
And I remember that this problem had happened on Thinkpad before. In the case, problem seems solved by similar workaround of
sound/oss/cs46xx.c.
What is a CLKRUN protocol and why do we need to disable it? Is it a hardware bug, or is the kernel malfunctioning in some way?
Quoted 2 lines
This patch adds "
disable_clkrun" option as workaround of problem toyenta_socket.
We should add a MODULE_PARM_DESC as well, so users have some hope of finding this option.
But what are the symptoms of the problem? How would a user know that he should try using this option?
Quoted 2 lines · Andrew Morton
What is a CLKRUN protocol and why do we need to disable it? Is it a hardware bug, or is the kernel malfunctioning in some way?
CLKRUN is used for controling the PCI clock by PCI devices (for power saving). If device has bug, probably it becomes the cause of stopping the PCI clock at an unexpected timing.
In the problem of realtek 8139 case, the TX packet which the driver set to the device was not sent out (still pending state in device).
If "disable_clkrun" is enabled, the problem of TX stopped occurring. So, I thought the cause is CLKRUN, and is hardware bug of Cardbus or realtek 8139. (8139 seems only can control by rewriting EEPROM)
And looks like also
http://support.microsoft.com/default.aspx?scid=kb;en-us;q294465
http://support.microsoft.com/default.aspx?scid=kb;en-us;182591
has the problem of CLKRUN.
By these, I thought "disable_clrun" would be useful.
Quoted 2 lines
We should add a
MODULE_PARM_DESCas well, so users have some hope of finding this option.
Indeed.
Please review the attached patch.
Quoted 2 lines
But what are the symptoms of the problem? How would a user know that he should try using this option?
Umm.. Probably the PC card stop working, or is strange behavior. Sorry, I don't know what happens actually.
Thanks.
Signature · 65 lines
OGAWA Hirofumi <[email protected]> [PATCH] pcmcia: Add disable_clkrun option I received report that transmission of Realtek 8139 doesn't work. The cause of this problem was CLKRUN protocols of laptop's TI 12xx CardBus bridge. And I remember that this problem had happened on Thinkpad before. In the case, problem seems solved by similar workaround of sound/oss/cs46xx.c. This patch adds "disable_clkrun" option as workaround of problem to yenta_socket. Please apply. Signed-off-by: OGAWA Hirofumi <[email protected]> --- drivers/pcmcia/ti113x.h | 11 ++++++++--- drivers/pcmcia/yenta_socket.c | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff -puN drivers/pcmcia/ti113x.h~pcmcia-clkrun-disable drivers/pcmcia/ti113x.h --- linux-2.6.10-rc2/drivers/pcmcia/ti113x.h~pcmcia-clkrun-disable 2004-11-23 11:06:02.000000000 +0900 +++ linux-2.6.10-rc2-hirofumi/drivers/pcmcia/ti113x.h 2004-11-23 11:06:03.000000000 +0900 @@ -592,15 +592,20 @@ out: static int ti12xx_override(struct yenta_socket *socket) { - u32 val; + u32 val, val_orig; /* make sure that memory burst is active */ - val = config_readl(socket, TI113X_SYSTEM_CONTROL); + val_orig = val = config_readl(socket, TI113X_SYSTEM_CONTROL); + if (disable_clkrun && PCI_FUNC(socket->dev->devfn) == 0) { + printk(KERN_INFO "Yenta: Disabling CLKRUN feature\n"); + val |= TI113X_SCR_KEEPCLK; + } if (!(val & TI122X_SCR_MRBURSTUP)) { printk(KERN_INFO "Yenta: Enabling burst memory read transactions\n"); val |= TI122X_SCR_MRBURSTUP; - config_writel(socket, TI113X_SYSTEM_CONTROL, val); } + if (val_orig != val) + config_writel(socket, TI113X_SYSTEM_CONTROL, val); /* * for EnE bridges only: clear testbit TLTEnable. this makes the diff -puN drivers/pcmcia/yenta_socket.c~pcmcia-clkrun-disable drivers/pcmcia/yenta_socket.c --- linux-2.6.10-rc2/drivers/pcmcia/yenta_socket.c~pcmcia-clkrun-disable 2004-11-23 11:06:02.000000000 +0900 +++ linux-2.6.10-rc2-hirofumi/drivers/pcmcia/yenta_socket.c 2004-11-23 11:06:03.000000000 +0900 @@ -28,6 +28,9 @@ #include "yenta_socket.h" #include "i82365.h" +static int disable_clkrun; +module_param(disable_clkrun, bool, 0444); +MODULE_PARM_DESC(disable_clkrun, "If PC card does'nt function properly, please try this option"); #if 0 #define debug(x,args...) printk(KERN_DEBUG "%s: " x, __func__ , ##args) _
Quoted 1 line · OGAWA Hirofumi
+MODULE_PARM_DESC(disable_clkrun, "If PC card does'nt function properly, please try this option");
^^^^^^^
Oooops. Typo. I'm sorry. Please apply the following instead.
Signature · 48 lines
OGAWA Hirofumi <[email protected]> drivers/pcmcia/ti113x.h | 11 ++++++++--- drivers/pcmcia/yenta_socket.c | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff -puN drivers/pcmcia/ti113x.h~pcmcia-clkrun-disable drivers/pcmcia/ti113x.h --- linux-2.6.10-rc2/drivers/pcmcia/ti113x.h~pcmcia-clkrun-disable 2004-11-23 12:33:20.000000000 +0900 +++ linux-2.6.10-rc2-hirofumi/drivers/pcmcia/ti113x.h 2004-11-23 12:33:20.000000000 +0900 @@ -592,15 +592,20 @@ out: static int ti12xx_override(struct yenta_socket *socket) { - u32 val; + u32 val, val_orig; /* make sure that memory burst is active */ - val = config_readl(socket, TI113X_SYSTEM_CONTROL); + val_orig = val = config_readl(socket, TI113X_SYSTEM_CONTROL); + if (disable_clkrun && PCI_FUNC(socket->dev->devfn) == 0) { + printk(KERN_INFO "Yenta: Disabling CLKRUN feature\n"); + val |= TI113X_SCR_KEEPCLK; + } if (!(val & TI122X_SCR_MRBURSTUP)) { printk(KERN_INFO "Yenta: Enabling burst memory read transactions\n"); val |= TI122X_SCR_MRBURSTUP; - config_writel(socket, TI113X_SYSTEM_CONTROL, val); } + if (val_orig != val) + config_writel(socket, TI113X_SYSTEM_CONTROL, val); /* * for EnE bridges only: clear testbit TLTEnable. this makes the diff -puN drivers/pcmcia/yenta_socket.c~pcmcia-clkrun-disable drivers/pcmcia/yenta_socket.c --- linux-2.6.10-rc2/drivers/pcmcia/yenta_socket.c~pcmcia-clkrun-disable 2004-11-23 12:33:20.000000000 +0900 +++ linux-2.6.10-rc2-hirofumi/drivers/pcmcia/yenta_socket.c 2004-11-23 12:37:34.000000000 +0900 @@ -28,6 +28,9 @@ #include "yenta_socket.h" #include "i82365.h" +static int disable_clkrun; +module_param(disable_clkrun, bool, 0444); +MODULE_PARM_DESC(disable_clkrun, "If PC card doesn't function properly, please try this option"); #if 0 #define debug(x,args...) printk(KERN_DEBUG "%s: " x, __func__ , ##args) _