Date: Sun, 10 Sep 2000 15:33:43 -0700 (PDT) From: Matthew Jacob <mjacob@feral.com> To: Peter Wemm <peter@netplex.com.au>, Bernd Walter <ticso@cicely5.cicely.de>, Christian Weisgerber <naddy@mips.inka.de> Cc: freebsd-alpha@FreeBSD.ORG Subject: Re: cvs commit: src/sys/pci pcisupport.c (fwd) Message-ID: <Pine.LNX.4.21.0009101520380.23495-200000@zeppo.feral.com> In-Reply-To: <200009100808.e8A88FG76895@netplex.com.au>
next in thread | previous 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. --1136674726-598072241-968625223=:23495 Content-Type: TEXT/PLAIN; charset=US-ASCII The following diffs worked for me. I'm in a hurry, otherwise I'd analyze this more closely. The main ideas here are 1) determination of type of chipset should be done cia_probe 2) Pyxis *should* imply BWX. But they're not the same thing, really. 3) (for now) chipset_bwx is the gating item, and it's a true/false value, while the ivar (which really should just be removed) is a uintptr_t. 4) While I was at it, the correct test for implver is < ALPHA_IMPLVER_EV5 (I assume that ALPHA_IMPLVER_EV6 has BWX). The cia.c file didn't change in the smp merge, so this should be orthogonal to the change (I haven't yet run with top of tree). Can somebody test the attached diff against an SX or an LX to make sure it's right? If so, I'll commit it, or Peter can commit it if he's around, etc... Much as I despise BWX, this encourages me to add this into rawhide. -matt --1136674726-598072241-968625223=:23495 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="cia.c.diff" Content-Transfer-Encoding: BASE64 Content-ID: <Pine.LNX.4.21.0009101533430.23495@zeppo.feral.com> Content-Description: Content-Disposition: attachment; filename="cia.c.diff" SW5kZXg6IGFscGhhL3BjaS9jaWEuYw0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQ0KUkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL3N5cy9hbHBoYS9wY2kvY2lh LmMsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjI3DQpkaWZmIC11IC1yMS4y NyBjaWEuYw0KLS0tIGFscGhhL3BjaS9jaWEuYwkyMDAwLzA5LzAyIDAxOjA1 OjM3CTEuMjcNCisrKyBhbHBoYS9wY2kvY2lhLmMJMjAwMC8wOS8xMCAyMjoy NTo0Mw0KQEAgLTM1NSwzMSArMzU1LDcgQEANCiAJaWYgKGluaXR0ZWQpIHJl dHVybjsNCiAJaW5pdHRlZCA9IDE7DQogDQotCWNpYV9yZXYgPSBSRUdWQUwo Q0lBX0NTUl9SRVYpICYgUkVWX01BU0s7DQotDQotCS8qDQotCSAqIERldGVy bWluZSBpZiB3ZSBoYXZlIGEgUHl4aXMuICBPbmx5IHR3byBzeXN0eXBlcyBj YW4NCi0JICogaGF2ZSB0aGlzOiB0aGUgRUIxNjQgc3lzdHlwZSAoQWxwaGFQ QzE2NExYIGFuZCBBbHBoYVBDMTY0U1gpDQotCSAqIGFuZCB0aGUgREVDX1NU NTUwIHN5c3R5cGUgKE1pYXRhKS4NCi0JICovDQotCWlmICgoaHdycGItPnJw Yl90eXBlID09IFNUX0VCMTY0ICYmDQotCSAgICAgKGh3cnBiLT5ycGJfdmFy aWF0aW9uICYgU1ZfU1RfTUFTSykgPj0gU1ZfU1RfQUxQSEFQQzE2NExYXzQw MCkgfHwNCi0JICAgIGh3cnBiLT5ycGJfdHlwZSA9PSBTVF9ERUNfNTUwKQ0K LQkJY2lhX2lzcHl4aXMgPSBUUlVFOw0KLQllbHNlDQotCQljaWFfaXNweXhp cyA9IEZBTFNFOw0KLQkNCi0JLyoNCi0JICogQUxDT1IvQUxDT1IyIFJldmlz aW9ucyA+PSAyIGFuZCBQeXhpcyBoYXZlIHRoZSBDTkZHIHJlZ2lzdGVyLg0K LQkgKi8NCi0JaWYgKGNpYV9yZXYgPj0gMiB8fCBjaWFfaXNweXhpcykNCi0J CWNpYV9jb25maWcgPSBSRUdWQUwoQ0lBX0NTUl9DTkZHKTsNCi0JZWxzZQ0K LQkJY2lhX2NvbmZpZyA9IDA7DQotDQotCWlmIChhbHBoYV9pbXBsdmVyKCkg IT0gQUxQSEFfSU1QTFZFUl9FVjUNCi0JICAgIHx8IGFscGhhX2FtYXNrKEFM UEhBX0FNQVNLX0JXWCkNCi0JICAgIHx8ICEoY2lhX2NvbmZpZyAmIENORkdf QldFTikpIHsNCisJaWYgKGNoaXBzZXRfYnd4ID09IDApIHsNCiAJCXN3aXpf aW5pdF9zcGFjZSgmaW9fc3BhY2Uuc3dpeiwgS1YoQ0lBX1BDSV9TSU8xKSk7 DQogCQlzd2l6X2luaXRfc3BhY2VfaGFlKCZtZW1fc3BhY2Uuc3dpeiwgS1Yo Q0lBX1BDSV9TTUVNMSksDQogCQkJCSAgICBjaWFfc3dpel9zZXRfaGFlX21l bSwgMCk7DQpAQCAtNDEzLDE3ICszODksNDggQEANCiAJcGNpX2luaXRfcmVz b3VyY2VzKCk7DQogCWlzYV9pbml0X2ludHIoKTsNCiAJY2lhX2luaXRfc2dt YXAoKTsNCisNCisJY2lhX3JldiA9IFJFR1ZBTChDSUFfQ1NSX1JFVikgJiBS RVZfTUFTSzsNCisNCisJLyoNCisJICogRGV0ZXJtaW5lIGlmIHdlIGhhdmUg YSBQeXhpcy4gIE9ubHkgdHdvIHN5c3R5cGVzIGNhbg0KKwkgKiBoYXZlIHRo aXM6IHRoZSBFQjE2NCBzeXN0eXBlIChBbHBoYVBDMTY0TFggYW5kIEFscGhh UEMxNjRTWCkNCisJICogYW5kIHRoZSBERUNfU1Q1NTAgc3lzdHlwZSAoTWlh dGEpLg0KKwkgKi8NCisJaWYgKChod3JwYi0+cnBiX3R5cGUgPT0gU1RfRUIx NjQgJiYNCisJICAgICAoaHdycGItPnJwYl92YXJpYXRpb24gJiBTVl9TVF9N QVNLKSA+PSBTVl9TVF9BTFBIQVBDMTY0TFhfNDAwKSB8fA0KKwkgICAgaHdy cGItPnJwYl90eXBlID09IFNUX0RFQ181NTApDQorCQljaWFfaXNweXhpcyA9 IFRSVUU7DQorCWVsc2UNCisJCWNpYV9pc3B5eGlzID0gRkFMU0U7DQorCQ0K Kw0KIA0KLQlpZiAoYWxwaGFfaW1wbHZlcigpICE9IEFMUEhBX0lNUExWRVJf RVY1DQotCSAgICB8fCBhbHBoYV9hbWFzayhBTFBIQV9BTUFTS19CV1gpDQot CSAgICB8fCAhKGNpYV9jb25maWcgJiBDTkZHX0JXRU4pKQ0KKwkvKg0KKwkg KiBBTENPUi9BTENPUjIgUmV2aXNpb25zID49IDIgYW5kIFB5eGlzIGhhdmUg dGhlIENORkcgcmVnaXN0ZXIuDQorCSAqLw0KKwlpZiAoY2lhX3JldiA+PSAy IHx8IGNpYV9pc3B5eGlzKQ0KKwkJY2lhX2NvbmZpZyA9IFJFR1ZBTChDSUFf Q1NSX0NORkcpOw0KKwllbHNlDQorCQljaWFfY29uZmlnID0gMDsNCisNCisJ aWYgKChhbHBoYV9pbXBsdmVyKCkgPCBBTFBIQV9JTVBMVkVSX0VWNSkgfHwN CisJICAgIChhbHBoYV9hbWFzayhBTFBIQV9BTUFTS19CV1gpICE9IDApIHx8 DQorCSAgICAoY2lhX2NvbmZpZyAmIENORkdfQldFTikgPT0gMCkgew0KIAkJ dXNlX2J3eCA9IDA7DQorCX0gZWxzZSB7DQorCQl1c2VfYnd4ID0gMTsNCisJ fQ0KIA0KKwlpZiAoY2lhX2lzcHl4aXMpIHsNCisJCWlmICh1c2VfYnd4ID09 IDApIHsNCisJCQlwcmludGYoIlBZWElTIGJ1dCBub3QgQldYP1xuIik7DQor CQl9DQorCX0NCisNCiAJZGV2aWNlX2FkZF9jaGlsZChkZXYsICJwY2liIiwg MCk7DQogCWRldmljZV9zZXRfaXZhcnMoZGV2LCAodm9pZCAqKXVzZV9id3gp Ow0KLQkNCi0JY2hpcHNldF9id3ggPSB1c2VfYnd4Ow0KLQ0KKwljaGlwc2V0 X2J3eCA9IHVzZV9id3ggPSAodXNlX2J3eCA9PSAodWludHB0cl90KSAxKTsN CiAJcmV0dXJuIDA7DQogfQ0KIA0KQEAgLTQ4NSwxNCArNDkyLDE0IEBADQog CWlmICghcGxhdGZvcm0uaW9pbnRyKQkvKiBYWFggKi8NCiAJCXNldF9pb2lu dHIoYWxwaGFfZGlzcGF0Y2hfaW50cik7DQogDQotCWlmIChjaWFfaXNweXhp cykgew0KLQkJc25wcmludGYoY2hpcHNldF90eXBlLCBzaXplb2YoY2hpcHNl dF90eXBlKSwgInB5eGlzIik7DQorCWlmIChjaGlwc2V0X2J3eCkgew0KKwkJ c25wcmludGYoY2hpcHNldF90eXBlLCBzaXplb2YoY2hpcHNldF90eXBlKSwg ImNpYS9id3giKTsNCiAJCWNoaXBzZXRfYnd4ID0gMTsNCiAJCWNoaXBzZXRf cG9ydHMgPSBDSUFfRVY1Nl9CV0lPOw0KIAkJY2hpcHNldF9tZW1vcnkgPSBD SUFfRVY1Nl9CV01FTTsNCiAJCWNoaXBzZXRfZGVuc2UgPSBDSUFfUENJX0RF TlNFOw0KIAl9IGVsc2Ugew0KLQkJc25wcmludGYoY2hpcHNldF90eXBlLCBz aXplb2YoY2hpcHNldF90eXBlKSwgImNpYSIpOw0KKwkJc25wcmludGYoY2hp cHNldF90eXBlLCBzaXplb2YoY2hpcHNldF90eXBlKSwgImNpYS9zd2l6Iik7 DQogCQljaGlwc2V0X2J3eCA9IDA7DQogCQljaGlwc2V0X3BvcnRzID0gQ0lB X1BDSV9TSU8xOw0KIAkJY2hpcHNldF9tZW1vcnkgPSBDSUFfUENJX1NNRU0x Ow0KSW5kZXg6IGNhbS9zY3NpL3Njc2lfc2EuYw0K --1136674726-598072241-968625223=:23495-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-alpha" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.LNX.4.21.0009101520380.23495-200000>