From owner-freebsd-alpha Sun Mar 18 15:30:48 2001 Delivered-To: freebsd-alpha@freebsd.org Received: from sasami.jurai.net (sasami.jurai.net [64.0.106.45]) by hub.freebsd.org (Postfix) with ESMTP id 7B20337B719 for ; Sun, 18 Mar 2001 15:30:38 -0800 (PST) (envelope-from winter@jurai.net) Received: from localhost (winter@localhost) by sasami.jurai.net (8.9.3/8.8.7) with ESMTP id SAA71900 for ; Sun, 18 Mar 2001 18:30:37 -0500 (EST) Date: Sun, 18 Mar 2001 18:30:37 -0500 (EST) From: "Matthew N. Dodd" To: alpha@freebsd.org Subject: Fix for AXPPCI33 in -CURRENT. (LCA owners read also). Message-ID: MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-1221869499-984958237=:54019" Sender: owner-freebsd-alpha@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org 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-1221869499-984958237=:54019 Content-Type: TEXT/PLAIN; charset=US-ASCII Attached is a patch that special cases the handling of the PCIB_READ_CONFIG() for PCIR_INTLINE register access. I've taken advantage of newbus so that the special case is only used on the AXPPCI33, but I'd appreciate CURRENT users with other LCA machines testing to make sure I didn't break anything. Oh, and the chipset/machine code officially sucks rocks. :/ -- | Matthew N. Dodd | '78 Datsun 280Z | '75 Volvo 164E | FreeBSD/NetBSD | | winter@jurai.net | 2 x '84 Volvo 245DL | ix86,sparc,pmax | | http://www.jurai.net/~winter | For Great Justice! | ISO8802.5 4ever | --0-1221869499-984958237=:54019 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="axppci33.patch" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename="axppci33.patch" SW5kZXg6IGFscGhhL2RlY19heHBwY2lfMzMuYw0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQ0KUkNTIGZpbGU6IC9jdnMvc3JjL3N5cy9hbHBoYS9hbHBoYS9k ZWNfYXhwcGNpXzMzLmMsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjExDQpk aWZmIC11IC1yMS4xMSBkZWNfYXhwcGNpXzMzLmMNCi0tLSBhbHBoYS9kZWNf YXhwcGNpXzMzLmMJMjAwMS8wMi8wMSAyMTo1OTowMAkxLjExDQorKysgYWxw aGEvZGVjX2F4cHBjaV8zMy5jCTIwMDEvMDMvMTcgMTk6NTA6MTINCkBAIC01 Niw2ICs1Niw3IEBADQogdm9pZCBkZWNfYXhwcGNpXzMzX2luaXQgX19QKCh2 b2lkKSk7DQogc3RhdGljIHZvaWQgZGVjX2F4cHBjaV8zM19jb25zX2luaXQg X19QKCh2b2lkKSk7DQogc3RhdGljIGludCBkZWNfYXhwcGNpXzMzX2ludHJf cm91dGUgIF9fUCgoZGV2aWNlX3QsIGRldmljZV90LCBpbnQpKTsNCitpbnQg ZGVjX2F4cHBjaV8zM19pbnRyX21hcCh1X2ludCwgaW50KTsNCiANCiBleHRl cm4gaW50IHNpb2NuYXR0YWNoIF9fUCgoaW50LCBpbnQpKTsNCiBleHRlcm4g aW50IHNpb2dkYmF0dGFjaCBfX1AoKGludCwgaW50KSk7DQpAQCAtOTEsNyAr OTIsNyBAQA0KIAkJCXBsYXRmb3JtLm1vZGVsID0gYWxwaGFfdW5rbm93bl9z eXNuYW1lKCk7DQogCX0NCiANCi0JcGxhdGZvcm0uaW9idXMgPSAibGNhIjsN CisJcGxhdGZvcm0uaW9idXMgPSAiYXhwcGNpMzNfbGNhIjsNCiAJcGxhdGZv cm0uY29uc19pbml0ID0gZGVjX2F4cHBjaV8zM19jb25zX2luaXQ7DQogCXBs YXRmb3JtLnBjaV9pbnRyX3JvdXRlID0gZGVjX2F4cHBjaV8zM19pbnRyX3Jv dXRlOw0KIA0KQEAgLTEyMCw5ICsxMjEsMTEgQEANCiANCiAJbGNhX2luaXQo KTsNCiANCisjaWYgMA0KICNpZmRlZiBEREINCiAJc2lvZ2RiYXR0YWNoKDB4 MmY4LCA5NjAwKTsNCiAjZW5kaWYNCisjZW5kaWYNCiAJY3RiID0gKHN0cnVj dCBjdGIgKikoKChjYWRkcl90KWh3cnBiKSArIGh3cnBiLT5ycGJfY3RiX29m Zik7DQogDQogCXN3aXRjaCAoY3RiLT5jdGJfdGVybV90eXBlKSB7DQpAQCAt MTY2LDEwICsxNjksMTUgQEANCiB9DQogDQogI2RlZmluZQlTSU9fUENJUkVH X1BJUlFfUlRDVFJMCTB4NjAJLyogUElSUTAgUm91dGUgQ29udHJvbCAqLw0K LQ0KIHN0YXRpYyBpbnQNCiBkZWNfYXhwcGNpXzMzX2ludHJfcm91dGUoZGV2 aWNlX3QgcGNpYiwgZGV2aWNlX3QgZGV2LCBpbnQgcGluKQ0KIHsNCisJcmV0 dXJuIChkZWNfYXhwcGNpXzMzX2ludHJfbWFwKHBjaV9nZXRfc2xvdChkZXYp LCBwaW4pKTsNCit9DQorDQoraW50DQorZGVjX2F4cHBjaV8zM19pbnRyX21h cCh1X2ludCBzLCBpbnQgcGluKQ0KK3sNCiAJaW50IHBpcnE7DQogCXVfaW50 MzJfdCBwaXJxcmVnOw0KIAl1X2ludDhfdCBwaXJxbGluZTsNCkBAIC0xODIs NyArMTkwLDcgQEANCiAJICogU2xvdC0+aW50ZXJydXB0IHRyYW5zbGF0aW9u LiAgVGFrZW4gZnJvbSBOZXRCU0QuDQogCSAqLw0KIA0KLQlzd2l0Y2ggKHBj aV9nZXRfc2xvdChkZXYpKSB7DQorCXN3aXRjaCAocykgew0KIAljYXNlIDY6 CQkJCQkvKiBOQ1IgU0NTSSAqLw0KIAkJcGlycSA9IDM7DQogCQlicmVhazsN CkBAIC0yMzQsNyArMjQyLDcgQEANCiANCiAJZGVmYXVsdDoNCiAJCXByaW50 ZigiZGVjX2F4cHBjaV8zM19pbnRyX21hcDogd2VpcmQgc2xvdCBudW1iZXIg JWRcbiIsDQotCQkgICAgICAgcGNpX2dldF9zbG90KGRldikpOw0KKwkJICAg ICAgIHMpOw0KIAkJcmV0dXJuKDI1NSk7DQogCX0NCiANCkluZGV4OiBwY2kv bGNhLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zz L3NyYy9zeXMvYWxwaGEvcGNpL2xjYS5jLHYNCnJldHJpZXZpbmcgcmV2aXNp b24gMS4xNA0KZGlmZiAtdSAtcjEuMTQgbGNhLmMNCi0tLSBwY2kvbGNhLmMJ MjAwMC8wOC8yOCAyMTo0ODowMwkxLjE0DQorKysgcGNpL2xjYS5jCTIwMDEv MDMvMTcgMDg6MjY6MzYNCkBAIC0xNDIsNiArMTQyLDEyIEBADQogCXNpemVv ZihzdHJ1Y3QgbGNhX3NvZnRjKSwNCiB9Ow0KIA0KK3N0YXRpYyBkcml2ZXJf dCBheHBwY2kzM19sY2FfZHJpdmVyID0gew0KKwkiYXhwcGNpMzNfbGNhIiwN CisJbGNhX21ldGhvZHMsDQorCXNpemVvZihzdHJ1Y3QgbGNhX3NvZnRjKSwN Cit9Ow0KKw0KICNkZWZpbmUgTENBX1NHTUFQX0JBU0UJCSg4KjEwMjQqMTAy NCkNCiAjZGVmaW5lIExDQV9TR01BUF9TSVpFCQkoOCoxMDI0KjEwMjQpDQog DQpAQCAtMjg1LDQgKzI5MSw0IEBADQogfQ0KIA0KIERSSVZFUl9NT0RVTEUo bGNhLCByb290LCBsY2FfZHJpdmVyLCBsY2FfZGV2Y2xhc3MsIDAsIDApOw0K LQ0KK0RSSVZFUl9NT0RVTEUoYXhwcGNpMzNfbGNhLCByb290LCBheHBwY2kz M19sY2FfZHJpdmVyLCBsY2FfZGV2Y2xhc3MsIDAsIDApOw0KSW5kZXg6IHBj aS9sY2FfcGNpLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxl OiAvY3ZzL3NyYy9zeXMvYWxwaGEvcGNpL2xjYV9wY2kuYyx2DQpyZXRyaWV2 aW5nIHJldmlzaW9uIDEuOQ0KZGlmZiAtdSAtcjEuOSBsY2FfcGNpLmMNCi0t LSBwY2kvbGNhX3BjaS5jCTIwMDAvMTIvMDggMjI6MTE6MjMJMS45DQorKysg cGNpL2xjYV9wY2kuYwkyMDAxLzAzLzE4IDAzOjQyOjEyDQpAQCAtMzMsOSAr MzMsMTEgQEANCiAjaW5jbHVkZSA8c3lzL2J1cy5oPg0KICNpbmNsdWRlIDxt YWNoaW5lL2J1cy5oPg0KICNpbmNsdWRlIDxzeXMvcm1hbi5oPg0KLSNpbmNs dWRlIDxwY2kvcGNpdmFyLmg+DQorI2luY2x1ZGUgPGRldi9wY2kvcGNpdmFy Lmg+DQorI2luY2x1ZGUgPGRldi9wY2kvcGNpcmVnLmg+DQogI2luY2x1ZGUg PG1hY2hpbmUvc3dpei5oPg0KICNpbmNsdWRlIDxtYWNoaW5lL21kX3Zhci5o Pg0KKyNpbmNsdWRlIDxtYWNoaW5lL2NwdWNvbmYuaD4NCiANCiAjaW5jbHVk ZSA8YWxwaGEvcGNpL2xjYXJlZy5oPg0KICNpbmNsdWRlIDxhbHBoYS9wY2kv bGNhdmFyLmg+DQpAQCAtMTMwLDcgKzEzMiwzNCBAQA0KIAlyZXR1cm47CQkJ CQkJCQkgIFwNCiB9IHdoaWxlICgwKQ0KIA0KKy8qIFhYWCBzaG91bGQgbW92 ZSB0byBhIGhlYWRlciBmaWxlIHNvbWV3aGVyZT8gKi8NCitpbnQgZGVjX2F4 cHBjaV8zM19pbnRyX21hcCh1X2ludCwgaW50KTsNCisNCiB1X2ludDMyX3QN CitheHBwY2kzM19sY2FfcGNpYl9yZWFkX2NvbmZpZyhkZXZpY2VfdCBkZXYs IHVfaW50IGIsIHVfaW50IHMsIHVfaW50IGYsDQorCQkgICAgIHVfaW50IHJl ZywgaW50IHdpZHRoKQ0KK3sNCisJaWYgKChyZWcgPT0gUENJUl9JTlRMSU5F KSAmJiAod2lkdGggPT0gMSkpIHsNCisJCXN3aXRjaCAocykgew0KKwkJY2Fz ZSA2OgkJLyogTkNSIFNDU0kgKi8NCisJCWNhc2UgODoJCS8qIFNsb3QgMyAq Lw0KKwkJY2FzZSAxMToJLyogU2xvdCAxICovDQorCQljYXNlIDEyOgkvKiBT bG90IDIgKi8NCisJCXsNCisJCQlpbnQgcGluOw0KKwkJCXBpbiA9IGxjYV9w Y2liX3JlYWRfY29uZmlnKGRldiwgYiwgcywgZiwgUENJUl9JTlRQSU4sIDEp Ow0KKwkJCXJldHVybiAoZGVjX2F4cHBjaV8zM19pbnRyX21hcChzLCBwaW4p KTsNCisJCX0NCisJCWJyZWFrOw0KKwkJZGVmYXVsdDoNCisJCQlicmVhazsN CisJCX0NCisJfQ0KKw0KKwlyZXR1cm4gKGxjYV9wY2liX3JlYWRfY29uZmln KGRldiwgYiwgcywgZiwgcmVnLCB3aWR0aCkpOw0KK30NCisNCit1X2ludDMy X3QNCiBsY2FfcGNpYl9yZWFkX2NvbmZpZyhkZXZpY2VfdCBkZXYsIHVfaW50 IGIsIHVfaW50IHMsIHVfaW50IGYsDQogCQkgICAgIHVfaW50IHJlZywgaW50 IHdpZHRoKQ0KIHsNCkBAIC0xNjIsNiArMTkxLDQxIEBADQogCQlDRkdXUklU RShiLCBzLCBmLCByZWcsIHZhbCwgTE9ORywgdV9pbnQzMl90KTsNCiAJfQ0K IH0NCisNCitzdGF0aWMgZGV2aWNlX21ldGhvZF90IGF4cHBjaTMzX2xjYV9w Y2liX21ldGhvZHNbXSA9IHsNCisJLyogRGV2aWNlIGludGVyZmFjZSAqLw0K KwlERVZNRVRIT0QoZGV2aWNlX3Byb2JlLAkJbGNhX3BjaWJfcHJvYmUpLA0K KwlERVZNRVRIT0QoZGV2aWNlX2F0dGFjaCwJYnVzX2dlbmVyaWNfYXR0YWNo KSwNCisNCisJLyogQnVzIGludGVyZmFjZSAqLw0KKwlERVZNRVRIT0QoYnVz X3ByaW50X2NoaWxkLAlidXNfZ2VuZXJpY19wcmludF9jaGlsZCksDQorCURF Vk1FVEhPRChidXNfcmVhZF9pdmFyLAlsY2FfcGNpYl9yZWFkX2l2YXIpLA0K KwlERVZNRVRIT0QoYnVzX2FsbG9jX3Jlc291cmNlLAlidXNfZ2VuZXJpY19h bGxvY19yZXNvdXJjZSksDQorCURFVk1FVEhPRChidXNfcmVsZWFzZV9yZXNv dXJjZSwJYnVzX2dlbmVyaWNfcmVsZWFzZV9yZXNvdXJjZSksDQorCURFVk1F VEhPRChidXNfYWN0aXZhdGVfcmVzb3VyY2UsIGJ1c19nZW5lcmljX2FjdGl2 YXRlX3Jlc291cmNlKSwNCisJREVWTUVUSE9EKGJ1c19kZWFjdGl2YXRlX3Jl c291cmNlLCBidXNfZ2VuZXJpY19kZWFjdGl2YXRlX3Jlc291cmNlKSwNCisJ REVWTUVUSE9EKGJ1c19zZXR1cF9pbnRyLAlidXNfZ2VuZXJpY19zZXR1cF9p bnRyKSwNCisJREVWTUVUSE9EKGJ1c190ZWFyZG93bl9pbnRyLAlidXNfZ2Vu ZXJpY190ZWFyZG93bl9pbnRyKSwNCisNCisJLyogYWxwaGFwY2kgaW50ZXJm YWNlICovDQorCURFVk1FVEhPRChhbHBoYXBjaV9jdnRfZGVuc2UsCWxjYV9w Y2liX2N2dF9kZW5zZSksDQorDQorCS8qIHBjaWIgaW50ZXJmYWNlICovDQor CURFVk1FVEhPRChwY2liX21heHNsb3RzLAlsY2FfcGNpYl9tYXhzbG90cyks DQorCURFVk1FVEhPRChwY2liX3JlYWRfY29uZmlnLAlheHBwY2kzM19sY2Ff cGNpYl9yZWFkX2NvbmZpZyksDQorCURFVk1FVEhPRChwY2liX3dyaXRlX2Nv bmZpZywJbGNhX3BjaWJfd3JpdGVfY29uZmlnKSwNCisJREVWTUVUSE9EKHBj aWJfcm91dGVfaW50ZXJydXB0LAlhbHBoYV9wY2lfcm91dGVfaW50ZXJydXB0 KSwNCisNCisJeyAwLCAwIH0NCit9Ow0KKw0KK3N0YXRpYyBkcml2ZXJfdCBh eHBwY2kzM19sY2FfcGNpYl9kcml2ZXIgPSB7DQorCSJwY2liIiwNCisJYXhw cGNpMzNfbGNhX3BjaWJfbWV0aG9kcywNCisJMSwNCit9Ow0KKw0KK0RSSVZF Ul9NT0RVTEUocGNpYiwgYXhwcGNpMzNfbGNhLCBheHBwY2kzM19sY2FfcGNp Yl9kcml2ZXIsIHBjaWJfZGV2Y2xhc3MsIDAsIDApOw0KIA0KIHN0YXRpYyBk ZXZpY2VfbWV0aG9kX3QgbGNhX3BjaWJfbWV0aG9kc1tdID0gew0KIAkvKiBE ZXZpY2UgaW50ZXJmYWNlICovDQpJbmRleDogcGNpL2xjYXZhci5oDQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2cy9zcmMvc3lzL2Fs cGhhL3BjaS9sY2F2YXIuaCx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNA0K ZGlmZiAtdSAtcjEuNCBsY2F2YXIuaA0KLS0tIHBjaS9sY2F2YXIuaAkyMDAw LzEyLzAxIDE1OjI3OjQ4CTEuNA0KKysrIHBjaS9sY2F2YXIuaAkyMDAxLzAz LzE3IDA1OjU5OjExDQpAQCAtMzEsMyArMzEsNSBAQA0KIGV4dGVybiB2b2lk IGxjYV9pbml0KHZvaWQpOw0KIHVfaW50MzJfdCBsY2FfcGNpYl9yZWFkX2Nv bmZpZyhzdHJ1Y3QgZGV2aWNlICpkZXYsIHVfaW50IGIsIHVfaW50IHMsIHVf aW50IGYsDQogCQkJICAgICAgIHVfaW50IHJlZywgaW50IHdpZHRoKTsNCit1 X2ludDMyX3QgYXhwcGNpMzNfbGNhX3BjaWJfcmVhZF9jb25maWcoc3RydWN0 IGRldmljZSAqZGV2LCB1X2ludCBiLCB1X2ludCBzLA0KKwkJCQkJdV9pbnQg ZiwgdV9pbnQgcmVnLCBpbnQgd2lkdGgpOw0K --0-1221869499-984958237=:54019-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-alpha" in the body of the message