Date: Thu, 11 Feb 2016 06:14:12 +0000 From: "adrian (Adrian Chadd)" <phabric-noreply@FreeBSD.org> To: freebsd-mips@freebsd.org Subject: [Differential] [Closed] D5183: Proper attachment for MIPS ticker when using INTRNG Message-ID: <606c9af147420d91f5adc8ced05c8fee@localhost.localdomain> In-Reply-To: <differential-rev-PHID-DREV-m73iatsu5iop4g4gyz2t-req@FreeBSD.org> References: <differential-rev-PHID-DREV-m73iatsu5iop4g4gyz2t-req@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--b1_606c9af147420d91f5adc8ced05c8fee Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit This revision was automatically updated to reflect the committed changes. Closed by commit rS295499: Teach the MIPS ticker to attach itself properly when using INTRNG. (authored by adrian). CHANGED PRIOR TO COMMIT https://reviews.freebsd.org/D5183?vs=12992&id=13205#toc REPOSITORY rS FreeBSD src repository CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D5183?vs=12992&id=13205 REVISION DETAIL https://reviews.freebsd.org/D5183 AFFECTED FILES head/sys/mips/mips/tick.c CHANGE DETAILS diff --git a/head/sys/mips/mips/tick.c b/head/sys/mips/mips/tick.c --- a/head/sys/mips/mips/tick.c +++ b/head/sys/mips/mips/tick.c @@ -51,6 +51,10 @@ #include <machine/locore.h> #include <machine/md_var.h> +#ifdef MIPS_INTRNG +#include <machine/intr.h> +#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, kan, adrian, MIPS Cc: imp, freebsd-mips-list --b1_606c9af147420d91f5adc8ced05c8fee Content-Type: text/x-patch; charset=utf-8; name="D5183.13205.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D5183.13205.patch" ZGlmZiAtLWdpdCBhL2hlYWQvc3lzL21pcHMvbWlwcy90aWNrLmMgYi9oZWFkL3N5cy9taXBzL21p cHMvdGljay5jCi0tLSBhL2hlYWQvc3lzL21pcHMvbWlwcy90aWNrLmMKKysrIGIvaGVhZC9zeXMv bWlwcy9taXBzL3RpY2suYwpAQCAtNTEsNiArNTEsMTAgQEAKICNpbmNsdWRlIDxtYWNoaW5lL2xv Y29yZS5oPgogI2luY2x1ZGUgPG1hY2hpbmUvbWRfdmFyLmg+CiAKKyNpZmRlZiBNSVBTX0lOVFJO RworI2luY2x1ZGUgPG1hY2hpbmUvaW50ci5oPgorI2VuZGlmCisKIHVpbnQ2NF90IGNvdW50ZXJf ZnJlcTsKIAogc3RydWN0IHRpbWVjb3VudGVyICpwbGF0Zm9ybV90aW1lY291bnRlcjsKQEAgLTMy NCwxMiArMzI4LDE4IEBACiBjbG9ja19hdHRhY2goZGV2aWNlX3QgZGV2KQogewogCXN0cnVjdCBj bG9ja19zb2Z0YyAqc2M7CisjaWZuZGVmIE1JUFNfSU5UUk5HCiAJaW50IGVycm9yOworI2VuZGlm CiAKIAlpZiAoZGV2aWNlX2dldF91bml0KGRldikgIT0gMCkKIAkJcGFuaWMoImNhbid0IGF0dGFj aCBtb3JlIGNsb2NrcyIpOwogCiAJc29mdGMgPSBzYyA9IGRldmljZV9nZXRfc29mdGMoZGV2KTsK KyNpZmRlZiBNSVBTX0lOVFJORworCWNwdV9lc3RhYmxpc2hfaGFyZGludHIoImNsb2NrIiwgY2xv Y2tfaW50ciwgTlVMTCwgc2MsIDUsIElOVFJfVFlQRV9DTEssCisJICAgIE5VTEwpOworI2Vsc2UK IAlzYy0+aW50cl9yaWQgPSAwOwogCXNjLT5pbnRyX3JlcyA9IGJ1c19hbGxvY19yZXNvdXJjZShk ZXYsCiAJICAgIFNZU19SRVNfSVJRLCAmc2MtPmludHJfcmlkLCA1LCA1LCAxLCBSRl9BQ1RJVkUp OwpAQCAtMzQzLDYgKzM1Myw3IEBACiAJCWRldmljZV9wcmludGYoZGV2LCAiYnVzX3NldHVwX2lu dHIgcmV0dXJuZWQgJWRcbiIsIGVycm9yKTsKIAkJcmV0dXJuIChlcnJvcik7CiAJfQorI2VuZGlm CiAKIAlzYy0+dGMudGNfZ2V0X3RpbWVjb3VudCA9IGNvdW50ZXJfZ2V0X3RpbWVjb3VudDsKIAlz Yy0+dGMudGNfY291bnRlcl9tYXNrID0gMHhmZmZmZmZmZjsKCg== --b1_606c9af147420d91f5adc8ced05c8fee--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?606c9af147420d91f5adc8ced05c8fee>