Date: Mon, 17 May 2010 20:03:12 +0530 From: "C. Jayachandran" <c.jayachandran@gmail.com> To: Neel Natu <neelnatu@gmail.com> Cc: freebsd-mips@freebsd.org Subject: Minor fixup for the MIPS SMP platform code. Message-ID: <AANLkTikjF2SUa5GomVRtus176hjKyUyPAeDF-p1kwCcO@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--000325565372cfa0d00486cb1a00 Content-Type: text/plain; charset=ISO-8859-1 The attached patch (also at http://sites.google.com/site/cjayachandran/files) has two changes: - moves the intr masking code to platform_init_ap, so that we can avoid the #ifdef for XLR - adds a platform_smp_topo() function so that platforms can define their topology I've also attempted to fixup sys/mips/sibyte to reflect these changes, but it might need further work. sys/mips/cavium also might need similar changes for SMP. Please review and apply if the changes are okay. Thanks, JC. --000325565372cfa0d00486cb1a00 Content-Type: text/x-patch; charset=US-ASCII; name="mips-smp-fixup.patch" Content-Disposition: attachment; filename="mips-smp-fixup.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g9be665n0 SW5kZXg6IHN5cy9taXBzL3NpYnl0ZS9zYl9tYWNoZGVwLmMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL21p cHMvc2lieXRlL3NiX21hY2hkZXAuYwkocmV2aXNpb24gMjA4MTgzKQorKysgc3lzL21pcHMvc2li eXRlL3NiX21hY2hkZXAuYwkod29ya2luZyBjb3B5KQpAQCAtMzQ0LDkgKzM0NCwxNiBAQAogCXJl dHVybiAoNCk7CiB9CiAKK3N0cnVjdCBjcHVfZ3JvdXAgKgorcGxhdGZvcm1fc21wX3RvcG8odm9p ZCkKK3sKKwlyZXR1cm4gKHNtcF90b3BvX25vbmUoKSk7Cit9CisKIHZvaWQKIHBsYXRmb3JtX2lu aXRfYXAoaW50IGNwdWlkKQogeworCWludCBpcGlfaW50X21hc2ssIGNsb2NrX2ludF9tYXNrOwog CiAJS0FTU0VSVChjcHVpZCA9PSAxLCAoIkFQIGhhcyBhbiBpbnZhbGlkIGNwdSBpZCAlZCIsIGNw dWlkKSk7CiAKQEAgLTM1Niw2ICszNjMsMTMgQEAKIAlrc2VnMF9tYXBfY29oZXJlbnQoKTsKIAog CXNiX2ludHJfaW5pdChjcHVpZCk7CisKKwkvKgorCSAqIFVubWFzayB0aGUgY2xvY2sgYW5kIGlw aSBpbnRlcnJ1cHRzLgorCSAqLworCWNsb2NrX2ludF9tYXNrID0gaGFyZF9pbnRfbWFzayg1KTsK KwlpcGlfaW50X21hc2sgPSBoYXJkX2ludF9tYXNrKHBsYXRmb3JtX2lwaV9pbnRybnVtKCkpOwor CXNldF9pbnRyX21hc2soQUxMX0lOVF9NQVNLICYgfihpcGlfaW50X21hc2sgfCBjbG9ja19pbnRf bWFzaykpOwogfQogCiBpbnQKSW5kZXg6IHN5cy9taXBzL2luY2x1ZGUvaHdmdW5jLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gc3lzL21pcHMvaW5jbHVkZS9od2Z1bmMuaAkocmV2aXNpb24gMjA4MTgzKQorKysg c3lzL21pcHMvaW5jbHVkZS9od2Z1bmMuaAkod29ya2luZyBjb3B5KQpAQCAtOTMsNSArOTMsMTEg QEAKICAqLwogZXh0ZXJuIGludCBwbGF0Zm9ybV9udW1fcHJvY2Vzc29ycyh2b2lkKTsKIAorLyoK KyAqIFJldHVybiB0aGUgdG9wb2xvZ3kgb2YgcHJvY2Vzc29ycyBvbiB0aGlzIHBsYXRmb3JtCisg Ki8KK3N0cnVjdCBjcHVfZ3JvdXAgKiBwbGF0Zm9ybV9zbXBfdG9wbyh2b2lkKTsKKworCiAjZW5k aWYJLyogU01QICovCiAjZW5kaWYgLyogIV9NQUNISU5FX0hXRlVOQ19IXyAqLwpJbmRleDogc3lz L21pcHMvcm1pL3hscl9tYWNoZGVwLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL21pcHMvcm1pL3hscl9t YWNoZGVwLmMJKHJldmlzaW9uIDIwODE4MykKKysrIHN5cy9taXBzL3JtaS94bHJfbWFjaGRlcC5j CSh3b3JraW5nIGNvcHkpCkBAIC01MzUsNiArNTM1LDggQEAKIAkvKiBTZXR1cCBpbnRlcnJ1cHRz IGZvciBzZWNvbmRhcnkgQ1BVcyBoZXJlICovCiAJc3RhdCA9IG1pcHNfcmRfc3RhdHVzKCk7CiAJ c3RhdCB8PSBNSVBTX1NSX0NPUF8yX0JJVCB8IE1JUFNfU1JfQ09QXzBfQklUOworCUtBU1NFUlQo KHN0YXQgJiBNSVBTX1NSX0lOVF9JRSkgPT0gMCwKKwkgICAgKCJJbnRlcnJ1cHRzIGVuYWJsZWQg aW4gJXMhIiwgX19mdW5jX18pKTsKIAltaXBzX3dyX3N0YXR1cyhzdGF0KTsKIAogCXhscl91bm1h c2tfaGFyZF9pcnEoKHZvaWQgKilwbGF0Zm9ybV9pcGlfaW50cm51bSgpKTsKQEAgLTU3MCw0ICs1 NzIsMTEgQEAKIHsKIAlyZXR1cm4gZmxzKHhscl9ib290MV9pbmZvLmNwdV9vbmxpbmVfbWFwKTsK IH0KKworc3RydWN0IGNwdV9ncm91cCAqCitwbGF0Zm9ybV9zbXBfdG9wbygpCit7CisJcmV0dXJu IHNtcF90b3BvXzJsZXZlbChDR19TSEFSRV9MMiwgcGxhdGZvcm1fbnVtX3Byb2Nlc3NvcnMoKS80 LAorCSAgICBDR19TSEFSRV9MMSwgNCwgQ0dfRkxBR19USFJFQUQpOworfQogI2VuZGlmCkluZGV4 OiBzeXMvbWlwcy9taXBzL21wYm9vdC5TCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN5cy9taXBzL21pcHMvbXBi b290LlMJKHJldmlzaW9uIDIwODE4MykKKysrIHN5cy9taXBzL21pcHMvbXBib290LlMJKHdvcmtp bmcgY29weSkKQEAgLTc2LDEwICs3Niw4IEBACiAKIAlQVFJfTEEJZ3AsIF9DX0xBQkVMKF9ncCkK IAotI2lmbmRlZiBUQVJHRVRfWExSX1hMUwogCWphbAlwbGF0Zm9ybV9pbml0X2FwCiAJbW92ZQlh MCwgczAKLSNlbmRpZgogCWphbAlzbXBfaW5pdF9zZWNvbmRhcnkKIAltb3ZlCWEwLCBzMAogCklu ZGV4OiBzeXMvbWlwcy9taXBzL21wX21hY2hkZXAuYwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXMvbWlwcy9t aXBzL21wX21hY2hkZXAuYwkocmV2aXNpb24gMjA4MTgzKQorKysgc3lzL21pcHMvbWlwcy9tcF9t YWNoZGVwLmMJKHdvcmtpbmcgY29weSkKQEAgLTE5Niw4ICsxOTYsNyBAQAogc3RydWN0IGNwdV9n cm91cCAqCiBjcHVfdG9wbyh2b2lkKQogewotCi0JcmV0dXJuIChzbXBfdG9wb19ub25lKCkpOwor CXJldHVybiBwbGF0Zm9ybV9zbXBfdG9wbygpOwogfQogCiBpbnQKQEAgLTIzOCwxMCArMjM3LDYg QEAKIHZvaWQKIHNtcF9pbml0X3NlY29uZGFyeSh1X2ludDMyX3QgY3B1aWQpCiB7Ci0jaWZuZGVm IFRBUkdFVF9YTFJfWExTCi0JaW50IGlwaV9pbnRfbWFzaywgY2xvY2tfaW50X21hc2s7Ci0jZW5k aWYKLQogCS8qIFRMQiAqLwogCU1pcHNfU2V0V0lSRUQoMCk7CiAJTWlwc19UTEJGbHVzaChudW1f dGxiZW50cmllcyk7CkBAIC0yOTQsMTggKzI4OSw3IEBACiAJd2hpbGUgKHNtcF9zdGFydGVkID09 IDApCiAJCTsgLyogbm90aGluZyAqLwogCi0jaWZuZGVmIFRBUkdFVF9YTFJfWExTCiAJLyoKLQkg KiBVbm1hc2sgdGhlIGNsb2NrIGFuZCBpcGkgaW50ZXJydXB0cy4KLQkgKi8KLQljbG9ja19pbnRf bWFzayA9IGhhcmRfaW50X21hc2soNSk7Ci0JaXBpX2ludF9tYXNrID0gaGFyZF9pbnRfbWFzayhw bGF0Zm9ybV9pcGlfaW50cm51bSgpKTsKLQlzZXRfaW50cl9tYXNrKEFMTF9JTlRfTUFTSyAmIH4o aXBpX2ludF9tYXNrIHwgY2xvY2tfaW50X21hc2spKTsKLSNlbHNlCi0JcGxhdGZvcm1faW5pdF9h cChjcHVpZCk7Ci0jZW5kaWYKLQotCS8qCiAJICogQm9vdHN0cmFwIHRoZSBjb21wYXJlIHJlZ2lz dGVyLgogCSAqLwogCW1pcHNfd3JfY29tcGFyZShtaXBzX3JkX2NvdW50KCkgKyBjb3VudGVyX2Zy ZXEgLyBoeik7Cg== --000325565372cfa0d00486cb1a00--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTikjF2SUa5GomVRtus176hjKyUyPAeDF-p1kwCcO>