Date: Wed, 1 Mar 2017 19:55:05 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314506 - in stable/11/sys: arm/allwinner arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm/arm arm/at91 arm/broadcom/bcm2835 arm/freescale/imx arm/freescale/vybrid arm/in... Message-ID: <201703011955.v21Jt5IT087115@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Wed Mar 1 19:55:04 2017 New Revision: 314506 URL: https://svnweb.freebsd.org/changeset/base/314506 Log: MFC r306262, r306267, r310021: (needed to avoid conflicts on later merges) Remove bus_dma_get_range and bus_dma_get_range_nb on armv6. We only need this on a few earlier arm SoCs. Restrict where we need to define fdt_fixup_table to just PowerPC and Marvell. Add the missing void to function signatures in much of the arm code. Modified: stable/11/sys/arm/allwinner/a10_common.c stable/11/sys/arm/allwinner/aw_machdep.c stable/11/sys/arm/allwinner/aw_wdog.c stable/11/sys/arm/altera/socfpga/socfpga_common.c stable/11/sys/arm/altera/socfpga/socfpga_machdep.c stable/11/sys/arm/amlogic/aml8726/aml8726_identsoc.c stable/11/sys/arm/amlogic/aml8726/aml8726_machdep.c stable/11/sys/arm/amlogic/aml8726/aml8726_wdt.c stable/11/sys/arm/annapurna/alpine/alpine_machdep.c stable/11/sys/arm/annapurna/alpine/common.c stable/11/sys/arm/arm/busdma_machdep-v6.c stable/11/sys/arm/arm/cpufunc.c stable/11/sys/arm/arm/db_trace.c stable/11/sys/arm/arm/physmem.c stable/11/sys/arm/arm/platform.c stable/11/sys/arm/arm/undefined.c stable/11/sys/arm/at91/at91_common.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_common.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.c stable/11/sys/arm/freescale/imx/imx6_anatop.c stable/11/sys/arm/freescale/imx/imx6_machdep.c stable/11/sys/arm/freescale/imx/imx6_src.c stable/11/sys/arm/freescale/imx/imx_common.c stable/11/sys/arm/freescale/imx/imx_machdep.c stable/11/sys/arm/freescale/vybrid/vf_common.c stable/11/sys/arm/freescale/vybrid/vf_machdep.c stable/11/sys/arm/include/bus_dma.h stable/11/sys/arm/lpc/lpc_gpio.c stable/11/sys/arm/lpc/lpc_intc.c stable/11/sys/arm/mv/mv_machdep.c stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c stable/11/sys/arm/nvidia/tegra_efuse.c stable/11/sys/arm/qemu/virt_common.c stable/11/sys/arm/qemu/virt_machdep.c stable/11/sys/arm/rockchip/rk30xx_common.c stable/11/sys/arm/rockchip/rk30xx_machdep.c stable/11/sys/arm/rockchip/rk30xx_wdog.c stable/11/sys/arm/samsung/exynos/exynos5_common.c stable/11/sys/arm/samsung/exynos/exynos5_machdep.c stable/11/sys/arm/ti/am335x/am335x_dmtpps.c stable/11/sys/arm/ti/ti_common.c stable/11/sys/arm/ti/ti_machdep.c stable/11/sys/arm/versatile/versatile_common.c stable/11/sys/arm/versatile/versatile_machdep.c stable/11/sys/arm/xilinx/zy7_machdep.c stable/11/sys/arm/xilinx/zy7_slcr.c stable/11/sys/arm/xscale/pxa/pxa_gpio.c stable/11/sys/arm/xscale/pxa/pxa_icu.c stable/11/sys/arm/xscale/pxa/pxa_space.c stable/11/sys/arm/xscale/pxa/pxa_timer.c stable/11/sys/dev/ofw/ofw_fdt.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/allwinner/a10_common.c ============================================================================== --- stable/11/sys/arm/allwinner/a10_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/allwinner/a10_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int Modified: stable/11/sys/arm/allwinner/aw_machdep.c ============================================================================== --- stable/11/sys/arm/allwinner/aw_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/allwinner/aw_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -36,7 +36,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -147,18 +146,6 @@ allwinner_devmap_init(platform_t plat) return (0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - return (0); -} - void cpu_reset() { Modified: stable/11/sys/arm/allwinner/aw_wdog.c ============================================================================== --- stable/11/sys/arm/allwinner/aw_wdog.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/allwinner/aw_wdog.c Wed Mar 1 19:55:04 2017 (r314506) @@ -238,7 +238,7 @@ aw_wdog_shutdown_fn(void *private, int h } void -aw_wdog_watchdog_reset() +aw_wdog_watchdog_reset(void) { if (aw_wdog_sc == NULL) { Modified: stable/11/sys/arm/altera/socfpga/socfpga_common.c ============================================================================== --- stable/11/sys/arm/altera/socfpga/socfpga_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/altera/socfpga/socfpga_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -68,10 +68,6 @@ end: while (1); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/altera/socfpga/socfpga_machdep.c ============================================================================== --- stable/11/sys/arm/altera/socfpga/socfpga_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/altera/socfpga/socfpga_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -34,7 +34,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -100,17 +99,3 @@ platform_devmap_init(void) return (0); } - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} Modified: stable/11/sys/arm/amlogic/aml8726/aml8726_identsoc.c ============================================================================== --- stable/11/sys/arm/amlogic/aml8726/aml8726_identsoc.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/amlogic/aml8726/aml8726_identsoc.c Wed Mar 1 19:55:04 2017 (r314506) @@ -87,7 +87,7 @@ static const struct { }; void -aml8726_identify_soc() +aml8726_identify_soc(void) { int err; struct resource res; Modified: stable/11/sys/arm/amlogic/aml8726/aml8726_machdep.c ============================================================================== --- stable/11/sys/arm/amlogic/aml8726/aml8726_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/amlogic/aml8726/aml8726_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include "opt_platform.h" -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -57,7 +56,7 @@ vm_offset_t aml8726_aobus_kva_base; #endif static void -aml8726_fixup_busfreq() +aml8726_fixup_busfreq(void) { phandle_t node; pcell_t freq, prop; @@ -165,24 +164,6 @@ platform_devmap_init(void) return (0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG #ifndef DEV_GIC static int Modified: stable/11/sys/arm/amlogic/aml8726/aml8726_wdt.c ============================================================================== --- stable/11/sys/arm/amlogic/aml8726/aml8726_wdt.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/amlogic/aml8726/aml8726_wdt.c Wed Mar 1 19:55:04 2017 (r314506) @@ -290,7 +290,7 @@ EARLY_DRIVER_MODULE(wdt, simplebus, aml8 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); void -cpu_reset() +cpu_reset(void) { /* Watchdog has not yet been initialized */ Modified: stable/11/sys/arm/annapurna/alpine/alpine_machdep.c ============================================================================== --- stable/11/sys/arm/annapurna/alpine/alpine_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/annapurna/alpine/alpine_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -29,7 +29,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -131,17 +130,3 @@ platform_devmap_init(void) devmap_add_entry(al_devmap_pa, al_devmap_size); return (0); } - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} Modified: stable/11/sys/arm/annapurna/alpine/common.c ============================================================================== --- stable/11/sys/arm/annapurna/alpine/common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/annapurna/alpine/common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -56,9 +56,6 @@ __FBSDID("$FreeBSD$"); #define LOCK 0x00000001 extern bus_addr_t al_devmap_pa; -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; static int alpine_get_wdt_base(uint32_t *pbase, uint32_t *psize); static int alpine_pic_decode_fdt(uint32_t iparent, uint32_t *intr, Modified: stable/11/sys/arm/arm/busdma_machdep-v6.c ============================================================================== --- stable/11/sys/arm/arm/busdma_machdep-v6.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/busdma_machdep-v6.c Wed Mar 1 19:55:04 2017 (r314506) @@ -33,7 +33,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> @@ -90,14 +89,6 @@ struct bus_dma_tag { bus_dma_lock_t *lockfunc; void *lockfuncarg; struct bounce_zone *bounce_zone; - /* - * DMA range for this tag. If the page doesn't fall within - * one of these ranges, an error is returned. The caller - * may then decide what to do with the transfer. If the - * range pointer is NULL, it is ignored. - */ - struct arm32_dma_range *ranges; - int _nranges; }; struct bounce_page { @@ -402,22 +393,6 @@ must_bounce(bus_dma_tag_t dmat, bus_dmam return (0); } -static __inline struct arm32_dma_range * -_bus_dma_inrange(struct arm32_dma_range *ranges, int nranges, - bus_addr_t curaddr) -{ - struct arm32_dma_range *dr; - int i; - - for (i = 0, dr = ranges; i < nranges; i++, dr++) { - if (curaddr >= dr->dr_sysbase && - round_page(curaddr) <= (dr->dr_sysbase + dr->dr_len)) - return (dr); - } - - return (NULL); -} - /* * Convenience function for manipulating driver locks from busdma (during * busdma_swi, for example). Drivers that don't provide their own locks @@ -502,8 +477,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, newtag->flags = flags; newtag->ref_count = 1; /* Count ourself */ newtag->map_count = 0; - newtag->ranges = bus_dma_get_range(); - newtag->_nranges = bus_dma_get_range_nb(); if (lockfunc != NULL) { newtag->lockfunc = lockfunc; newtag->lockfuncarg = lockfuncarg; @@ -987,22 +960,6 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, b sgsize = (baddr - curaddr); } - if (dmat->ranges) { - struct arm32_dma_range *dr; - - dr = _bus_dma_inrange(dmat->ranges, dmat->_nranges, - curaddr); - if (dr == NULL) { - _bus_dmamap_unload(dmat, map); - return (0); - } - /* - * In a valid DMA range. Translate the physical - * memory address to an address in the DMA window. - */ - curaddr = (curaddr - dr->dr_sysbase) + dr->dr_busbase; - } - /* * Insert chunk into a segment, coalescing with * previous segment if possible. Modified: stable/11/sys/arm/arm/cpufunc.c ============================================================================== --- stable/11/sys/arm/arm/cpufunc.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/cpufunc.c Wed Mar 1 19:55:04 2017 (r314506) @@ -585,7 +585,7 @@ static int arm_dcache_l2_assoc; static int arm_dcache_l2_linesize; static void -get_cachetype_cp15() +get_cachetype_cp15(void) { u_int ctype, isize, dsize, cpuid; u_int clevel, csize, i, sel; @@ -700,7 +700,7 @@ get_cachetype_cp15() */ int -set_cpufuncs() +set_cpufuncs(void) { cputype = cpu_ident(); cputype &= CPU_ID_CPU_MASK; Modified: stable/11/sys/arm/arm/db_trace.c ============================================================================== --- stable/11/sys/arm/arm/db_trace.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/db_trace.c Wed Mar 1 19:55:04 2017 (r314506) @@ -130,7 +130,7 @@ db_stack_trace_cmd(struct unwind_state * } void -db_md_list_watchpoints() +db_md_list_watchpoints(void) { dbg_show_watchpoint(); Modified: stable/11/sys/arm/arm/physmem.c ============================================================================== --- stable/11/sys/arm/arm/physmem.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/physmem.c Wed Mar 1 19:55:04 2017 (r314506) @@ -145,7 +145,7 @@ physmem_dump_tables(int (*prfunc)(const * Print the contents of the static mapping table. Used for bootverbose. */ void -arm_physmem_print_tables() +arm_physmem_print_tables(void) { physmem_dump_tables(printf); Modified: stable/11/sys/arm/arm/platform.c ============================================================================== --- stable/11/sys/arm/arm/platform.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/platform.c Wed Mar 1 19:55:04 2017 (r314506) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); * through a previously registered kernel object. */ -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/bus.h> #include <sys/kernel.h> Modified: stable/11/sys/arm/arm/undefined.c ============================================================================== --- stable/11/sys/arm/arm/undefined.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/arm/undefined.c Wed Mar 1 19:55:04 2017 (r314506) @@ -165,7 +165,7 @@ gdb_trapper(u_int addr, u_int insn, stru static struct undefined_handler gdb_uh; void -undefined_init() +undefined_init(void) { int loop; Modified: stable/11/sys/arm/at91/at91_common.c ============================================================================== --- stable/11/sys/arm/at91/at91_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/at91/at91_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -49,10 +49,6 @@ __FBSDID("$FreeBSD$"); extern const struct devmap_entry at91_devmap[]; -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_aic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_common.c ============================================================================== --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -42,7 +42,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -115,19 +114,7 @@ bcm2836_devmap_init(platform_t plat) } #endif -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} -int -bus_dma_get_range_nb(void) -{ - - return (0); -} void cpu_reset() Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.c ============================================================================== --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Wed Mar 1 19:55:04 2017 (r314506) @@ -191,7 +191,7 @@ bcmwd_watchdog_fn(void *private, u_int c } void -bcmwd_watchdog_reset() +bcmwd_watchdog_reset(void) { if (bcmwd_lsc == NULL) Modified: stable/11/sys/arm/freescale/imx/imx6_anatop.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx6_anatop.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx6_anatop.c Wed Mar 1 19:55:04 2017 (r314506) @@ -776,7 +776,7 @@ imx6_anatop_probe(device_t dev) } uint32_t -imx6_get_cpu_clock() +imx6_get_cpu_clock(void) { uint32_t corediv, plldiv; Modified: stable/11/sys/arm/freescale/imx/imx6_machdep.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx6_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx6_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -52,10 +52,6 @@ __FBSDID("$FreeBSD$"); #include "platform_if.h" -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - static uint32_t gpio1_node; #ifndef INTRNG Modified: stable/11/sys/arm/freescale/imx/imx6_src.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx6_src.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx6_src.c Wed Mar 1 19:55:04 2017 (r314506) @@ -70,7 +70,7 @@ WR4(struct src_softc *sc, bus_size_t off } int -src_reset_ipu() +src_reset_ipu(void) { uint32_t reg; int timeout = 10000; Modified: stable/11/sys/arm/freescale/imx/imx_common.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -50,10 +50,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/freescale/imx/imx_machdep.c ============================================================================== --- stable/11/sys/arm/freescale/imx/imx_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/imx/imx_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -29,7 +29,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/reboot.h> @@ -54,20 +53,6 @@ SYSCTL_UINT(_hw_imx, OID_AUTO, last_rese SYSCTL_STRING(_hw_imx, OID_AUTO, last_reset_reason, CTLFLAG_RD, "unknown", 0, "Last reset reason"); -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - /* * This code which manipulates the watchdog hardware is here to implement * cpu_reset() because the watchdog is the only way for software to reset the Modified: stable/11/sys/arm/freescale/vybrid/vf_common.c ============================================================================== --- stable/11/sys/arm/freescale/vybrid/vf_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/vybrid/vf_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -60,10 +60,6 @@ end: while (1); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/freescale/vybrid/vf_machdep.c ============================================================================== --- stable/11/sys/arm/freescale/vybrid/vf_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/freescale/vybrid/vf_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -30,7 +30,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -78,17 +77,3 @@ platform_devmap_init(void) return (0); } - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} Modified: stable/11/sys/arm/include/bus_dma.h ============================================================================== --- stable/11/sys/arm/include/bus_dma.h Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/include/bus_dma.h Wed Mar 1 19:55:04 2017 (r314506) @@ -72,7 +72,7 @@ #define BUS_DMA_TAG_VALID(t) ((t) != (bus_dma_tag_t)0) -#ifdef _ARM32_BUS_DMA_PRIVATE +#if defined(_ARM32_BUS_DMA_PRIVATE) && __ARM_ARCH < 6 /* * arm32_dma_range * Modified: stable/11/sys/arm/lpc/lpc_gpio.c ============================================================================== --- stable/11/sys/arm/lpc/lpc_gpio.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/lpc/lpc_gpio.c Wed Mar 1 19:55:04 2017 (r314506) @@ -518,7 +518,7 @@ lpc_gpio_get_state(device_t dev, int pin } void -lpc_gpio_init() +lpc_gpio_init(void) { bus_space_tag_t bst; bus_space_handle_t bsh; Modified: stable/11/sys/arm/lpc/lpc_intc.c ============================================================================== --- stable/11/sys/arm/lpc/lpc_intc.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/lpc/lpc_intc.c Wed Mar 1 19:55:04 2017 (r314506) @@ -227,10 +227,6 @@ lpc_intc_eoi(void *data) } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/mv/mv_machdep.c ============================================================================== --- stable/11/sys/arm/mv/mv_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/mv/mv_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -428,6 +428,7 @@ platform_devmap_init(void) return (0); } +#if __ARM_ARCH < 6 struct arm32_dma_range * bus_dma_get_range(void) { @@ -441,6 +442,7 @@ bus_dma_get_range_nb(void) return (0); } +#endif #if defined(CPU_MV_PJ4B) #ifdef DDB Modified: stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c ============================================================================== --- stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#define _ARM32_BUS_DMA_PRIVATE #include "opt_platform.h" #include <sys/cdefs.h> @@ -62,24 +61,6 @@ __FBSDID("$FreeBSD$"); PMC_SCRATCH0_MODE_BOOTLOADER | \ PMC_SCRATCH0_MODE_RCM) -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - static vm_offset_t tegra124_lastaddr(platform_t plat) { Modified: stable/11/sys/arm/nvidia/tegra_efuse.c ============================================================================== --- stable/11/sys/arm/nvidia/tegra_efuse.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/nvidia/tegra_efuse.c Wed Mar 1 19:55:04 2017 (r314506) @@ -237,7 +237,7 @@ tegra_fuse_read_4(int addr) { static void -tegra_efuse_dump_sku() +tegra_efuse_dump_sku(void) { printf(" TEGRA SKU Info:\n"); printf(" chip_id: %u\n", tegra_sku_info.chip_id); Modified: stable/11/sys/arm/qemu/virt_common.c ============================================================================== --- stable/11/sys/arm/qemu/virt_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/qemu/virt_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -37,10 +37,6 @@ __FBSDID("$FreeBSD$"); #include <machine/intr.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG fdt_pic_decode_t fdt_pic_table[] = { &gic_decode_fdt, Modified: stable/11/sys/arm/qemu/virt_machdep.c ============================================================================== --- stable/11/sys/arm/qemu/virt_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/qemu/virt_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -30,7 +30,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/devmap.h> @@ -45,20 +44,6 @@ __FBSDID("$FreeBSD$"); #include "platform_if.h" -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void cpu_reset(void) { Modified: stable/11/sys/arm/rockchip/rk30xx_common.c ============================================================================== --- stable/11/sys/arm/rockchip/rk30xx_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/rockchip/rk30xx_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/rockchip/rk30xx_machdep.c ============================================================================== --- stable/11/sys/arm/rockchip/rk30xx_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/rockchip/rk30xx_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -34,7 +34,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -92,20 +91,6 @@ platform_devmap_init(void) return (0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void cpu_reset() { Modified: stable/11/sys/arm/rockchip/rk30xx_wdog.c ============================================================================== --- stable/11/sys/arm/rockchip/rk30xx_wdog.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/rockchip/rk30xx_wdog.c Wed Mar 1 19:55:04 2017 (r314506) @@ -171,7 +171,7 @@ rk30_wd_watchdog_fn(void *private, u_int } void -rk30_wd_watchdog_reset() +rk30_wd_watchdog_reset(void) { bus_space_handle_t bsh; Modified: stable/11/sys/arm/samsung/exynos/exynos5_common.c ============================================================================== --- stable/11/sys/arm/samsung/exynos/exynos5_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/samsung/exynos/exynos5_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -49,10 +49,6 @@ cpu_reset(void) while (1); } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/samsung/exynos/exynos5_machdep.c ============================================================================== --- stable/11/sys/arm/samsung/exynos/exynos5_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/samsung/exynos/exynos5_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -30,7 +30,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -83,17 +82,3 @@ platform_devmap_init(void) return (0); } - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} Modified: stable/11/sys/arm/ti/am335x/am335x_dmtpps.c ============================================================================== --- stable/11/sys/arm/ti/am335x/am335x_dmtpps.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/ti/am335x/am335x_dmtpps.c Wed Mar 1 19:55:04 2017 (r314506) @@ -163,7 +163,7 @@ dmtpps_translate_nickname(const char *ni * fails that IS an error, return -1. */ static int -dmtpps_find_tmr_num_by_tunable() +dmtpps_find_tmr_num_by_tunable(void) { struct padinfo *pi; char iname[20]; @@ -201,7 +201,7 @@ dmtpps_find_tmr_num_by_tunable() * input pin. If so, return the timer number, if not return 0. */ static int -dmtpps_find_tmr_num_by_padconf() +dmtpps_find_tmr_num_by_padconf(void) { int err; unsigned int padstate; @@ -225,7 +225,7 @@ dmtpps_find_tmr_num_by_padconf() * configuration. This is done just once, the first time probe() runs. */ static int -dmtpps_find_tmr_num() +dmtpps_find_tmr_num(void) { int tmr_num; Modified: stable/11/sys/arm/ti/ti_common.c ============================================================================== --- stable/11/sys/arm/ti/ti_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/ti/ti_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -49,10 +49,6 @@ __FBSDID("$FreeBSD$"); #include <machine/intr.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG #ifdef SOC_TI_AM335X static int Modified: stable/11/sys/arm/ti/ti_machdep.c ============================================================================== --- stable/11/sys/arm/ti/ti_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/ti/ti_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -40,7 +40,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -96,20 +95,6 @@ ti_am335x_devmap_init(platform_t plat) } #endif -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void cpu_reset() { Modified: stable/11/sys/arm/versatile/versatile_common.c ============================================================================== --- stable/11/sys/arm/versatile/versatile_common.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/versatile/versatile_common.c Wed Mar 1 19:55:04 2017 (r314506) @@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/vmparam.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, Modified: stable/11/sys/arm/versatile/versatile_machdep.c ============================================================================== --- stable/11/sys/arm/versatile/versatile_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/versatile/versatile_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -39,7 +39,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -102,22 +101,8 @@ platform_devmap_init(void) return (0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void -cpu_reset() +cpu_reset(void) { printf("cpu_reset\n"); while (1); Modified: stable/11/sys/arm/xilinx/zy7_machdep.c ============================================================================== --- stable/11/sys/arm/xilinx/zy7_machdep.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/xilinx/zy7_machdep.c Wed Mar 1 19:55:04 2017 (r314506) @@ -36,7 +36,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -94,10 +93,6 @@ platform_devmap_init(void) } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_gic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, @@ -120,22 +115,8 @@ fdt_pic_decode_t fdt_pic_table[] = { }; #endif -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void -cpu_reset() +cpu_reset(void) { if (zynq7_cpu_reset != NULL) (*zynq7_cpu_reset)(); Modified: stable/11/sys/arm/xilinx/zy7_slcr.c ============================================================================== --- stable/11/sys/arm/xilinx/zy7_slcr.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/xilinx/zy7_slcr.c Wed Mar 1 19:55:04 2017 (r314506) @@ -496,7 +496,7 @@ zy7_pl_fclk_enabled(int unit) } int -zy7_pl_level_shifters_enabled() +zy7_pl_level_shifters_enabled(void) { struct zy7_slcr_softc *sc = zy7_slcr_softc_p; @@ -513,7 +513,7 @@ zy7_pl_level_shifters_enabled() } void -zy7_pl_level_shifters_enable() +zy7_pl_level_shifters_enable(void) { struct zy7_slcr_softc *sc = zy7_slcr_softc_p; @@ -528,7 +528,7 @@ zy7_pl_level_shifters_enable() } void -zy7_pl_level_shifters_disable() +zy7_pl_level_shifters_disable(void) { struct zy7_slcr_softc *sc = zy7_slcr_softc_p; Modified: stable/11/sys/arm/xscale/pxa/pxa_gpio.c ============================================================================== --- stable/11/sys/arm/xscale/pxa/pxa_gpio.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/xscale/pxa/pxa_gpio.c Wed Mar 1 19:55:04 2017 (r314506) @@ -331,7 +331,7 @@ pxa_gpio_unmask_irq(int irq) } int -pxa_gpio_get_next_irq() +pxa_gpio_get_next_irq(void) { struct pxa_gpio_softc *sc; int gpio; Modified: stable/11/sys/arm/xscale/pxa/pxa_icu.c ============================================================================== --- stable/11/sys/arm/xscale/pxa/pxa_icu.c Wed Mar 1 19:36:32 2017 (r314505) +++ stable/11/sys/arm/xscale/pxa/pxa_icu.c Wed Mar 1 19:55:04 2017 (r314506) @@ -171,7 +171,7 @@ arm_unmask_irq(uintptr_t nb) } uint32_t -pxa_icu_get_icip() +pxa_icu_get_icip(void) { return (bus_space_read_4(pxa_icu_softc->pi_bst, @@ -187,7 +187,7 @@ pxa_icu_clear_icip(int irq) } uint32_t -pxa_icu_get_icfp() +pxa_icu_get_icfp(void) { return (bus_space_read_4(pxa_icu_softc->pi_bst, @@ -203,7 +203,7 @@ pxa_icu_clear_icfp(int irq) } uint32_t -pxa_icu_get_icmr() +pxa_icu_get_icmr(void) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703011955.v21Jt5IT087115>