From mboxrd@z Thu Jan 1 00:00:00 1970 From: adam radford Subject: [PATCH 1/1] 3ware 9000 driver update for 2.6.13-rc6-git10 Date: Wed, 17 Aug 2005 19:49:52 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_7092_24723732.1124333392296" Return-path: Received: from wproxy.gmail.com ([64.233.184.201]:15130 "EHLO wproxy.gmail.com") by vger.kernel.org with ESMTP id S932106AbVHRCtx (ORCPT ); Wed, 17 Aug 2005 22:49:53 -0400 Received: by wproxy.gmail.com with SMTP id i2so289885wra for ; Wed, 17 Aug 2005 19:49:52 -0700 (PDT) Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James Bottomley , SCSI Mailing List ------=_Part_7092_24723732.1124333392296 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline The attached patch updates the driver for the 3ware 9000 series to do the following: - Add support for 9550SX controllers. Signed-off-by: Adam Radford James, Please apply ------=_Part_7092_24723732.1124333392296 Content-Type: text/x-patch; name="3ware_update_2.6.13-rc6-git10.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="3ware_update_2.6.13-rc6-git10.patch" ZGlmZiAtTmF1ciBsaW51eC0yLjYuMTMtcmM2LWdpdDkvZHJpdmVycy9zY3NpLzN3LTl4eHguYyBs aW51eC0yLjYuMTMtcmM2LWdpdDEwL2RyaXZlcnMvc2NzaS8zdy05eHh4LmMKLS0tIGxpbnV4LTIu Ni4xMy1yYzYtZ2l0OS9kcml2ZXJzL3Njc2kvM3ctOXh4eC5jCTIwMDUtMDgtMDcgMTA6Mzk6Mjku MDAwMDAwMDAwIC0wNzAwCisrKyBsaW51eC0yLjYuMTMtcmM2LWdpdDEwL2RyaXZlcnMvc2NzaS8z dy05eHh4LmMJMjAwNS0wOC0wNyAxMDo0MTo1OS4wMDAwMDAwMDAgLTA3MDAKQEAgLTU5LDYgKzU5 LDcgQEAKICAgICAgICAgICAgICAgICAgRml4ICdoYW5kbGVkPTEnIElTUiB1c2FnZSwgcmVtb3Zl IGJvZ3VzIElSUSBjaGVjay4KICAgICAgICAgICAgICAgICAgUmVtb3ZlIHVuLW5lZWRlZCBlaF9h Ym9ydCBoYW5kbGVyLgogICAgICAgICAgICAgICAgICBBZGQgc3VwcG9ydCBmb3IgZW1iZWRkZWQg ZmlybXdhcmUgZXJyb3Igc3RyaW5ncy4KKyAgIDIuMjYuMDIuMDAzIC0gQWRkIHN1cHBvcnQgZm9y IDk1NTBTWCBjb250cm9sbGVycy4KICovCiAKICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KQEAg LTgxLDcgKzgyLDcgQEAKICNpbmNsdWRlICIzdy05eHh4LmgiCiAKIC8qIEdsb2JhbHMgKi8KLSNk ZWZpbmUgVFdfRFJJVkVSX1ZFUlNJT04gIjIuMjYuMDIuMDAyIgorI2RlZmluZSBUV19EUklWRVJf VkVSU0lPTiAiMi4yNi4wMi4wMDMiCiBzdGF0aWMgVFdfRGV2aWNlX0V4dGVuc2lvbiAqdHdhX2Rl dmljZV9leHRlbnNpb25fbGlzdFtUV19NQVhfU0xPVF07CiBzdGF0aWMgdW5zaWduZWQgaW50IHR3 YV9kZXZpY2VfZXh0ZW5zaW9uX2NvdW50Owogc3RhdGljIGludCB0d2FfbWFqb3IgPSAtMTsKQEAg LTg5MSwxMSArODkyLDYgQEAKIAkJd3JpdGVsKFRXX0NPTlRST0xfQ0xFQVJfUVVFVUVfRVJST1Is IFRXX0NPTlRST0xfUkVHX0FERFIodHdfZGV2KSk7CiAJfQogCi0JaWYgKHN0YXR1c19yZWdfdmFs dWUgJiBUV19TVEFUVVNfU0JVRl9XUklURV9FUlJPUikgewotCQlUV19QUklOVEsodHdfZGV2LT5o b3N0LCBUV19EUklWRVIsIDB4ZiwgIlNCVUYgV3JpdGUgRXJyb3I6IGNsZWFyaW5nIik7Ci0JCXdy aXRlbChUV19DT05UUk9MX0NMRUFSX1NCVUZfV1JJVEVfRVJST1IsIFRXX0NPTlRST0xfUkVHX0FE RFIodHdfZGV2KSk7Ci0JfQotCiAJaWYgKHN0YXR1c19yZWdfdmFsdWUgJiBUV19TVEFUVVNfTUlD Uk9DT05UUk9MTEVSX0VSUk9SKSB7CiAJCWlmICh0d19kZXYtPnJlc2V0X3ByaW50ID09IDApIHsK IAkJCVRXX1BSSU5USyh0d19kZXYtPmhvc3QsIFRXX0RSSVZFUiwgMHgxMCwgIk1pY3JvY29udHJv bGxlciBFcnJvcjogY2xlYXJpbmciKTsKQEAgLTkyOSw2ICs5MjUsMzYgQEAKIAlyZXR1cm4gcmV0 dmFsOwogfSAvKiBFbmQgdHdhX2VtcHR5X3Jlc3BvbnNlX3F1ZXVlKCkgKi8KIAorLyogVGhpcyBm dW5jdGlvbiB3aWxsIGNsZWFyIHRoZSBwY2hpcC9yZXNwb25zZSBxdWV1ZSBvbiA5NTUwU1ggKi8K K3N0YXRpYyBpbnQgdHdhX2VtcHR5X3Jlc3BvbnNlX3F1ZXVlX2xhcmdlKFRXX0RldmljZV9FeHRl bnNpb24gKnR3X2RldikKK3sKKwl1MzIgc3RhdHVzX3JlZ192YWx1ZSwgcmVzcG9uc2VfcXVlX3Zh bHVlOworCWludCBjb3VudCA9IDAsIHJldHZhbCA9IDE7CisKKwlpZiAodHdfZGV2LT50d19wY2lf ZGV2LT5kZXZpY2UgPT0gUENJX0RFVklDRV9JRF8zV0FSRV85NTUwU1gpIHsKKwkJc3RhdHVzX3Jl Z192YWx1ZSA9IHJlYWRsKFRXX1NUQVRVU19SRUdfQUREUih0d19kZXYpKTsKKworCQl3aGlsZSAo KChzdGF0dXNfcmVnX3ZhbHVlICYgVFdfU1RBVFVTX1JFU1BPTlNFX1FVRVVFX0VNUFRZKSA9PSAw KSAmJiAoY291bnQgPCBUV19NQVhfUkVTUE9OU0VfRFJBSU4pKSB7CisJCQlyZXNwb25zZV9xdWVf dmFsdWUgPSByZWFkbChUV19SRVNQT05TRV9RVUVVRV9SRUdfQUREUl9MQVJHRSh0d19kZXYpKTsK KwkJCWlmICgocmVzcG9uc2VfcXVlX3ZhbHVlICYgVFdfOTU1MFNYX0RSQUlOX0NPTVBMRVRFRCkg PT0gVFdfOTU1MFNYX0RSQUlOX0NPTVBMRVRFRCkgeworCQkJCS8qIFAtY2hpcCBzZXR0bGUgdGlt ZSAqLworCQkJCW1zbGVlcCg1MDApOworCQkJCXJldHZhbCA9IDA7CisJCQkJZ290byBvdXQ7CisJ CQl9CisJCQlzdGF0dXNfcmVnX3ZhbHVlID0gcmVhZGwoVFdfU1RBVFVTX1JFR19BRERSKHR3X2Rl dikpOworCQkJY291bnQrKzsKKwkJfQorCQlpZiAoY291bnQgPT0gVFdfTUFYX1JFU1BPTlNFX0RS QUlOKQorCQkJZ290byBvdXQ7CisJCQorCQlyZXR2YWwgPSAwOworCX0gZWxzZQorCQlyZXR2YWwg PSAwOworb3V0OgorCXJldHVybiByZXR2YWw7Cit9IC8qIEVuZCB0d2FfZW1wdHlfcmVzcG9uc2Vf cXVldWVfbGFyZ2UoKSAqLworCiAvKiBUaGlzIGZ1bmN0aW9uIHBhc3NlcyBzZW5zZSBrZXlzIGZy b20gZmlybXdhcmUgdG8gc2NzaSBsYXllciAqLwogc3RhdGljIGludCB0d2FfZmlsbF9zZW5zZShU V19EZXZpY2VfRXh0ZW5zaW9uICp0d19kZXYsIGludCByZXF1ZXN0X2lkLCBpbnQgY29weV9zZW5z ZSwgaW50IHByaW50X2hvc3QpCiB7CkBAIC0xNjEyLDggKzE2MzgsMTYgQEAKIAlpbnQgdHJpZXMg PSAwLCByZXR2YWwgPSAxLCBmbGFzaGVkID0gMCwgZG9fc29mdF9yZXNldCA9IHNvZnRfcmVzZXQ7 CiAKIAl3aGlsZSAodHJpZXMgPCBUV19NQVhfUkVTRVRfVFJJRVMpIHsKLQkJaWYgKGRvX3NvZnRf cmVzZXQpCisJCWlmIChkb19zb2Z0X3Jlc2V0KSB7CiAJCQlUV19TT0ZUX1JFU0VUKHR3X2Rldik7 CisJCQkvKiBDbGVhciBwY2hpcC9yZXNwb25zZSBxdWV1ZSBvbiA5NTUwU1ggKi8KKwkJCWlmICh0 d2FfZW1wdHlfcmVzcG9uc2VfcXVldWVfbGFyZ2UodHdfZGV2KSkgeworCQkJCVRXX1BSSU5USyh0 d19kZXYtPmhvc3QsIFRXX0RSSVZFUiwgMHgzNiwgIlJlc3BvbnNlIHF1ZXVlIChsYXJnZSkgZW1w dHkgZmFpbGVkIGR1cmluZyByZXNldCBzZXF1ZW5jZSIpOworCQkJCWRvX3NvZnRfcmVzZXQgPSAx OworCQkJCXRyaWVzKys7CisJCQkJY29udGludWU7CisJCQl9CisJCX0KIAogCQkvKiBNYWtlIHN1 cmUgY29udHJvbGxlciBpcyBpbiBhIGdvb2Qgc3RhdGUgKi8KIAkJaWYgKHR3YV9wb2xsX3N0YXR1 cyh0d19kZXYsIFRXX1NUQVRVU19NSUNST0NPTlRST0xMRVJfUkVBRFkgfCAoZG9fc29mdF9yZXNl dCA9PSAxID8gVFdfU1RBVFVTX0FUVEVOVElPTl9JTlRFUlJVUFQgOiAwKSwgNjApKSB7CkBAIC0y MDE2LDcgKzIwNTAsMTAgQEAKIAkJZ290byBvdXRfZnJlZV9kZXZpY2VfZXh0ZW5zaW9uOwogCX0K IAotCW1lbV9hZGRyID0gcGNpX3Jlc291cmNlX3N0YXJ0KHBkZXYsIDEpOworCWlmIChwZGV2LT5k ZXZpY2UgPT0gUENJX0RFVklDRV9JRF8zV0FSRV85MDAwKQorCQltZW1fYWRkciA9IHBjaV9yZXNv dXJjZV9zdGFydChwZGV2LCAxKTsKKwllbHNlCisJCW1lbV9hZGRyID0gcGNpX3Jlc291cmNlX3N0 YXJ0KHBkZXYsIDIpOwogCiAJLyogU2F2ZSBiYXNlIGFkZHJlc3MgKi8KIAl0d19kZXYtPmJhc2Vf YWRkciA9IGlvcmVtYXAobWVtX2FkZHIsIFBBR0VfU0laRSk7CkBAIC0yMTMwLDYgKzIxNjcsOCBA QAogc3RhdGljIHN0cnVjdCBwY2lfZGV2aWNlX2lkIHR3YV9wY2lfdGJsW10gX19kZXZpbml0ZGF0 YSA9IHsKIAl7IFBDSV9WRU5ET1JfSURfM1dBUkUsIFBDSV9ERVZJQ0VfSURfM1dBUkVfOTAwMCwK IAkgIFBDSV9BTllfSUQsIFBDSV9BTllfSUQsIDAsIDAsIDB9LAorCXsgUENJX1ZFTkRPUl9JRF8z V0FSRSwgUENJX0RFVklDRV9JRF8zV0FSRV85NTUwU1gsCisJICBQQ0lfQU5ZX0lELCBQQ0lfQU5Z X0lELCAwLCAwLCAwfSwKIAl7IH0KIH07CiBNT0RVTEVfREVWSUNFX1RBQkxFKHBjaSwgdHdhX3Bj aV90YmwpOwpkaWZmIC1OYXVyIGxpbnV4LTIuNi4xMy1yYzYtZ2l0OS9kcml2ZXJzL3Njc2kvM3ct OXh4eC5oIGxpbnV4LTIuNi4xMy1yYzYtZ2l0MTAvZHJpdmVycy9zY3NpLzN3LTl4eHguaAotLS0g bGludXgtMi42LjEzLXJjNi1naXQ5L2RyaXZlcnMvc2NzaS8zdy05eHh4LmgJMjAwNS0wNi0xNyAx Mjo0ODoyOS4wMDAwMDAwMDAgLTA3MDAKKysrIGxpbnV4LTIuNi4xMy1yYzYtZ2l0MTAvZHJpdmVy cy9zY3NpLzN3LTl4eHguaAkyMDA1LTA4LTA3IDEwOjQyOjAxLjAwMDAwMDAwMCAtMDcwMApAQCAt MjY3LDcgKzI2Nyw2IEBACiAjZGVmaW5lIFRXX0NPTlRST0xfQ0xFQVJfUEFSSVRZX0VSUk9SICAg ICAgICAgIDB4MDA4MDAwMDAKICNkZWZpbmUgVFdfQ09OVFJPTF9DTEVBUl9RVUVVRV9FUlJPUiAg ICAgICAgICAgMHgwMDQwMDAwMAogI2RlZmluZSBUV19DT05UUk9MX0NMRUFSX1BDSV9BQk9SVCAg ICAgICAgICAgICAweDAwMTAwMDAwCi0jZGVmaW5lIFRXX0NPTlRST0xfQ0xFQVJfU0JVRl9XUklU RV9FUlJPUiAgICAgIDB4MDAwMDAwMDgKIAogLyogU3RhdHVzIHJlZ2lzdGVyIGJpdCBkZWZpbml0 aW9ucyAqLwogI2RlZmluZSBUV19TVEFUVVNfTUFKT1JfVkVSU0lPTl9NQVNLCSAgICAgICAweEYw MDAwMDAwCkBAIC0yODUsOSArMjg0LDggQEAKICNkZWZpbmUgVFdfU1RBVFVTX01JQ1JPQ09OVFJP TExFUl9SRUFEWQkgICAgICAgMHgwMDAwMjAwMAogI2RlZmluZSBUV19TVEFUVVNfQ09NTUFORF9R VUVVRV9FTVBUWQkgICAgICAgMHgwMDAwMTAwMAogI2RlZmluZSBUV19TVEFUVVNfRVhQRUNURURf QklUUwkJICAgICAgIDB4MDAwMDIwMDAKLSNkZWZpbmUgVFdfU1RBVFVTX1VORVhQRUNURURfQklU UwkgICAgICAgMHgwMEYwMDAwOAotI2RlZmluZSBUV19TVEFUVVNfU0JVRl9XUklURV9FUlJPUiAg ICAgICAgICAgICAweDAwMDAwMDA4Ci0jZGVmaW5lIFRXX1NUQVRVU19WQUxJRF9JTlRFUlJVUFQg ICAgICAgICAgICAgIDB4MDBERjAwMDgKKyNkZWZpbmUgVFdfU1RBVFVTX1VORVhQRUNURURfQklU UwkgICAgICAgMHgwMEYwMDAwMAorI2RlZmluZSBUV19TVEFUVVNfVkFMSURfSU5URVJSVVBUICAg ICAgICAgICAgICAweDAwREYwMDAwCiAKIC8qIFJFU1BPTlNFIFFVRVVFIEJJVCBERUZJTklUSU9O UyAqLwogI2RlZmluZSBUV19SRVNQT05TRV9JRF9NQVNLCQkgICAgICAgMHgwMDAwMEZGMApAQCAt MzI0LDkgKzMyMiw5IEBACiAKIC8qIENvbXBhdGliaWxpdHkgZGVmaW5lcyAqLwogI2RlZmluZSBU V185MDAwX0FSQ0hfSUQgMHg1Ci0jZGVmaW5lIFRXX0NVUlJFTlRfRFJJVkVSX1NSTCAyOAotI2Rl ZmluZSBUV19DVVJSRU5UX0RSSVZFUl9CVUlMRCA5Ci0jZGVmaW5lIFRXX0NVUlJFTlRfRFJJVkVS X0JSQU5DSCA0CisjZGVmaW5lIFRXX0NVUlJFTlRfRFJJVkVSX1NSTCAzMAorI2RlZmluZSBUV19D VVJSRU5UX0RSSVZFUl9CVUlMRCA4MAorI2RlZmluZSBUV19DVVJSRU5UX0RSSVZFUl9CUkFOQ0gg MAogCiAvKiBQaGFzZSBkZWZpbmVzICovCiAjZGVmaW5lIFRXX1BIQVNFX0lOSVRJQUwgMApAQCAt MzM0LDYgKzMzMiw3IEBACiAjZGVmaW5lIFRXX1BIQVNFX1NHTElTVCAgMgogCiAvKiBNaXNjIGRl ZmluZXMgKi8KKyNkZWZpbmUgVFdfOTU1MFNYX0RSQUlOX0NPTVBMRVRFRAkgICAgICAweEZGRkYK ICNkZWZpbmUgVFdfU0VDVE9SX1NJWkUgICAgICAgICAgICAgICAgICAgICAgICA1MTIKICNkZWZp bmUgVFdfQUxJR05NRU5UXzkwMDAgICAgICAgICAgICAgICAgICAgICA0ICAvKiA0IGJ5dGVzICov CiAjZGVmaW5lIFRXX0FMSUdOTUVOVF85MDAwX1NHTCAgICAgICAgICAgICAgICAgMHgzCkBAIC00 MTcsNiArNDE2LDkgQEAKICNpZm5kZWYgUENJX0RFVklDRV9JRF8zV0FSRV85MDAwCiAjZGVmaW5l IFBDSV9ERVZJQ0VfSURfM1dBUkVfOTAwMCAweDEwMDIKICNlbmRpZgorI2lmbmRlZiBQQ0lfREVW SUNFX0lEXzNXQVJFXzk1NTBTWAorI2RlZmluZSBQQ0lfREVWSUNFX0lEXzNXQVJFXzk1NTBTWCAw eDEwMDMKKyNlbmRpZgogCiAvKiBCaXRtYXNrIG1hY3JvcyB0byBlbGltaW5hdGUgYml0ZmllbGRz ICovCiAKQEAgLTQ0Myw2ICs0NDUsNyBAQAogI2RlZmluZSBUV19TVEFUVVNfUkVHX0FERFIoeCkg KCh1bnNpZ25lZCBjaGFyIF9faW9tZW0gKil4LT5iYXNlX2FkZHIgKyAweDQpCiAjZGVmaW5lIFRX X0NPTU1BTkRfUVVFVUVfUkVHX0FERFIoeCkgKHNpemVvZihkbWFfYWRkcl90KSA+IDQgPyAoKHVu c2lnbmVkIGNoYXIgX19pb21lbSAqKXgtPmJhc2VfYWRkciArIDB4MjApIDogKCh1bnNpZ25lZCBj aGFyIF9faW9tZW0gKil4LT5iYXNlX2FkZHIgKyAweDgpKQogI2RlZmluZSBUV19SRVNQT05TRV9R VUVVRV9SRUdfQUREUih4KSAoKHVuc2lnbmVkIGNoYXIgX19pb21lbSAqKXgtPmJhc2VfYWRkciAr IDB4QykKKyNkZWZpbmUgVFdfUkVTUE9OU0VfUVVFVUVfUkVHX0FERFJfTEFSR0UoeCkgKCh1bnNp Z25lZCBjaGFyIF9faW9tZW0gKil4LT5iYXNlX2FkZHIgKyAweDMwKQogI2RlZmluZSBUV19DTEVB Ul9BTExfSU5URVJSVVBUUyh4KSAod3JpdGVsKFRXX1NUQVRVU19WQUxJRF9JTlRFUlJVUFQsIFRX X0NPTlRST0xfUkVHX0FERFIoeCkpKQogI2RlZmluZSBUV19DTEVBUl9BVFRFTlRJT05fSU5URVJS VVBUKHgpICh3cml0ZWwoVFdfQ09OVFJPTF9DTEVBUl9BVFRFTlRJT05fSU5URVJSVVBULCBUV19D T05UUk9MX1JFR19BRERSKHgpKSkKICNkZWZpbmUgVFdfQ0xFQVJfSE9TVF9JTlRFUlJVUFQoeCkg KHdyaXRlbChUV19DT05UUk9MX0NMRUFSX0hPU1RfSU5URVJSVVBULCBUV19DT05UUk9MX1JFR19B RERSKHgpKSkK ------=_Part_7092_24723732.1124333392296--