Date: Sun, 14 Dec 2014 15:41:57 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r275764 - stable/10/sys/arm/arm Message-ID: <201412141541.sBEFfvjq045562@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Sun Dec 14 15:41:56 2014 New Revision: 275764 URL: https://svnweb.freebsd.org/changeset/base/275764 Log: MFC 275207: We don't use the hypervisor interrupt, make it optional in the device tree. Submitted by: Julien Grall <julien.grall AT linaro.org> MFC 275208: Some device tree configurations place the generic timer under the root of the tree and not under simplebus. Update the driver to handle this. Submitted by: Julien Grall <julien.grall AT linaro.org> Modified: stable/10/sys/arm/arm/generic_timer.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/arm/generic_timer.c ============================================================================== --- stable/10/sys/arm/arm/generic_timer.c Sun Dec 14 15:33:45 2014 (r275763) +++ stable/10/sys/arm/arm/generic_timer.c Sun Dec 14 15:41:56 2014 (r275764) @@ -86,7 +86,7 @@ static struct resource_spec timer_spec[] { SYS_RES_IRQ, 0, RF_ACTIVE }, /* Secure */ { SYS_RES_IRQ, 1, RF_ACTIVE }, /* Non-secure */ { SYS_RES_IRQ, 2, RF_ACTIVE }, /* Virt */ - { SYS_RES_IRQ, 3, RF_ACTIVE }, /* Hyp */ + { SYS_RES_IRQ, 3, RF_ACTIVE | RF_OPTIONAL }, /* Hyp */ { -1, 0 } }; @@ -345,6 +345,8 @@ static devclass_t arm_tmr_devclass; EARLY_DRIVER_MODULE(timer, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(timer, ofwbus, arm_tmr_driver, arm_tmr_devclass, 0, 0, + BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); void DELAY(int usec)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412141541.sBEFfvjq045562>