From owner-freebsd-mips@freebsd.org Thu Feb 4 07:16:25 2016 Return-Path: Delivered-To: freebsd-mips@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 608CEA9AB71 for ; Thu, 4 Feb 2016 07:16:25 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: from phabric-backend.rbsd.freebsd.org (unknown [IPv6:2607:fc50:2000:101::1bb:73]) by mx1.freebsd.org (Postfix) with ESMTP id 42F911EC0 for ; Thu, 4 Feb 2016 07:16:25 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: by phabric-backend.rbsd.freebsd.org (Postfix, from userid 1346) id 3DBD8106989; Thu, 4 Feb 2016 07:16:25 +0000 (UTC) Date: Thu, 4 Feb 2016 07:16:25 +0000 To: freebsd-mips@freebsd.org From: "Sgalabov_gmail.com (Stanislav Galabov)" Reply-to: D5183+328+2ef59cec0e4d64a3@reviews.freebsd.org Subject: [Differential] [Request, 11 lines] D5183: Proper attachment for MIPS ticker when using INTRNG Message-ID: X-Priority: 3 X-Phabricator-Sent-This-Message: Yes X-Mail-Transport-Agent: MetaMTA X-Auto-Response-Suppress: All X-Phabricator-Mail-Tags: , , , Thread-Topic: D5183: Proper attachment for MIPS ticker when using INTRNG X-Herald-Rules: <28> X-Phabricator-Projects: <#mips> X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-Cc: X-Phabricator-Cc: Precedence: bulk Thread-Index: NDk3YzYwMGIyODM4MzY2N2VjMDRlM2Q4ZjY2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_9ac7879e518e32c539c0fe2d54684e78" X-BeenThere: freebsd-mips@freebsd.org X-Mailman-Version: 2.1.20 List-Id: Porting FreeBSD to MIPS List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2016 07:16:25 -0000 --b1_9ac7879e518e32c539c0fe2d54684e78 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit Sgalabov_gmail.com created this revision. Sgalabov_gmail.com added reviewers: MIPS, adrian, kan. Sgalabov_gmail.com added a subscriber: freebsd-mips-list. Sgalabov_gmail.com set the repository for this revision to rS FreeBSD src repository. Sgalabov_gmail.com added a project: MIPS. Herald added a subscriber: imp. REVISION SUMMARY This patch allows the MIPS ticker to attach itself properly when using INTRNG REPOSITORY rS FreeBSD src repository REVISION DETAIL https://reviews.freebsd.org/D5183 AFFECTED FILES sys/mips/mips/tick.c CHANGE DETAILS diff --git a/sys/mips/mips/tick.c b/sys/mips/mips/tick.c --- a/sys/mips/mips/tick.c +++ b/sys/mips/mips/tick.c @@ -51,6 +51,10 @@ #include #include +#ifdef MIPS_INTRNG +#include +#endif + uint64_t counter_freq; struct timecounter *platform_timecounter; @@ -324,12 +328,18 @@ clock_attach(device_t dev) { struct clock_softc *sc; +#ifndef MIPS_INTRNG int error; +#endif if (device_get_unit(dev) != 0) panic("can't attach more clocks"); softc = sc = device_get_softc(dev); +#ifdef MIPS_INTRNG + cpu_establish_hardintr("clock", clock_intr, NULL, sc, 5, INTR_TYPE_CLK, + NULL); +#else sc->intr_rid = 0; sc->intr_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->intr_rid, 5, 5, 1, RF_ACTIVE); @@ -343,6 +353,7 @@ device_printf(dev, "bus_setup_intr returned %d\n", error); return (error); } +#endif sc->tc.tc_get_timecount = counter_get_timecount; sc->tc.tc_counter_mask = 0xffffffff; EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: Sgalabov_gmail.com, MIPS, adrian, kan Cc: imp, freebsd-mips-list --b1_9ac7879e518e32c539c0fe2d54684e78 Content-Type: text/x-patch; charset=utf-8; name="D5183.12992.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D5183.12992.patch" ZGlmZiAtLWdpdCBhL3N5cy9taXBzL21pcHMvdGljay5jDSBiL3N5cy9taXBzL21pcHMvdGljay5j Ci0tLSBhL3N5cy9taXBzL21pcHMvdGljay5jDQorKysgYi9zeXMvbWlwcy9taXBzL3RpY2suYwpA QCAtNTEsNiArNTEsMTAgQEAKICNpbmNsdWRlIDxtYWNoaW5lL2xvY29yZS5oPg0KICNpbmNsdWRl IDxtYWNoaW5lL21kX3Zhci5oPg0KIA0KKyNpZmRlZiBNSVBTX0lOVFJORw0KKyNpbmNsdWRlIDxt YWNoaW5lL2ludHIuaD4NCisjZW5kaWYNCisNCiB1aW50NjRfdCBjb3VudGVyX2ZyZXE7DQogDQog c3RydWN0IHRpbWVjb3VudGVyICpwbGF0Zm9ybV90aW1lY291bnRlcjsNCkBAIC0zMjQsMTIgKzMy OCwxOCBAQAogY2xvY2tfYXR0YWNoKGRldmljZV90IGRldikNCiB7DQogCXN0cnVjdCBjbG9ja19z b2Z0YyAqc2M7DQorI2lmbmRlZiBNSVBTX0lOVFJORw0KIAlpbnQgZXJyb3I7DQorI2VuZGlmDQog DQogCWlmIChkZXZpY2VfZ2V0X3VuaXQoZGV2KSAhPSAwKQ0KIAkJcGFuaWMoImNhbid0IGF0dGFj aCBtb3JlIGNsb2NrcyIpOw0KIA0KIAlzb2Z0YyA9IHNjID0gZGV2aWNlX2dldF9zb2Z0YyhkZXYp Ow0KKyNpZmRlZiBNSVBTX0lOVFJORw0KKwljcHVfZXN0YWJsaXNoX2hhcmRpbnRyKCJjbG9jayIs IGNsb2NrX2ludHIsIE5VTEwsIHNjLCA1LCBJTlRSX1RZUEVfQ0xLLA0KKwkgICAgTlVMTCk7DQor I2Vsc2UNCiAJc2MtPmludHJfcmlkID0gMDsNCiAJc2MtPmludHJfcmVzID0gYnVzX2FsbG9jX3Jl c291cmNlKGRldiwNCiAJICAgIFNZU19SRVNfSVJRLCAmc2MtPmludHJfcmlkLCA1LCA1LCAxLCBS Rl9BQ1RJVkUpOw0KQEAgLTM0Myw2ICszNTMsNyBAQAogCQlkZXZpY2VfcHJpbnRmKGRldiwgImJ1 c19zZXR1cF9pbnRyIHJldHVybmVkICVkXG4iLCBlcnJvcik7DQogCQlyZXR1cm4gKGVycm9yKTsN CiAJfQ0KKyNlbmRpZg0KIA0KIAlzYy0+dGMudGNfZ2V0X3RpbWVjb3VudCA9IGNvdW50ZXJfZ2V0 X3RpbWVjb3VudDsNCiAJc2MtPnRjLnRjX2NvdW50ZXJfbWFzayA9IDB4ZmZmZmZmZmY7DQoK --b1_9ac7879e518e32c539c0fe2d54684e78--