Date: Thu, 24 Jul 2003 19:00:09 -0700 (PDT) From: Nate Lawson <nate@root.org> To: current@freebsd.org Cc: scsi@freebsd.org Subject: PATCH: Disable 6 byte commands for USB, firewire, ATAPICAM Message-ID: <20030724183246.X42809@root.org>
next in thread | raw e-mail | index | archive | help
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. --0-1992410604-1059098409=:42898 Content-Type: TEXT/PLAIN; charset=US-ASCII Attached is a patch that disables ever sending 6 byte commands to buses that do not support them. Numerous USB devices hang when receiving a 6 byte command. For testing, this patch comments out the scsi_da quirks for devices that I believe are addressed by this patch and no longer need the quirk. Please test devices such as USB keys, USB cameras, Firewire hard disks, and ATAPICAM cd drives to be sure they still work with this patch. Especially if you've needed a quirk before, it is important to see if this patch does not break your device. I hope to get this into the tree early so there is plenty of testing before 5.2. Thanks, Nate --0-1992410604-1059098409=:42898 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="6b.diff" Content-Transfer-Encoding: BASE64 Content-ID: <20030724190009.J42898@root.org> Content-Description: Content-Disposition: attachment; filename="6b.diff" SW5kZXg6IC9zeXMvY2FtL2NhbV9jY2IuaA0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQ0KUkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL3N5cy9jYW0vY2FtX2Nj Yi5oLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yNQ0KZGlmZiAtdSAtcjEu MjUgY2FtX2NjYi5oDQotLS0gL3N5cy9jYW0vY2FtX2NjYi5oCTE0IEp1biAy MDAzIDIyOjE3OjM4IC0wMDAwCTEuMjUNCisrKyAvc3lzL2NhbS9jYW1fY2Ni LmgJMjUgSnVsIDIwMDMgMDE6MDE6NDUgLTAwMDANCkBAIC01MTMsNyArNTEz LDggQEANCiAJUElNX1NDQU5ISUxPCT0gMHg4MCwJLyogQnVzIHNjYW5zIGZy b20gaGlnaCBJRCB0byBsb3cgSUQgKi8NCiAJUElNX05PUkVNT1ZFCT0gMHg0 MCwJLyogUmVtb3ZlYWJsZSBkZXZpY2VzIG5vdCBpbmNsdWRlZCBpbiBzY2Fu ICovDQogCVBJTV9OT0lOSVRJQVRPUgk9IDB4MjAsCS8qIEluaXRpYXRvciBy b2xlIG5vdCBzdXBwb3J0ZWQuICovDQotCVBJTV9OT0JVU1JFU0VUICA9IDB4 MTAgIC8qIFVzZXIgaGFzIGRpc2FibGVkIGluaXRpYWwgQlVTIFJFU0VUICov DQorCVBJTV9OT0JVU1JFU0VUCT0gMHgxMCwJLyogVXNlciBoYXMgZGlzYWJs ZWQgaW5pdGlhbCBCVVMgUkVTRVQgKi8NCisJUElNX05PXzZfQllURQk9IDB4 MDgJLyogRG8gbm90IHNlbmQgNi1ieXRlIGNvbW1hbmRzICovDQogfSBwaV9t aXNjZmxhZzsNCiANCiAjaWZkZWYgQ0FNX05FV19UUkFOX0NPREUNCkluZGV4 OiAvc3lzL2NhbS9zY3NpL3Njc2lfZGEuYw0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQ0KUkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL3N5cy9jYW0vc2NzaS9z Y3NpX2RhLmMsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjE0Ng0KZGlmZiAt dSAtcjEuMTQ2IHNjc2lfZGEuYw0KLS0tIC9zeXMvY2FtL3Njc2kvc2NzaV9k YS5jCTE4IEp1bCAyMDAzIDE2OjI2OjM2IC0wMDAwCTEuMTQ2DQorKysgL3N5 cy9jYW0vc2NzaS9zY3NpX2RhLmMJMjUgSnVsIDIwMDMgMDE6NTQ6MzQgLTAw MDANCkBAIC0xNDUsNiArMTQ1LDcgQEANCiANCiBzdGF0aWMgc3RydWN0IGRh X3F1aXJrX2VudHJ5IGRhX3F1aXJrX3RhYmxlW10gPQ0KIHsNCisjaWZuZGVm IERBX09MRF9RVUlSS1MNCiAJLyoNCiAJICogTG9naXRlYyBVU0IvRmlyZXdp cmUgTEhELVAzMEZVDQogCSAqLw0KQEAgLTE1OCw2ICsxNTksNyBAQA0KIAkJ e1RfRElSRUNULCBTSVBfTUVESUFfRklYRUQsICJMU0lMb2dpYyIsICJTWU0x M0ZXKiIsICIqIn0sDQogCQkvKnF1aXJrcyovIERBX1FfTk9fNl9CWVRFDQog CX0sDQorI2VuZGlmIC8qICFEQV9PTERfUVVJUktTICovDQogCXsNCiAJCS8q DQogCQkgKiBGdWppdHN1IE0yNTEzQSBNTyBkcml2ZXMuDQpAQCAtMjU3LDYg KzI1OSw3IEBADQogCQl7VF9ESVJFQ1QsIFNJUF9NRURJQV9SRU1PVkFCTEUs ICJNQVRTSElUQSIsICJGREQgQ0YtVkZEVSoiLCIqIn0sDQogCQkvKnF1aXJr cyovIERBX1FfTk9fNl9CWVRFfERBX1FfTk9fU1lOQ19DQUNIRQ0KIAl9LA0K KyNpZm5kZWYgREFfT0xEX1FVSVJLUw0KIAl7DQogCQkvKg0KIAkJICogU29u eSBNZW1vcnkgU3RpY2sgYWRhcHRlciBNU0FDLVVTMSBhbmQNCkBAIC01MTcs NiArNTIwLDcgQEANCiAJCXtUX0RJUkVDVCwgU0lQX01FRElBX1JFTU9WQUJM RSwgIk9UaSIsICJGbGFzaCBEaXNrIiwgIioifSwNCiAJCS8qcXVpcmtzKi8g REFfUV9OT182X0JZVEUNCiAJfQ0KKyNlbmRpZiAvKiAhREFfT0xEX1FVSVJL UyAqLw0KIH07DQogDQogc3RhdGljCWRpc2tfc3RyYXRlZ3lfdAlkYXN0cmF0 ZWd5Ow0KQEAgLTEwODcsNiArMTA5MSw3IEBADQogCWludCBzOw0KIAlzdHJ1 Y3QgZGFfc29mdGMgKnNvZnRjOw0KIAlzdHJ1Y3QgY2NiX3NldGFzeW5jIGNz YTsNCisJc3RydWN0IGNjYl9wYXRoaW5xIGNwaTsNCiAJc3RydWN0IGNjYl9n ZXRkZXYgKmNnZDsNCiAJY2hhciB0bXBzdHJbODBdLCB0bXBzdHIyWzgwXTsN CiAJY2FkZHJfdCBtYXRjaDsNCkBAIC0xMTMzLDYgKzExMzgsMTUgQEANCiAJ CXNvZnRjLT5xdWlya3MgPSAoKHN0cnVjdCBkYV9xdWlya19lbnRyeSAqKW1h dGNoKS0+cXVpcmtzOw0KIAllbHNlDQogCQlzb2Z0Yy0+cXVpcmtzID0gREFf UV9OT05FOw0KKw0KKwkvKiBDaGVjayBpZiB0aGUgU0lNIGRvZXMgbm90IHdh bnQgNiBieXRlIGNvbW1hbmRzICovDQorCXhwdF9zZXR1cF9jY2IoJmNwaS5j Y2JfaCwgcGVyaXBoLT5wYXRoLCAvKnByaW9yaXR5Ki8xKTsNCisJY3BpLmNj Yl9oLmZ1bmNfY29kZSA9IFhQVF9QQVRIX0lOUTsNCisJeHB0X2FjdGlvbigo dW5pb24gY2NiICopJmNwaSk7DQorCWlmIChjcGkuY2NiX2guc3RhdHVzID09 IENBTV9SRVFfQ01QICYmIChjcGkuaGJhX21pc2MgJiBQSU1fTk9fNl9CWVRF KSkgew0KKwkJcHJpbnRmKCJkYXJlZ2lzdGVyOiBzZXR0aW5nIG5vIDYgYnl0 ZVxuIik7DQorCQlzb2Z0Yy0+cXVpcmtzIHw9IERBX1FfTk9fNl9CWVRFOw0K Kwl9DQogDQogCXNucHJpbnRmKHRtcHN0ciwgc2l6ZW9mKHRtcHN0ciksICJD QU0gREEgdW5pdCAlZCIsIHBlcmlwaC0+dW5pdF9udW1iZXIpOw0KIAlzbnBy aW50Zih0bXBzdHIyLCBzaXplb2YodG1wc3RyMiksICIlZCIsIHBlcmlwaC0+ dW5pdF9udW1iZXIpOw0KSW5kZXg6IC9zeXMvY2FtL3Njc2kvc2NzaV9jZC5j DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvbmN2 cy9zcmMvc3lzL2NhbS9zY3NpL3Njc2lfY2QuYyx2DQpyZXRyaWV2aW5nIHJl dmlzaW9uIDEuNzkNCmRpZmYgLXUgLXIxLjc5IHNjc2lfY2QuYw0KLS0tIC9z eXMvY2FtL3Njc2kvc2NzaV9jZC5jCTEwIEp1biAyMDAzIDE4OjE0OjA0IC0w MDAwCTEuNzkNCisrKyAvc3lzL2NhbS9zY3NpL3Njc2lfY2QuYwkyNSBKdWwg MjAwMyAwMToxMzowOCAtMDAwMA0KQEAgLTY0MCw2ICs2NDAsNyBAQA0KIHsN CiAJc3RydWN0IGNkX3NvZnRjICpzb2Z0YzsNCiAJc3RydWN0IGNjYl9zZXRh c3luYyBjc2E7DQorCXN0cnVjdCBjY2JfcGF0aGlucSBjcGk7DQogCXN0cnVj dCBjY2JfZ2V0ZGV2ICpjZ2Q7DQogCWNoYXIgdG1wc3RyWzgwXSwgdG1wc3Ry Mls4MF07DQogCWNhZGRyX3QgbWF0Y2g7DQpAQCAtNjg3LDYgKzY4OCwxNSBA QA0KIAkJc29mdGMtPnF1aXJrcyA9ICgoc3RydWN0IGNkX3F1aXJrX2VudHJ5 ICopbWF0Y2gpLT5xdWlya3M7DQogCWVsc2UNCiAJCXNvZnRjLT5xdWlya3Mg PSBDRF9RX05PTkU7DQorDQorCS8qIENoZWNrIGlmIHRoZSBTSU0gZG9lcyBu b3Qgd2FudCA2IGJ5dGUgY29tbWFuZHMgKi8NCisJeHB0X3NldHVwX2NjYigm Y3BpLmNjYl9oLCBwZXJpcGgtPnBhdGgsIC8qcHJpb3JpdHkqLzEpOw0KKwlj cGkuY2NiX2guZnVuY19jb2RlID0gWFBUX1BBVEhfSU5ROw0KKwl4cHRfYWN0 aW9uKCh1bmlvbiBjY2IgKikmY3BpKTsNCisJaWYgKGNwaS5jY2JfaC5zdGF0 dXMgPT0gQ0FNX1JFUV9DTVAgJiYgKGNwaS5oYmFfbWlzYyAmIFBJTV9OT182 X0JZVEUpKSB7DQorCQlwcmludGYoImNkcmVnaXN0ZXI6IHNldHRpbmcgbm8g NiBieXRlXG4iKTsNCisJCXNvZnRjLT5xdWlya3MgfD0gQ0RfUV8xMF9CWVRF X09OTFk7DQorCX0NCiANCiAJc25wcmludGYodG1wc3RyLCBzaXplb2YodG1w c3RyKSwgIkNBTSBDRCB1bml0ICVkIiwgcGVyaXBoLT51bml0X251bWJlcik7 DQogCXNucHJpbnRmKHRtcHN0cjIsIHNpemVvZih0bXBzdHIyKSwgIiVkIiwg cGVyaXBoLT51bml0X251bWJlcik7DQpJbmRleDogL3N5cy9kZXYvYXRhL2F0 YXBpLWNhbS5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTog L2hvbWUvbmN2cy9zcmMvc3lzL2Rldi9hdGEvYXRhcGktY2FtLmMsdg0KcmV0 cmlldmluZyByZXZpc2lvbiAxLjE3DQpkaWZmIC11IC1yMS4xNyBhdGFwaS1j YW0uYw0KLS0tIC9zeXMvZGV2L2F0YS9hdGFwaS1jYW0uYwkxNCBKdW4gMjAw MyAyMjoxNzozOSAtMDAwMAkxLjE3DQorKysgL3N5cy9kZXYvYXRhL2F0YXBp LWNhbS5jCTI1IEp1bCAyMDAzIDAxOjEzOjQxIC0wMDAwDQpAQCAtMjM4LDcg KzIzOCw3IEBADQogCWNwaS0+dmVyc2lvbl9udW0gPSAxOw0KIAljcGktPmhi YV9pbnF1aXJ5ID0gMDsNCiAJY3BpLT50YXJnZXRfc3BydCA9IDA7DQotCWNw aS0+aGJhX21pc2MgPSAwOw0KKwljcGktPmhiYV9taXNjID0gUElNX05PXzZf QllURTsNCiAJY3BpLT5oYmFfZW5nX2NudCA9IDA7DQogCWJ6ZXJvKGNwaS0+ dnVoYmFfZmxhZ3MsIHNpemVvZihjcGktPnZ1aGJhX2ZsYWdzKSk7DQogCWNw aS0+bWF4X3RhcmdldCA9IDE7DQpJbmRleDogL3N5cy9kZXYvdXNiL3VtYXNz LmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9u Y3ZzL3NyYy9zeXMvZGV2L3VzYi91bWFzcy5jLHYNCnJldHJpZXZpbmcgcmV2 aXNpb24gMS44Nw0KZGlmZiAtdSAtcjEuODcgdW1hc3MuYw0KLS0tIC9zeXMv ZGV2L3VzYi91bWFzcy5jCTQgSnVsIDIwMDMgMjM6MTE6MTMgLTAwMDAJMS44 Nw0KKysrIC9zeXMvZGV2L3VzYi91bWFzcy5jCTI1IEp1bCAyMDAzIDAxOjAx OjE3IC0wMDAwDQpAQCAtMjM5Myw3ICsyMzkzLDcgQEANCiAJCWNwaS0+dmVy c2lvbl9udW0gPSAxOw0KIAkJY3BpLT5oYmFfaW5xdWlyeSA9IDA7DQogCQlj cGktPnRhcmdldF9zcHJ0ID0gMDsNCi0JCWNwaS0+aGJhX21pc2MgPSAwOw0K KwkJY3BpLT5oYmFfbWlzYyA9IFBJTV9OT182X0JZVEU7DQogCQljcGktPmhi YV9lbmdfY250ID0gMDsNCiAJCWNwaS0+bWF4X3RhcmdldCA9IFVNQVNTX1ND U0lJRF9NQVg7CS8qIG9uZSB0YXJnZXQgKi8NCiAJCWNwaS0+aW5pdGlhdG9y X2lkID0gVU1BU1NfU0NTSUlEX0hPU1Q7DQpJbmRleDogL3N5cy9kZXYvZmly ZXdpcmUvc2JwLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxl OiAvaG9tZS9uY3ZzL3NyYy9zeXMvZGV2L2ZpcmV3aXJlL3NicC5jLHYNCnJl dHJpZXZpbmcgcmV2aXNpb24gMS41Nw0KZGlmZiAtdSAtcjEuNTcgc2JwLmMN Ci0tLSAvc3lzL2Rldi9maXJld2lyZS9zYnAuYwkxOCBKdWwgMjAwMyAxNDoz MToxNiAtMDAwMAkxLjU3DQorKysgL3N5cy9kZXYvZmlyZXdpcmUvc2JwLmMJ MjUgSnVsIDIwMDMgMDE6MTA6NTkgLTAwMDANCkBAIC0yMzY5LDcgKzIzNjks NyBAQA0KIAkJY3BpLT52ZXJzaW9uX251bSA9IDE7IC8qIFhYWD8/PyAqLw0K IAkJY3BpLT5oYmFfaW5xdWlyeSA9IFBJX1RBR19BQkxFOw0KIAkJY3BpLT50 YXJnZXRfc3BydCA9IDA7DQotCQljcGktPmhiYV9taXNjID0gUElNX05PQlVT UkVTRVQ7DQorCQljcGktPmhiYV9taXNjID0gUElNX05PQlVTUkVTRVQgfCBQ SU1fTk9fNl9CWVRFOw0KIAkJY3BpLT5oYmFfZW5nX2NudCA9IDA7DQogCQlj cGktPm1heF90YXJnZXQgPSBTQlBfTlVNX1RBUkdFVFMgLSAxOw0KIAkJY3Bp LT5tYXhfbHVuID0gU0JQX05VTV9MVU5TIC0gMTsNCg== --0-1992410604-1059098409=:42898--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030724183246.X42809>