From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IzvVw-0005Tt-0p for qemu-devel@nongnu.org; Wed, 05 Dec 2007 09:46:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IzvVt-0005Qx-V3 for qemu-devel@nongnu.org; Wed, 05 Dec 2007 09:46:15 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IzvVt-0005Qd-O8 for qemu-devel@nongnu.org; Wed, 05 Dec 2007 09:46:13 -0500 Received: from rn-out-0910.google.com ([64.233.170.186] helo=rn-out-0102.google.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IzvVt-0006Nb-9Q for qemu-devel@nongnu.org; Wed, 05 Dec 2007 09:46:13 -0500 Received: by rn-out-0102.google.com with SMTP id i19so18079rng for ; Wed, 05 Dec 2007 06:46:12 -0800 (PST) Message-ID: Date: Wed, 5 Dec 2007 23:46:12 +0900 From: "Magnus Damm" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_179_29616940.1196865972898" Subject: [Qemu-devel] [PATCH] sh4: add interrupt support to sh_timer.c Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ------=_Part_179_29616940.1196865972898 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi everyone, This patch adds interrupt support to the sh specific timer code. Tested with a 2.6.24-rc guest kernel. hw/sh.h | 7 ++++++- hw/sh7750.c | 12 +++++++++--- hw/sh_timer.c | 32 ++++++++++++++++++-------------- 3 files changed, 33 insertions(+), 18 deletions(-) / magnus ------=_Part_179_29616940.1196865972898 Content-Type: application/octet-stream; name=qemu-cvs-20071128-sh-timer.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_f9tyzibc0 Content-Disposition: attachment; filename=qemu-cvs-20071128-sh-timer.patch LS0tIDAwMDEvaHcvc2guaAorKysgd29yay9ody9zaC5oCTIwMDctMTEtMjggMTk6MTk6MTUuMDAw MDAwMDAwICswOTAwCkBAIC0yLDYgKzIsOCBAQAogI2RlZmluZSBRRU1VX1NIX0gKIC8qIERlZmlu aXRpb25zIGZvciBTSCBib2FyZCBlbXVsYXRpb24uICAqLwogCisjaW5jbHVkZSAic2hfaW50Yy5o IgorCiAvKiBzaDc3NTAuYyAqLwogc3RydWN0IFNINzc1MFN0YXRlOwogCkBAIC0yNSw3ICsyNywx MCBAQCBpbnQgc2g3NzUwX3JlZ2lzdGVyX2lvX2RldmljZShzdHJ1Y3QgU0g3CiAjZGVmaW5lIFRN VTAxMl9GRUFUX1RPQ1IgICAoMSA8PCAwKQogI2RlZmluZSBUTVUwMTJfRkVBVF8zQ0hBTiAgKDEg PDwgMSkKICNkZWZpbmUgVE1VMDEyX0ZFQVRfRVhUQ0xLICgxIDw8IDIpCi12b2lkIHRtdTAxMl9p bml0KHVpbnQzMl90IGJhc2UsIGludCBmZWF0LCB1aW50MzJfdCBmcmVxKTsKK3ZvaWQgdG11MDEy X2luaXQodGFyZ2V0X3BoeXNfYWRkcl90IGJhc2UsIGludCBmZWF0LCB1aW50MzJfdCBmcmVxLAor CQkgc3RydWN0IGludGNfc291cmNlICpjaDBfaXJxLCBzdHJ1Y3QgaW50Y19zb3VyY2UgKmNoMV9p cnEsCisJCSBzdHJ1Y3QgaW50Y19zb3VyY2UgKmNoMl9pcnEwLCBzdHJ1Y3QgaW50Y19zb3VyY2Ug KmNoMl9pcnExKTsKKwogCiAvKiBzaF9zZXJpYWwuYyAqLwogI2RlZmluZSBTSF9TRVJJQUxfRkVB VF9TQ0lGICgxIDw8IDApCi0tLSAwMDA2L2h3L3NoNzc1MC5jCisrKyB3b3JrL2h3L3NoNzc1MC5j CTIwMDctMTEtMjggMTk6MTg6MTguMDAwMDAwMDAwICswOTAwCkBAIC01NTksOCArNTU5LDExIEBA IFNINzc1MFN0YXRlICpzaDc3NTBfaW5pdChDUFVTSDRTdGF0ZSAqIGMKIAogICAgIHRtdTAxMl9p bml0KDB4MWZkODAwMDAsCiAJCVRNVTAxMl9GRUFUX1RPQ1IgfCBUTVUwMTJfRkVBVF8zQ0hBTiB8 IFRNVTAxMl9GRUFUX0VYVENMSywKLQkJcy0+cGVyaXBoX2ZyZXEpOwotCisJCXMtPnBlcmlwaF9m cmVxLAorCQlzaF9pbnRjX3NvdXJjZSgmcy0+aW50YywgVE1VMCksCisJCXNoX2ludGNfc291cmNl KCZzLT5pbnRjLCBUTVUxKSwKKwkJc2hfaW50Y19zb3VyY2UoJnMtPmludGMsIFRNVTJfVFVOSSks CisJCXNoX2ludGNfc291cmNlKCZzLT5pbnRjLCBUTVUyX1RJQ1BJKSk7CiAKICAgICBpZiAoY3B1 X21vZGVsICYgKFNIX0NQVV9TSDc3NTAgfCBTSF9DUFVfU0g3NzUwUyB8IFNIX0NQVV9TSDc3NTEp KSB7CiAgICAgICAgIHNoX2ludGNfcmVnaXN0ZXJfc291cmNlcygmcy0+aW50YywgCkBAIC01Nzgs NyArNTgxLDEwIEBAIFNINzc1MFN0YXRlICpzaDc3NTBfaW5pdChDUFVTSDRTdGF0ZSAqIGMKICAg ICAgICAgc2hfaW50Y19yZWdpc3Rlcl9zb3VyY2VzKCZzLT5pbnRjLCAKIAkJCQkgX0lOVENfQVJS QVkodmVjdG9yc190bXUzNCksCiAJCQkJIE5VTEwsIDApOwotICAgICAgICB0bXUwMTJfaW5pdCgw eDFlMTAwMDAwLCAwLCBzLT5wZXJpcGhfZnJlcSk7CisgICAgICAgIHRtdTAxMl9pbml0KDB4MWUx MDAwMDAsIDAsIHMtPnBlcmlwaF9mcmVxLAorCQkgICAgc2hfaW50Y19zb3VyY2UoJnMtPmludGMs IFRNVTMpLAorCQkgICAgc2hfaW50Y19zb3VyY2UoJnMtPmludGMsIFRNVTQpLAorCQkgICAgTlVM TCwgTlVMTCk7CiAgICAgfQogCiAgICAgaWYgKGNwdV9tb2RlbCAmIChTSF9DUFVfU0g3NzUxX0FM TCkpIHsKLS0tIDAwMDEvaHcvc2hfdGltZXIuYworKysgd29yay9ody9zaF90aW1lci5jCTIwMDct MTEtMjggMTk6MTg6MTguMDAwMDAwMDAwICswOTAwCkBAIC0zMywyMyArMzMsMjMgQEAgdHlwZWRl ZiBzdHJ1Y3QgewogICAgIHVpbnQzMl90IHRjcHI7CiAgICAgaW50IGZyZXE7CiAgICAgaW50IGlu dF9sZXZlbDsKKyAgICBpbnQgb2xkX2xldmVsOwogICAgIGludCBmZWF0OwogICAgIGludCBlbmFi bGVkOwotICAgIHFlbXVfaXJxIGlycTsKKyAgICBzdHJ1Y3QgaW50Y19zb3VyY2UgKmlycTsKIH0g c2hfdGltZXJfc3RhdGU7CiAKIC8qIENoZWNrIGFsbCBhY3RpdmUgdGltZXJzLCBhbmQgc2NoZWR1 bGUgdGhlIG5leHQgdGltZXIgaW50ZXJydXB0LiAqLwogCiBzdGF0aWMgdm9pZCBzaF90aW1lcl91 cGRhdGUoc2hfdGltZXJfc3RhdGUgKnMpCiB7Ci0jaWYgMCAvKiBub3QgeWV0ICovCi0gICAgLyog VXBkYXRlIGludGVycnVwdHMuICAqLwotICAgIGlmIChzLT5pbnRfbGV2ZWwgJiYgKHMtPnRjciAm IFRJTUVSX1RDUl9VTklFKSkgewotICAgICAgICBxZW11X2lycV9yYWlzZShzLT5pcnEpOwotICAg IH0gZWxzZSB7Ci0gICAgICAgIHFlbXVfaXJxX2xvd2VyKHMtPmlycSk7Ci0gICAgfQotI2VuZGlm CisgICAgaW50IG5ld19sZXZlbCA9IHMtPmludF9sZXZlbCAmJiAocy0+dGNyICYgVElNRVJfVENS X1VOSUUpOworCisgICAgaWYgKG5ld19sZXZlbCAhPSBzLT5vbGRfbGV2ZWwpCisgICAgICBzaF9p bnRjX3RvZ2dsZV9zb3VyY2Uocy0+aXJxLCAwLCBuZXdfbGV2ZWwgPyAxIDogLTEpOworCisgICAg cy0+b2xkX2xldmVsID0gcy0+aW50X2xldmVsOworICAgIHMtPmludF9sZXZlbCA9IG5ld19sZXZl bDsKIH0KIAogc3RhdGljIHVpbnQzMl90IHNoX3RpbWVyX3JlYWQodm9pZCAqb3BhcXVlLCB0YXJn ZXRfcGh5c19hZGRyX3Qgb2Zmc2V0KQpAQCAtMTg1LDcgKzE4NSw3IEBAIHN0YXRpYyB2b2lkIHNo X3RpbWVyX3RpY2sodm9pZCAqb3BhcXVlKQogICAgIHNoX3RpbWVyX3VwZGF0ZShzKTsKIH0KIAot c3RhdGljIHZvaWQgKnNoX3RpbWVyX2luaXQodWludDMyX3QgZnJlcSwgaW50IGZlYXQpCitzdGF0 aWMgdm9pZCAqc2hfdGltZXJfaW5pdCh1aW50MzJfdCBmcmVxLCBpbnQgZmVhdCwgc3RydWN0IGlu dGNfc291cmNlICppcnEpCiB7CiAgICAgc2hfdGltZXJfc3RhdGUgKnM7CiAgICAgUUVNVUJIICpi aDsKQEAgLTE5OCw2ICsxOTgsNyBAQCBzdGF0aWMgdm9pZCAqc2hfdGltZXJfaW5pdCh1aW50MzJf dCBmcmVxCiAgICAgcy0+dGNwciA9IDB4ZGVhZGJlZWY7CiAgICAgcy0+dGNvciA9IDA7CiAgICAg cy0+ZW5hYmxlZCA9IDA7CisgICAgcy0+aXJxID0gaXJxOwogCiAgICAgYmggPSBxZW11X2JoX25l dyhzaF90aW1lcl90aWNrLCBzKTsKICAgICBzLT50aW1lciA9IHB0aW1lcl9pbml0KGJoKTsKQEAg LTMwNSw3ICszMDYsOSBAQCBzdGF0aWMgQ1BVV3JpdGVNZW1vcnlGdW5jICp0bXUwMTJfd3JpdGVm CiAgICAgdG11MDEyX3dyaXRlCiB9OwogCi12b2lkIHRtdTAxMl9pbml0KHVpbnQzMl90IGJhc2Us IGludCBmZWF0LCB1aW50MzJfdCBmcmVxKQordm9pZCB0bXUwMTJfaW5pdCh0YXJnZXRfcGh5c19h ZGRyX3QgYmFzZSwgaW50IGZlYXQsIHVpbnQzMl90IGZyZXEsCisJCSBzdHJ1Y3QgaW50Y19zb3Vy Y2UgKmNoMF9pcnEsIHN0cnVjdCBpbnRjX3NvdXJjZSAqY2gxX2lycSwKKwkJIHN0cnVjdCBpbnRj X3NvdXJjZSAqY2gyX2lycTAsIHN0cnVjdCBpbnRjX3NvdXJjZSAqY2gyX2lycTEpCiB7CiAgICAg aW50IGlvbWVtdHlwZTsKICAgICB0bXUwMTJfc3RhdGUgKnM7CkBAIC0zMTQsMTAgKzMxNywxMSBA QCB2b2lkIHRtdTAxMl9pbml0KHVpbnQzMl90IGJhc2UsIGludCBmZWF0CiAgICAgcyA9ICh0bXUw MTJfc3RhdGUgKilxZW11X21hbGxvY3ooc2l6ZW9mKHRtdTAxMl9zdGF0ZSkpOwogICAgIHMtPmJh c2UgPSBiYXNlOwogICAgIHMtPmZlYXQgPSBmZWF0OwotICAgIHMtPnRpbWVyWzBdID0gc2hfdGlt ZXJfaW5pdChmcmVxLCB0aW1lcl9mZWF0KTsKLSAgICBzLT50aW1lclsxXSA9IHNoX3RpbWVyX2lu aXQoZnJlcSwgdGltZXJfZmVhdCk7CisgICAgcy0+dGltZXJbMF0gPSBzaF90aW1lcl9pbml0KGZy ZXEsIHRpbWVyX2ZlYXQsIGNoMF9pcnEpOworICAgIHMtPnRpbWVyWzFdID0gc2hfdGltZXJfaW5p dChmcmVxLCB0aW1lcl9mZWF0LCBjaDFfaXJxKTsKICAgICBpZiAoZmVhdCAmIFRNVTAxMl9GRUFU XzNDSEFOKQotICAgICAgICBzLT50aW1lclsyXSA9IHNoX3RpbWVyX2luaXQoZnJlcSwgdGltZXJf ZmVhdCB8IFRJTUVSX0ZFQVRfQ0FQVCk7CisgICAgICAgIHMtPnRpbWVyWzJdID0gc2hfdGltZXJf aW5pdChmcmVxLCB0aW1lcl9mZWF0IHwgVElNRVJfRkVBVF9DQVBULAorCQkJCSAgICBjaDJfaXJx MCk7IC8qIGNoMl9pcnExIG5vdCBzdXBwb3J0ZWQgKi8KICAgICBpb21lbXR5cGUgPSBjcHVfcmVn aXN0ZXJfaW9fbWVtb3J5KDAsIHRtdTAxMl9yZWFkZm4sCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0bXUwMTJfd3JpdGVmbiwgcyk7CiAgICAgY3B1X3JlZ2lzdGVyX3Bo eXNpY2FsX21lbW9yeShiYXNlLCAweDAwMDAxMDAwLCBpb21lbXR5cGUpOwo= ------=_Part_179_29616940.1196865972898--