Tx-timeout patch

[Michel Mueller]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

---1583546091-599990229-918511595=:1945
Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
Content-ID: <Pine.LNX.3.96.990208230721.1945F@krypton.imp.com>


Here is a patch for the Tx-timeout problem.

The timeout accured because the Tx-PDMA engine was restarted even if it 
was still running (the Docuementation does not say what happens if you
do so). So I changed the following line in hamachi_start_xmit to take care
of the actual state of the TxPDMA engine and the timeout errors are gone.
I also put the Tx-Intrrupt-patch from Peter Monta in this patch.


I had a look at the new driver from Eric Kasten and I think there is a
problem with the tx_full flag.
In Eric's driver, the tx_full flag is only cleared when hamachi_start_xmit
is called. But hamachi_start_xmit should not be called by the kernel when 
tx_full is set. So the Driver stalls as soon as the Tx-queue is full.
Tx_full must be cleared from within the interrupt driver,
or am I overlooking something ?

I hope this patch helps making the driver more Stable.

	Michel Mueller


old:	writew(0x0001, dev->base_addr + TxCmd);
new:    status=readw(dev->base_addr + TxStatus);
 	if( !( status & 0x0001) || (status & 0x0002))
 		writew(1, dev->base_addr + TxCmd);
 	






---1583546091-599990229-918511595=:1945
Content-Type: TEXT/PLAIN; CHARSET=US-ASCII; NAME="tx-timeout.patch"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.3.96.990208230635.1945D@krypton.imp.com>
Content-Description: 

LS0tIGhhbWFjaGkuYy5vcmlnCU1vbiBGZWIgIDggMjI6NTM6MDUgMTk5OQ0K
KysrIGhhbWFjaGkuYwlNb24gRmViICA4IDIyOjUyOjQ1IDE5OTkNCkBAIC0x
OCw3ICsxOCw3IEBADQogKi8NCiANCiBzdGF0aWMgY29uc3QgY2hhciAqdmVy
c2lvbiA9DQotImhhbWFjaGkuYzp2MC4wNyA4LzE3Lzk4ICBXcml0dGVuIGJ5
IERvbmFsZCBCZWNrZXJcbiINCisiaGFtYWNoaS5jOnYwLjA5IDAyLzA4Lzk5
ICBXcml0dGVuIGJ5IERvbmFsZCBCZWNrZXJcbiINCiAiICAJaHR0cDovL3d3
dy50aWRhbHdhdmUubmV0L35iZWNrZXIvaGFtYWNoaS5odG1sXG4iOw0KIA0K
IC8qIEEgZmV3IHVzZXItY29uZmlndXJhYmxlIHZhbHVlcy4gKi8NCkBAIC0x
OTgsNyArMTk4LDE2IEBADQogDQogSVZjLiBFcnJhdGENCiANCi1Ob25lIG5v
dGVkLiAgKi8NCitOb25lIG5vdGVkLiAgDQorDQorVi4gQ2hhbmdlcw0KKw0K
KzAuMDk6IE1pY2hlbCBNdWVsbGVyDQorZml4ZWQgdGhlIFR4RE1BIEludGVy
cnVwdDogcGF0Y2ggYnkgUGV0ZXIgTW9udGENCitmaXhlZCB0aGUgVHgtdGlt
ZW91dCBwcm9ibGVtIChUeENtZCBhbmQgUnhDbWQgbmVlZCBvbmx5IHRvIGJl
IHNldCB3aGVuIGlkbGUgb3INCitzdG9wcGVkKQ0KKw0KKyovDQogDQogDA0K
IC8qIEEgZmV3IHZhbHVlcyB0aGF0IG1heSBiZSB0d2Vha2VkLiAqLw0KQEAg
LTgwNSw2ICs4MTQsNyBAQA0KIHsNCiAJc3RydWN0IGhhbWFjaGlfcHJpdmF0
ZSAqaG1wID0gKHN0cnVjdCBoYW1hY2hpX3ByaXZhdGUgKilkZXYtPnByaXY7
DQogCXVuc2lnbmVkIGVudHJ5Ow0KKwlpbnQgc3RhdHVzOw0KIA0KIAkvKiBC
bG9jayBhIHRpbWVyLWJhc2VkIHRyYW5zbWl0IGZyb20gb3ZlcmxhcHBpbmcu
ICBUaGlzIGNvdWxkIGJldHRlciBiZQ0KIAkgICBkb25lIHdpdGggYXRvbWlj
X3N3YXAoMSwgZGV2LT50YnVzeSksIGJ1dCBzZXRfYml0KCkgd29ya3MgYXMg
d2VsbC4gKi8NCkBAIC04MjYsMTUgKzgzNiwxNyBAQA0KIAlobXAtPnR4X3Jp
bmdbZW50cnldLmFkZHIgPSB2aXJ0X3RvX2J1cyhza2ItPmRhdGEpOw0KIAlo
bXAtPnR4X3JpbmdbZW50cnldLmxlbmd0aCA9IHNrYi0+bGVuOw0KIAlpZiAo
ZW50cnkgPj0gVFhfUklOR19TSVpFLTEpCQkgLyogV3JhcCByaW5nICovDQot
CQlobXAtPnR4X3JpbmdbZW50cnldLnN0YXR1cyA9IERlc2NPd258RGVzY0Vu
ZFBhY2tldHxEZXNjRW5kUmluZzsNCisJCWhtcC0+dHhfcmluZ1tlbnRyeV0u
c3RhdHVzID0gRGVzY093bnxEZXNjRW5kUGFja2V0fERlc2NFbmRSaW5nfERl
c2NJbnRyOw0KIAllbHNlDQotCQlobXAtPnR4X3JpbmdbZW50cnldLnN0YXR1
cyA9IERlc2NPd258RGVzY0VuZFBhY2tldDsNCisJCWhtcC0+dHhfcmluZ1tl
bnRyeV0uc3RhdHVzID0gRGVzY093bnxEZXNjRW5kUGFja2V0fERlc2NJbnRy
Ow0KIAlobXAtPmN1cl90eCsrOw0KIA0KIAkvKiBOb24teDg2IFRvZG86IGV4
cGxpY2l0bHkgZmx1c2ggY2FjaGUgbGluZXMgaGVyZS4gKi8NCiANCi0JLyog
V2FrZSB0aGUgcG90ZW50aWFsbHktaWRsZSB0cmFuc21pdCBjaGFubmVsLiAq
Lw0KLQl3cml0ZXcoMSwgZGV2LT5iYXNlX2FkZHIgKyBUeENtZCk7DQorCS8q
IFdha2UgdGhlIHRyYW5zbWl0IGNoYW5uZWwgaWYgaWRsZSBvciBzdG9wcGVk
LiAqLw0KKwlzdGF0dXM9cmVhZHcoZGV2LT5iYXNlX2FkZHIgKyBUeFN0YXR1
cyk7DQorCWlmKCAhKHN0YXR1cyAmIDB4MDAwMSkgfHwgKHN0YXR1cyAmIDB4
MDAwMikpDQorCQl3cml0ZXcoMSwgZGV2LT5iYXNlX2FkZHIgKyBUeENtZCk7
DQogDQogCWlmIChobXAtPmN1cl90eCAtIGhtcC0+ZGlydHlfdHggPCBUWF9S
SU5HX1NJWkUgLSAxKQ0KIAkJY2xlYXJfYml0KDAsICh2b2lkKikmZGV2LT50
YnVzeSk7CQkvKiBUeXBpY2FsIHBhdGggKi8NCkBAIC05NDIsNyArOTU0LDcg
QEANCiB7DQogCXN0cnVjdCBoYW1hY2hpX3ByaXZhdGUgKmhtcCA9IChzdHJ1
Y3QgaGFtYWNoaV9wcml2YXRlICopZGV2LT5wcml2Ow0KIAlpbnQgZW50cnkg
PSBobXAtPmN1cl9yeCAlIFJYX1JJTkdfU0laRTsNCi0JaW50IGJvZ3VzY250
ID0gMjA7DQorCWludCBib2d1c2NudCA9IG1heF9pbnRlcnJ1cHRfd29yazsN
CiANCiAJaWYgKGhhbWFjaGlfZGVidWcgPiA0KSB7DQogCQlwcmludGsoS0VS
Tl9ERUJVRyAiIEluIGhhbWFjaGlfcngoKSwgZW50cnkgJWQgc3RhdHVzICU0
LjR4LlxuIiwNCkBAIC0xMDU5LDcgKzEwNzEsOCBAQA0KIAl9DQogDQogCS8q
IFJlc3RhcnQgUnggZW5naW5lIGlmIHN0b3BwZWQuICovDQotCXdyaXRldygx
LCBkZXYtPmJhc2VfYWRkciArIFJ4Q21kKTsNCisJaWYoIHJlYWR3KGRldi0+
YmFzZV9hZGRyICsgUnhTdGF0dXMpICYgMHgwMDAyKQ0KKwkJd3JpdGV3KDEs
IGRldi0+YmFzZV9hZGRyICsgUnhDbWQpOw0KIAlyZXR1cm4gMDsNCiB9DQog
DQpAQCAtMTE4OCw3ICsxMjAxLDcgQEANCiAJLyogV2Ugc2hvdWxkIGxvY2sg
dGhpcyBzZWdtZW50IG9mIGNvZGUgZm9yIFNNUCBldmVudHVhbGx5LCBhbHRo
b3VnaA0KIAkgICB0aGUgdnVsbmVyYWJpbGl0eSB3aW5kb3cgaXMgdmVyeSBz
bWFsbCBhbmQgc3RhdGlzdGljcyBhcmUNCiAJICAgbm9uLWNyaXRpY2FsLiAq
Lw0KLQlobXAtPnN0YXRzLnR4X3BhY2tldHMJPSByZWFkbChpb2FkZHIgKyAw
eDAwMCk7DQorCS8qIGhtcC0+c3RhdHMudHhfcGFja2V0cwk9IHJlYWRsKGlv
YWRkciArIDB4MDAwKTsgKi8NCiAjaWYgTElOVVhfVkVSU0lPTl9DT0RFID49
IDB4MjAxMTkNCiAJaG1wLT5zdGF0cy5yeF9ieXRlcyA9IHJlYWRsKGlvYWRk
ciArIDB4MzMwKTsgLyogVG90YWwgVW5pK0JyZCtNdWx0aSAqLw0KIAlobXAt
PnN0YXRzLnR4X2J5dGVzID0gcmVhZGwoaW9hZGRyICsgMHgzQjApOyAvKiBU
b3RhbCBVbmkrQnJkK011bHRpICovDQo=
---1583546091-599990229-918511595=:1945--
 | To unsubscribe, send mail to Majordomo@cesdis.gsfc.nasa.gov, and within the
 |  body of the mail, include only the text:
 |   unsubscribe this-list-name youraddress@wherever.org
 | You will be unsubscribed as speedily as possible.