arm: clean up empty lines in .c and .h files
This commit is contained in:
Mateusz Guzik
parent
543769bf83
commit
654548838b
@ -375,7 +375,6 @@ static device_method_t a10_aintc_methods[] = {
|
||||
DEVMETHOD(pic_post_filter, a10_intr_post_filter),
|
||||
DEVMETHOD(pic_post_ithread, a10_intr_post_ithread),
|
||||
DEVMETHOD(pic_pre_ithread, a10_intr_pre_ithread),
|
||||
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
||||
@ -355,7 +355,7 @@ ahci_a10_attach(device_t dev)
|
||||
device_printf(dev, "Cannot enable clk gate\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
||||
/* Reset controller */
|
||||
if ((error = ahci_a10_ctlr_reset(dev)) != 0)
|
||||
goto fail;
|
||||
|
||||
@ -367,7 +367,6 @@ static kobj_method_t a10_mixer_methods[] = {
|
||||
};
|
||||
MIXER_DECLARE(a10_mixer);
|
||||
|
||||
|
||||
/*
|
||||
* H3 mixer interface
|
||||
*/
|
||||
@ -620,7 +619,6 @@ static kobj_method_t h3_mixer_methods[] = {
|
||||
};
|
||||
MIXER_DECLARE(h3_mixer);
|
||||
|
||||
|
||||
/*
|
||||
* Channel interface
|
||||
*/
|
||||
@ -1010,7 +1008,6 @@ static kobj_method_t a10codec_chan_methods[] = {
|
||||
};
|
||||
CHANNEL_DECLARE(a10codec_chan);
|
||||
|
||||
|
||||
/*
|
||||
* Device interface
|
||||
*/
|
||||
|
||||
@ -126,7 +126,6 @@ static kobj_method_t a10hdmiaudio_mixer_methods[] = {
|
||||
};
|
||||
MIXER_DECLARE(a10hdmiaudio_mixer);
|
||||
|
||||
|
||||
/*
|
||||
* Channel interface
|
||||
*/
|
||||
@ -345,7 +344,6 @@ static kobj_method_t a10hdmiaudio_chan_methods[] = {
|
||||
};
|
||||
CHANNEL_DECLARE(a10hdmiaudio_chan);
|
||||
|
||||
|
||||
/*
|
||||
* Device interface
|
||||
*/
|
||||
|
||||
@ -68,7 +68,6 @@ static struct a10_sramc_softc *a10_sramc_sc;
|
||||
#define sramc_write_4(sc, reg, val) \
|
||||
bus_space_write_4((sc)->bst, (sc)->bsh, (reg), (val))
|
||||
|
||||
|
||||
static int
|
||||
a10_sramc_probe(device_t dev)
|
||||
{
|
||||
|
||||
@ -136,4 +136,3 @@ a20_read_counter64(void)
|
||||
|
||||
return (((uint64_t)hi << 32) | lo);
|
||||
}
|
||||
|
||||
|
||||
@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/gpio.h>
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
||||
#include <dev/fdt/simplebus.h>
|
||||
|
||||
#include <dev/fdt/fdt_common.h>
|
||||
|
||||
@ -291,8 +291,6 @@ static platform_method_t h3_methods[] = {
|
||||
FDT_PLATFORM_DEF(h3, "h3", 0, "allwinner,sun8i-h3", 200);
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
u_int
|
||||
allwinner_soc_type(void)
|
||||
{
|
||||
|
||||
@ -951,7 +951,6 @@ aw_mmc_req_ok(struct aw_mmc_softc *sc)
|
||||
aw_mmc_req_done(sc);
|
||||
}
|
||||
|
||||
|
||||
static inline void
|
||||
set_mmc_error(struct aw_mmc_softc *sc, int error_code)
|
||||
{
|
||||
@ -1500,7 +1499,6 @@ aw_mmc_update_ios(device_t bus, device_t child)
|
||||
return (error);
|
||||
}
|
||||
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
@ -235,7 +235,7 @@ aw_rtc_attach(device_t dev)
|
||||
aw_rtc_install_clocks(sc, dev);
|
||||
|
||||
clock_register(dev, RTC_RES_US);
|
||||
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -290,7 +290,7 @@ aw_rtc_gettime(device_t dev, struct timespec *ts)
|
||||
|
||||
rdate = RTC_READ(sc, sc->conf->rtc_date);
|
||||
rtime = RTC_READ(sc, sc->conf->rtc_time);
|
||||
|
||||
|
||||
if ((rtime & TIME_MASK) == 0)
|
||||
rdate = RTC_READ(sc, sc->conf->rtc_date);
|
||||
|
||||
@ -303,7 +303,7 @@ aw_rtc_gettime(device_t dev, struct timespec *ts)
|
||||
ct.dow = -1;
|
||||
/* RTC resolution is 1 sec */
|
||||
ct.nsec = 0;
|
||||
|
||||
|
||||
return (clock_ct_to_ts(&ct, ts));
|
||||
}
|
||||
|
||||
@ -320,7 +320,7 @@ aw_rtc_settime(device_t dev, struct timespec *ts)
|
||||
ts->tv_nsec = 0;
|
||||
|
||||
clock_ts_to_ct(ts, &ct);
|
||||
|
||||
|
||||
if ((ct.year < YEAR_MIN) || (ct.year > YEAR_MAX)) {
|
||||
device_printf(dev, "could not set time, year out of range\n");
|
||||
return (EINVAL);
|
||||
|
||||
@ -432,7 +432,6 @@ awusbphy_set_mode(struct phynode *phynode, int mode)
|
||||
|
||||
sc->mode = mode;
|
||||
|
||||
|
||||
out:
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -176,7 +176,7 @@ aw_wdog_attach(device_t dev)
|
||||
EVENTHANDLER_REGISTER(watchdog_list, aw_wdog_watchdog_fn, sc, 0);
|
||||
EVENTHANDLER_REGISTER(shutdown_final, aw_wdog_shutdown_fn, sc,
|
||||
SHUTDOWN_PRI_LAST - 1);
|
||||
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
@ -32,4 +32,3 @@
|
||||
void aw_wdog_watchdog_reset(void);
|
||||
|
||||
#endif /*__AW_WDOG_H__*/
|
||||
|
||||
|
||||
@ -1075,7 +1075,6 @@ axp2xx_gpio_pin_set(device_t dev, uint32_t pin, unsigned int val)
|
||||
return (error);
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
axp2xx_gpio_pin_toggle(device_t dev, uint32_t pin)
|
||||
{
|
||||
|
||||
@ -204,7 +204,6 @@
|
||||
#define AXP221_REG_ALDO2_VOLTAGE 0x29
|
||||
#define AXP221_REG_ALDO3_VOLTAGE 0x2A
|
||||
|
||||
|
||||
enum axp2xx_sensor {
|
||||
AXP209_ACVOLT,
|
||||
AXP209_ACCURRENT,
|
||||
|
||||
@ -1317,7 +1317,6 @@ axp8xx_gpio_pin_set(device_t dev, uint32_t pin, unsigned int val)
|
||||
return (error);
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
axp8xx_gpio_pin_toggle(device_t dev, uint32_t pin)
|
||||
{
|
||||
|
||||
@ -300,7 +300,6 @@ NM_CLK(apb1_clk,
|
||||
0, /* gate */
|
||||
AW_CLK_HAS_MUX); /* flags */
|
||||
|
||||
|
||||
NKMP_CLK(pll_ddr_other_clk,
|
||||
CLK_PLL_DDR_OTHER, /* id */
|
||||
"pll_ddr_other", pll_parents, /* name, parents */
|
||||
|
||||
@ -498,7 +498,6 @@ static struct aw_clk_nm_def ir_clk = {
|
||||
/* Missing CSI clock */
|
||||
/* Missing VE clock */
|
||||
|
||||
|
||||
/* Clocks list */
|
||||
static struct aw_ccung_clk a13_ccu_clks[] = {
|
||||
{ .type = AW_CLK_NKMP, .clk.nkmp = &pll_core},
|
||||
|
||||
@ -608,7 +608,6 @@ NM_CLK(spi3_clk,
|
||||
31, /* gate */
|
||||
AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */
|
||||
|
||||
|
||||
static const char *daudio_parents[] = {"pll_audio-8x", "pll_audio-4x", "pll_audio-2x", "pll_audio"};
|
||||
MUX_CLK(daudio0mux_clk,
|
||||
0,
|
||||
|
||||
@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$");
|
||||
/* Non-exported fixed clocks */
|
||||
#define CLK_OSC_12M 150
|
||||
|
||||
|
||||
static struct aw_ccung_reset a83t_ccu_resets[] = {
|
||||
CCU_RESET(RST_USB_PHY0, 0xcc, 0)
|
||||
CCU_RESET(RST_USB_PHY1, 0xcc, 1)
|
||||
|
||||
@ -467,7 +467,7 @@ emac_watchdog(struct emac_softc *sc)
|
||||
"(missed link)\n");
|
||||
} else
|
||||
if_printf(sc->emac_ifp, "watchdog timeout -- resetting\n");
|
||||
|
||||
|
||||
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
|
||||
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
|
||||
emac_init_locked(sc);
|
||||
@ -602,7 +602,6 @@ emac_init_locked(struct emac_softc *sc)
|
||||
callout_reset(&sc->emac_tick_ch, hz, emac_tick, sc);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
emac_start(struct ifnet *ifp)
|
||||
{
|
||||
|
||||
@ -141,7 +141,6 @@ fpga_wait_dclk_pulses(struct fpgamgr_a10_softc *sc, int npulses)
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
fpga_open(struct cdev *dev, int flags __unused,
|
||||
int fmt __unused, struct thread *td __unused)
|
||||
|
||||
@ -42,4 +42,3 @@ __FBSDID("$FreeBSD$");
|
||||
#include <machine/fdt.h>
|
||||
|
||||
#include <arm/altera/socfpga/socfpga_rstmgr.h>
|
||||
|
||||
|
||||
@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <arm/amlogic/aml8726/aml8726_soc.h>
|
||||
#include <arm/amlogic/aml8726/aml8726_ccm.h>
|
||||
|
||||
|
||||
struct aml8726_ccm_softc {
|
||||
device_t dev;
|
||||
struct aml8726_ccm_function *soc;
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
#ifndef _ARM_AMLOGIC_AML8726_CCM_H
|
||||
#define _ARM_AMLOGIC_AML8726_CCM_H
|
||||
|
||||
|
||||
struct aml8726_ccm_gate {
|
||||
uint32_t addr;
|
||||
uint32_t bits;
|
||||
@ -40,7 +39,6 @@ struct aml8726_ccm_function {
|
||||
struct aml8726_ccm_gate *gates;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* aml8726-m3
|
||||
*/
|
||||
@ -109,7 +107,6 @@ struct aml8726_ccm_function aml8726_m3_ccm[] = {
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* aml8726-m6
|
||||
*/
|
||||
@ -178,7 +175,6 @@ struct aml8726_ccm_function aml8726_m6_ccm[] = {
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* aml8726-m8
|
||||
*/
|
||||
@ -250,7 +246,6 @@ struct aml8726_ccm_function aml8726_m8_ccm[] = {
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* aml8726-m8b
|
||||
*/
|
||||
|
||||
@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <arm/amlogic/aml8726/aml8726_soc.h>
|
||||
#include <arm/amlogic/aml8726/aml8726_clkmsr.h>
|
||||
|
||||
|
||||
static struct aml8726_clkmsr_clk {
|
||||
const char * name;
|
||||
uint32_t mux;
|
||||
@ -217,7 +216,6 @@ aml8726_clkmsr_detach(device_t dev)
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
static device_method_t aml8726_clkmsr_methods[] = {
|
||||
/* Device interface */
|
||||
DEVMETHOD(device_probe, aml8726_clkmsr_probe),
|
||||
|
||||
@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include "fb_if.h"
|
||||
|
||||
|
||||
enum aml8726_fb_output {
|
||||
aml8726_unknown_fb_output,
|
||||
aml8726_cvbs_fb_output,
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
#ifndef _ARM_AMLOGIC_AML8726_FB_H
|
||||
#define _ARM_AMLOGIC_AML8726_FB_H
|
||||
|
||||
|
||||
#define AML_CAV_OSD1_INDEX 0x40
|
||||
|
||||
#define AML_CAV_LUT_DATAL_REG 0
|
||||
|
||||
@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include "gpio_if.h"
|
||||
|
||||
|
||||
struct aml8726_gpio_softc {
|
||||
device_t dev;
|
||||
struct resource *res[3];
|
||||
|
||||
@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include "iicbb_if.h"
|
||||
|
||||
|
||||
struct aml8726_iic_softc {
|
||||
device_t dev;
|
||||
struct resource *res[1];
|
||||
|
||||
@ -485,7 +485,6 @@ aml8726_mmc_intr(void *arg)
|
||||
CSR_WRITE_4(sc, AML_MMC_MULT_CONFIG_REG, mcfgr);
|
||||
|
||||
if ((cmdr & AML_MMC_CMD_RESP_CRC7_FROM_8) != 0) {
|
||||
|
||||
/*
|
||||
* Controller supplies 135:8 instead of
|
||||
* 127:0 so discard the leading 8 bits
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
#ifndef _ARM_AMLOGIC_AML8726_MMC_H
|
||||
#define _ARM_AMLOGIC_AML8726_MMC_H
|
||||
|
||||
|
||||
#define AML_MMC_ALIGN_DMA 4
|
||||
#define AML_MMC_MAX_DMA 4096
|
||||
|
||||
|
||||
@ -198,7 +198,6 @@ find_node_for_device(const char *device, const char **compatible)
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
alloc_resource_for_node(phandle_t node, struct resource *res, u_long *size)
|
||||
{
|
||||
@ -221,7 +220,6 @@ alloc_resource_for_node(phandle_t node, struct resource *res, u_long *size)
|
||||
return (err);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
power_on_cpu(int cpu)
|
||||
{
|
||||
@ -375,7 +373,6 @@ platform_mp_setmaxid(void)
|
||||
&aml8726_smp.cpucfg_size) != 0)
|
||||
panic("Could not allocate resource for CPUCONFIG");
|
||||
|
||||
|
||||
/*
|
||||
* Strictly speaking the aobus and cbus may not be required in
|
||||
* order to start an AP (it depends on the processor), however
|
||||
|
||||
@ -172,7 +172,6 @@ aml8726_pinctrl_detach(device_t dev)
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
aml8726_pinctrl_configure_pins(device_t dev, phandle_t cfgxref)
|
||||
{
|
||||
@ -407,7 +406,6 @@ aml8726_pinctrl_configure_pins(device_t dev, phandle_t cfgxref)
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
static device_method_t aml8726_pinctrl_methods[] = {
|
||||
/* Device interface */
|
||||
DEVMETHOD(device_probe, aml8726_pinctrl_probe),
|
||||
|
||||
@ -525,7 +525,6 @@ struct aml8726_pinctrl_function aml8726_m6_pinctrl[] = {
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* aml8726-m8
|
||||
*
|
||||
@ -797,7 +796,6 @@ struct aml8726_pinctrl_function aml8726_m8_pinctrl[] = {
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* aml8726-m8b
|
||||
*
|
||||
|
||||
@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <dev/ofw/ofw_bus.h>
|
||||
#include <dev/ofw/ofw_bus_subr.h>
|
||||
|
||||
|
||||
struct aml8726_rng_softc {
|
||||
device_t dev;
|
||||
struct resource *res[1];
|
||||
|
||||
@ -290,7 +290,6 @@ aml8726_rtc_initialize(struct aml8726_rtc_softc *sc)
|
||||
|
||||
if (sc->init.always == TRUE || (CSR_READ_4(sc, AML_RTC_1_REG) &
|
||||
AML_RTC_SRDY) == 0) {
|
||||
|
||||
/*
|
||||
* The RTC has a 16 bit initialization register. The upper
|
||||
* bits can be written directly. The lower bits are written
|
||||
|
||||
@ -480,7 +480,6 @@ aml8726_sdxc_finish_command(struct aml8726_sdxc_softc *sc, int mmc_error)
|
||||
stop_cmd = (cmd->mrq->stop != cmd) ? cmd->mrq->stop : NULL;
|
||||
|
||||
if (stop_cmd != NULL) {
|
||||
|
||||
/*
|
||||
* If the original command executed successfully, then
|
||||
* the hardware will also have automatically executed
|
||||
|
||||
@ -116,7 +116,7 @@ aml8726_usb_phy_mode(const char *dwcotg_path, uint32_t *mode)
|
||||
char *usb_mode;
|
||||
phandle_t node;
|
||||
ssize_t len;
|
||||
|
||||
|
||||
if ((node = OF_finddevice(dwcotg_path)) == -1)
|
||||
return (ENXIO);
|
||||
|
||||
|
||||
@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <arm/amlogic/aml8726/aml8726_soc.h>
|
||||
|
||||
|
||||
struct aml8726_wdt_softc {
|
||||
device_t dev;
|
||||
struct resource * res[2];
|
||||
@ -115,7 +114,6 @@ aml8726_wdt_watchdog(void *private, u_int cmd, int *error)
|
||||
|
||||
if (cmd != 0 && tens_of_usec <= (AML_WDT_CTRL_TERMINAL_CNT_MASK >>
|
||||
AML_WDT_CTRL_TERMINAL_CNT_SHIFT)) {
|
||||
|
||||
wcr = AML_WDT_CTRL_CPU_WDRESET_MASK |
|
||||
AML_WDT_CTRL_EN | ((uint32_t)tens_of_usec <<
|
||||
AML_WDT_CTRL_TERMINAL_CNT_SHIFT);
|
||||
|
||||
@ -62,7 +62,6 @@ static device_method_t al_ccu_methods[] = {
|
||||
DEVMETHOD(device_probe, al_ccu_probe),
|
||||
DEVMETHOD(device_attach, al_ccu_attach),
|
||||
DEVMETHOD(device_detach, al_ccu_detach),
|
||||
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
||||
@ -61,7 +61,6 @@ static device_method_t nb_service_methods[] = {
|
||||
DEVMETHOD(device_probe, nb_service_probe),
|
||||
DEVMETHOD(device_attach, nb_service_attach),
|
||||
DEVMETHOD(device_detach, nb_service_detach),
|
||||
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
||||
@ -74,7 +74,6 @@ SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
|
||||
|
||||
device_t nexus_dev;
|
||||
|
||||
|
||||
/*
|
||||
* Determine i/o configuration for a machine.
|
||||
*/
|
||||
|
||||
@ -91,7 +91,6 @@ generic_bs_alloc(bus_space_tag_t t, bus_addr_t rstart, bus_addr_t rend, bus_size
|
||||
panic("generic_bs_alloc(): not implemented");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
generic_bs_unmap(bus_space_tag_t t, bus_space_handle_t h, bus_size_t size)
|
||||
{
|
||||
|
||||
@ -644,7 +644,6 @@ bus_dma_tag_destroy(bus_dma_tag_t dmat)
|
||||
dmat_copy = dmat;
|
||||
|
||||
if (dmat != NULL) {
|
||||
|
||||
if (dmat->map_count != 0) {
|
||||
error = EBUSY;
|
||||
goto out;
|
||||
@ -997,7 +996,6 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, pmap_t pmap, bus_dmamap_t map,
|
||||
map->pagesneeded++;
|
||||
}
|
||||
vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK));
|
||||
|
||||
}
|
||||
CTR1(KTR_BUSDMA, "pagesneeded= %d", map->pagesneeded);
|
||||
}
|
||||
@ -1237,7 +1235,6 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
|
||||
if (map->sync_count == 0 ||
|
||||
(kvaddr != 0 && kvaddr != sl_vend) ||
|
||||
(curaddr != sl_pend)) {
|
||||
|
||||
if (++map->sync_count > dmat->nsegments)
|
||||
goto cleanup;
|
||||
sl++;
|
||||
@ -1416,7 +1413,6 @@ bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
|
||||
* we're able to test direct userland dma, panic on a map mismatch.
|
||||
*/
|
||||
if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) {
|
||||
|
||||
CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x "
|
||||
"performing bounce", __func__, dmat, dmat->flags, op);
|
||||
|
||||
|
||||
@ -196,7 +196,6 @@ struct cpu_functions sheeva_cpufuncs = {
|
||||
|
||||
#ifdef CPU_MV_PJ4B
|
||||
struct cpu_functions pj4bv7_cpufuncs = {
|
||||
|
||||
/* Cache operations */
|
||||
.cf_l2cache_wbinv_all = (void *)cpufunc_nullop,
|
||||
.cf_l2cache_wbinv_range = (void *)cpufunc_nullop,
|
||||
@ -214,7 +213,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
|
||||
|
||||
#if defined(CPU_ARM1176)
|
||||
struct cpu_functions arm1176_cpufuncs = {
|
||||
|
||||
/* Cache operations */
|
||||
.cf_l2cache_wbinv_all = (void *)cpufunc_nullop,
|
||||
.cf_l2cache_wbinv_range = (void *)cpufunc_nullop,
|
||||
@ -232,7 +230,6 @@ struct cpu_functions arm1176_cpufuncs = {
|
||||
|
||||
#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
|
||||
struct cpu_functions cortexa_cpufuncs = {
|
||||
|
||||
/* Cache operations */
|
||||
|
||||
/*
|
||||
|
||||
@ -79,7 +79,6 @@ SYSCTL_INT(_hw_cpu_quirks, OID_AUTO, actlr_set,
|
||||
CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &cpu_quirks_actlr_set, 0,
|
||||
"Bits to be set in ACTLR");
|
||||
|
||||
|
||||
/* Read and parse CPU id scheme */
|
||||
void
|
||||
cpuinfo_init(void)
|
||||
|
||||
@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <ddb/db_variables.h>
|
||||
#include <ddb/db_sym.h>
|
||||
|
||||
|
||||
static int nil = 0;
|
||||
|
||||
int db_access_und_sp (struct db_variable *, db_expr_t *, int);
|
||||
@ -253,7 +252,6 @@ db_write_bytes(vm_offset_t addr, size_t size, char *data)
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
static u_int
|
||||
db_fetch_reg(int reg)
|
||||
{
|
||||
|
||||
@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
|
||||
#include <sys/proc.h>
|
||||
#include <sys/kdb.h>
|
||||
#include <sys/stack.h>
|
||||
@ -102,7 +101,6 @@ db_stack_trace_cmd(struct unwind_state *state)
|
||||
i = 0;
|
||||
} else
|
||||
sep = " ";
|
||||
|
||||
}
|
||||
}
|
||||
db_printf("\n");
|
||||
|
||||
@ -53,7 +53,6 @@
|
||||
__FBSDID("$FreeBSD$");
|
||||
#include <sys/param.h>
|
||||
|
||||
|
||||
#include <sys/systm.h>
|
||||
#include <machine/disassem.h>
|
||||
#include <machine/armreg.h>
|
||||
@ -532,7 +531,6 @@ disasm(const disasm_interface_t *di, vm_offset_t loc, int altfmt)
|
||||
return(loc + INSN_SIZE);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
disasm_register_shift(const disasm_interface_t *di, u_int insn)
|
||||
{
|
||||
@ -551,7 +549,6 @@ disasm_register_shift(const disasm_interface_t *di, u_int insn)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
disasm_print_reglist(const disasm_interface_t *di, u_int insn)
|
||||
{
|
||||
|
||||
@ -190,7 +190,6 @@ store_ptr(Elf_Addr *where, Elf_Addr val)
|
||||
}
|
||||
#undef RELOC_ALIGNED_P
|
||||
|
||||
|
||||
/* Process one elf relocation with addend. */
|
||||
static int
|
||||
elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
|
||||
@ -233,7 +232,6 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
|
||||
}
|
||||
|
||||
switch (rtype) {
|
||||
|
||||
case R_ARM_NONE: /* none */
|
||||
break;
|
||||
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kdb.h>
|
||||
|
||||
@ -383,7 +383,6 @@ arm_tmr_acpi_probe(device_t dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static int
|
||||
arm_tmr_attach(device_t dev)
|
||||
{
|
||||
|
||||
@ -98,7 +98,6 @@ __FBSDID("$FreeBSD$");
|
||||
#define GIC_SUPPORT_SECEXT(_sc) \
|
||||
((_sc->typer & GICD_TYPER_SECURITYEXT) == GICD_TYPER_SECURITYEXT)
|
||||
|
||||
|
||||
#ifndef GIC_DEFAULT_ICFGR_INIT
|
||||
#define GIC_DEFAULT_ICFGR_INIT 0x00000000
|
||||
#endif
|
||||
@ -133,7 +132,6 @@ static struct resource_spec arm_gic_spec[] = {
|
||||
{ -1, 0 }
|
||||
};
|
||||
|
||||
|
||||
#if defined(__arm__) && defined(INVARIANTS)
|
||||
static int gic_debug_spurious = 1;
|
||||
#else
|
||||
@ -1137,7 +1135,6 @@ arm_gicv2m_alloc_msi(device_t dev, device_t child, int count, int maxcount,
|
||||
for (i = 0; i < count; i++) {
|
||||
/* Mark the interrupt as used */
|
||||
psc->gic_irqs[irq + i].gi_flags |= GI_FLAG_MSI_USED;
|
||||
|
||||
}
|
||||
mtx_unlock(&sc->sc_mutex);
|
||||
|
||||
|
||||
@ -198,7 +198,6 @@ const struct cpuidtab cpuids[] = {
|
||||
|
||||
{ CPU_ID_MV88FR571_VD, CPU_CLASS_MARVELL, "Feroceon 88FR571-VD",
|
||||
generic_steppings },
|
||||
|
||||
{ 0, CPU_CLASS_NONE, NULL, NULL }
|
||||
};
|
||||
|
||||
|
||||
@ -107,7 +107,6 @@ static struct {
|
||||
CPU_CLASS_KRAIT},
|
||||
};
|
||||
|
||||
|
||||
static void
|
||||
print_v5_cache(void)
|
||||
{
|
||||
@ -168,7 +167,6 @@ print_v5_cache(void)
|
||||
}
|
||||
pdcache_size = multiplier << (CPU_CT_xSIZE_SIZE(dsize) + 8);
|
||||
|
||||
|
||||
/* Print cache info. */
|
||||
if (picache_line_size == 0 && pdcache_line_size == 0)
|
||||
return;
|
||||
@ -272,7 +270,6 @@ add_cap(char *cap)
|
||||
hw_buf_idx += sprintf(hw_buf + hw_buf_idx, ", ");
|
||||
hw_buf_newline = false;
|
||||
|
||||
|
||||
hw_buf_idx += sprintf(hw_buf + hw_buf_idx, "%s", cap);
|
||||
}
|
||||
|
||||
@ -298,7 +295,6 @@ identify_arm_cpu(void)
|
||||
printf("CPU: %s\n", cpu_model);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
if (i >= nitems(cpu_names))
|
||||
printf("unknown CPU (ID = 0x%x)\n", cpuinfo.midr);
|
||||
|
||||
@ -427,7 +427,6 @@ exec_setregs(struct thread *td, struct image_params *imgp, uintptr_t stack)
|
||||
tf->tf_spsr = PSR_USR32_MODE;
|
||||
}
|
||||
|
||||
|
||||
#ifdef VFP
|
||||
/*
|
||||
* Get machine VFP context.
|
||||
@ -928,7 +927,6 @@ initarm(struct arm_boot_params *abp)
|
||||
kernel_pt_table[i].pv_pa =
|
||||
kernel_pt_table[i].pv_va - KERNVIRTADDR +
|
||||
abp->abp_physaddr;
|
||||
|
||||
}
|
||||
}
|
||||
/*
|
||||
|
||||
@ -144,7 +144,6 @@ arm_print_kenv(void)
|
||||
debugf(" %x %s\n", (uint32_t)cp, cp);
|
||||
}
|
||||
|
||||
|
||||
#if defined(LINUX_BOOT_ABI)
|
||||
|
||||
/* Convert the U-Boot command line into FreeBSD kenv and boot options. */
|
||||
@ -344,7 +343,6 @@ default_parse_boot_param(struct arm_boot_params *abp)
|
||||
*/
|
||||
__weak_reference(default_parse_boot_param, parse_boot_param);
|
||||
|
||||
|
||||
/*
|
||||
* Fake up a boot descriptor table
|
||||
*/
|
||||
|
||||
@ -238,7 +238,6 @@ arm_predict_branch(void *cookie, u_int insn, register_t pc, register_t *new_pc,
|
||||
offset = (insn & 0xff) << (32 - offset) |
|
||||
(insn & 0xff) >> offset;
|
||||
} else {
|
||||
|
||||
offset = fetch_reg(cookie, insn & 0x0f);
|
||||
if ((insn & 0x0000ff0) != 0x00000000) {
|
||||
if (insn & 0x10)
|
||||
@ -258,11 +257,9 @@ arm_predict_branch(void *cookie, u_int insn, register_t pc, register_t *new_pc,
|
||||
default:
|
||||
break; /* XXX */
|
||||
}
|
||||
|
||||
}
|
||||
*new_pc = addr + offset;
|
||||
return (0);
|
||||
|
||||
}
|
||||
|
||||
case 0xa: /* b ... */
|
||||
|
||||
@ -252,9 +252,6 @@ arm_tmr_intr(void *arg)
|
||||
return (FILTER_HANDLED);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* arm_tmr_probe - timer probe routine
|
||||
* @dev: new device
|
||||
|
||||
@ -219,7 +219,6 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit)
|
||||
return (child);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Allocate a resource on behalf of child. NB: child is usually going to be a
|
||||
* child of one of our descendants, not a direct child of nexus0.
|
||||
@ -470,4 +469,3 @@ nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells,
|
||||
#endif /* INTRNG */
|
||||
}
|
||||
#endif /* FDT */
|
||||
|
||||
|
||||
@ -33,4 +33,3 @@
|
||||
void nexus_set_dma_tag(bus_dma_tag_t _tag);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -72,4 +72,3 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag,
|
||||
|
||||
return (bus_space_map(*tag, addr, size, flags, handle));
|
||||
}
|
||||
|
||||
|
||||
@ -219,7 +219,6 @@ pl310_wait_background_op(uint32_t off, uint32_t mask)
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* pl310_cache_sync - performs a cache sync operation
|
||||
*
|
||||
@ -251,7 +250,6 @@ pl310_cache_sync(void)
|
||||
pl310_write4(pl310_softc, PL310_CACHE_SYNC, 0xffffffff);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
pl310_wbinv_all(void)
|
||||
{
|
||||
@ -274,7 +272,6 @@ pl310_wbinv_all(void)
|
||||
pl310_cache_sync();
|
||||
PL310_UNLOCK(pl310_softc);
|
||||
return;
|
||||
|
||||
}
|
||||
if (pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r3p0)
|
||||
platform_pl310_write_debug(pl310_softc, 3);
|
||||
@ -306,7 +303,6 @@ pl310_wbinv_range(vm_paddr_t start, vm_size_t size)
|
||||
size += g_l2cache_line_size;
|
||||
}
|
||||
|
||||
|
||||
#ifdef PL310_ERRATA_727915
|
||||
if (pl310_softc->sc_rtl_revision >= CACHE_ID_RELEASE_r2p0 &&
|
||||
pl310_softc->sc_rtl_revision < CACHE_ID_RELEASE_r3p1)
|
||||
@ -595,4 +591,3 @@ static devclass_t pl310_devclass;
|
||||
|
||||
EARLY_DRIVER_MODULE(pl310, simplebus, pl310_driver, pl310_devclass, 0, 0,
|
||||
BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
|
||||
|
||||
|
||||
@ -712,7 +712,6 @@ pmap_free_l2_bucket(pmap_t pm, struct l2_bucket *l2b, u_int count)
|
||||
pt_entry_t *ptep;
|
||||
u_short l1idx;
|
||||
|
||||
|
||||
/*
|
||||
* Update the bucket's reference count according to how many
|
||||
* PTEs the caller has just invalidated.
|
||||
@ -1057,9 +1056,7 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offset_t va)
|
||||
/* check for user uncachable conditions - order is important */
|
||||
if (pm != kernel_pmap &&
|
||||
(pv->pv_pmap == pm || pv->pv_pmap == kernel_pmap)) {
|
||||
|
||||
if ((uentries > 1 && uwritable) || uwritable > 1) {
|
||||
|
||||
/* user duplicate mapping */
|
||||
if (pv->pv_pmap != kernel_pmap)
|
||||
pv->pv_flags |= PVF_MWC;
|
||||
@ -1083,7 +1080,6 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offset_t va)
|
||||
(pv->pv_pmap == kernel_pmap ||
|
||||
(pv->pv_flags & PVF_WRITE) ||
|
||||
(pv->pv_flags & PVF_MWC)))) {
|
||||
|
||||
if (!(pv->pv_flags & PVF_NC)) {
|
||||
pv->pv_flags |= PVF_NC;
|
||||
pmap_set_cache_entry(pv, pm, va, -1);
|
||||
@ -1094,7 +1090,6 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offset_t va)
|
||||
/* kernel and user are cachable */
|
||||
if ((pm == kernel_pmap) && !(pv->pv_flags & PVF_MWC) &&
|
||||
(pv->pv_flags & PVF_NC)) {
|
||||
|
||||
pv->pv_flags &= ~PVF_NC;
|
||||
if (pg->md.pv_memattr != VM_MEMATTR_UNCACHEABLE)
|
||||
pmap_set_cache_entry(pv, pm, va, 1);
|
||||
@ -1104,7 +1099,6 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offset_t va)
|
||||
if (pm != kernel_pmap &&
|
||||
(pv->pv_pmap == pm || pv->pv_pmap == kernel_pmap) &&
|
||||
!pmwc && (pv->pv_flags & PVF_NC)) {
|
||||
|
||||
pv->pv_flags &= ~(PVF_NC | PVF_MWC);
|
||||
if (pg->md.pv_memattr != VM_MEMATTR_UNCACHEABLE)
|
||||
pmap_set_cache_entry(pv, pm, va, 1);
|
||||
@ -1278,7 +1272,6 @@ pmap_clearbit(struct vm_page *pg, u_int maskbits)
|
||||
}
|
||||
|
||||
PMAP_UNLOCK(pm);
|
||||
|
||||
}
|
||||
|
||||
if (maskbits & PVF_WRITE)
|
||||
@ -1679,7 +1672,6 @@ pmap_fault_fixup(pmap_t pm, vm_offset_t va, vm_prot_t ftype, int user)
|
||||
pg->md.pvh_attrs |= PVF_REF;
|
||||
pv->pv_flags |= PVF_REF;
|
||||
|
||||
|
||||
*ptep = (pte & ~L2_TYPE_MASK) | L2_S_PROTO;
|
||||
PTE_SYNC(ptep);
|
||||
rv = 1;
|
||||
@ -1788,7 +1780,6 @@ pmap_postinit(void)
|
||||
pmap_init_l1(l1, pl1pt);
|
||||
}
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
printf("pmap_postinit: Allocated %d static L1 descriptor tables\n",
|
||||
needed);
|
||||
@ -1846,7 +1837,6 @@ pmap_activate(struct thread *td)
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* We MUST, I repeat, MUST fix up the L1 entry corresponding
|
||||
* to 'vector_page' in the incoming L1 table before switching
|
||||
@ -1854,7 +1844,6 @@ pmap_activate(struct thread *td)
|
||||
* domain faults!) will jump into hyperspace.
|
||||
*/
|
||||
if (pcb->pcb_pl1vec) {
|
||||
|
||||
*pcb->pcb_pl1vec = pcb->pcb_l1vec;
|
||||
/*
|
||||
* Don't need to PTE_SYNC() at this point since
|
||||
@ -2045,7 +2034,6 @@ pmap_bootstrap(vm_offset_t firstaddr, struct pv_addr *l1pt)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Ensure the primary (kernel) L1 has the correct cache mode for
|
||||
* a page table. Bitch if it is not correctly set.
|
||||
@ -2156,15 +2144,12 @@ pmap_release(pmap_t pmap)
|
||||
curpcb->pcb_l1vec = pcb->pcb_l1vec;
|
||||
curpcb->pcb_dacr = pcb->pcb_dacr;
|
||||
curpcb->pcb_pagedir = pcb->pcb_pagedir;
|
||||
|
||||
}
|
||||
pmap_free_l1(pmap);
|
||||
|
||||
dprintf("pmap_release()\n");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Helper function for pmap_grow_l2_bucket()
|
||||
*/
|
||||
@ -2290,7 +2275,6 @@ pmap_grow_l2_bucket(pmap_t pm, vm_offset_t va)
|
||||
return (l2b);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* grow the number of kernel page table entries, if needed
|
||||
*/
|
||||
@ -2321,7 +2305,6 @@ pmap_growkernel(vm_offset_t addr)
|
||||
kernel_vm_end = pmap_curmaxkvaddr;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Remove all pages from specified address space
|
||||
* this aids process exit speeds. Also, this code
|
||||
@ -2369,7 +2352,6 @@ pmap_remove_pages(pmap_t pmap)
|
||||
PMAP_UNLOCK(pmap);
|
||||
}
|
||||
|
||||
|
||||
/***************************************************
|
||||
* Low level mapping routines.....
|
||||
***************************************************/
|
||||
@ -2407,7 +2389,6 @@ pmap_kenter_internal(vm_offset_t va, vm_offset_t pa, int flags)
|
||||
PDEBUG(1, printf("pmap_kenter: va = %08x, pa = %08x\n",
|
||||
(uint32_t) va, (uint32_t) pa));
|
||||
|
||||
|
||||
l2b = pmap_get_l2_bucket(kernel_pmap, va);
|
||||
if (l2b == NULL)
|
||||
l2b = pmap_grow_l2_bucket(kernel_pmap, va);
|
||||
@ -2565,7 +2546,6 @@ pmap_kremove(vm_offset_t va)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Used to map a range of physical addresses into kernel
|
||||
* virtual address space.
|
||||
@ -2636,7 +2616,6 @@ pmap_qenter(vm_offset_t va, vm_page_t *m, int count)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* this routine jerks page mappings from the
|
||||
* kernel -- it is meant only for temporary mappings.
|
||||
@ -2657,7 +2636,6 @@ pmap_qremove(vm_offset_t va, int count)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pmap_object_init_pt preloads the ptes for a given object
|
||||
* into the specified pmap. This eliminates the blast of soft
|
||||
@ -2673,7 +2651,6 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object,
|
||||
("pmap_object_init_pt: non-device object"));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pmap_is_prefaultable:
|
||||
*
|
||||
@ -2828,7 +2805,6 @@ pmap_remove_all(vm_page_t m)
|
||||
rw_wunlock(&pvh_global_lock);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Set the physical protection on the
|
||||
* specified range of this map as requested.
|
||||
@ -2917,7 +2893,6 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (flush) {
|
||||
if (PV_BEEN_EXECD(flags))
|
||||
pmap_tlb_flushID(pm);
|
||||
@ -2930,7 +2905,6 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
|
||||
PMAP_UNLOCK(pm);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Insert the given physical page (p) at
|
||||
* the specified virtual address (v) in the
|
||||
@ -3109,7 +3083,6 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
|
||||
* must remove it from the PV list
|
||||
*/
|
||||
if ((pve = pmap_remove_pv(opg, pmap, va))) {
|
||||
|
||||
/* note for patch: the oflags/invalidation was moved
|
||||
* because PG_FICTITIOUS pages could free the pve
|
||||
*/
|
||||
@ -3223,7 +3196,6 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
|
||||
else if (PV_BEEN_REFD(oflags))
|
||||
pmap_tlb_flushD_SE(pmap, va);
|
||||
|
||||
|
||||
if (m)
|
||||
pmap_fix_cache(m, pmap, va);
|
||||
}
|
||||
@ -3332,7 +3304,6 @@ pmap_unwire(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
|
||||
PMAP_UNLOCK(pmap);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Copy the range specified by src_addr/len
|
||||
* from the source map to the range dst_addr/len
|
||||
@ -3346,7 +3317,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr,
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Routine: pmap_extract
|
||||
* Function:
|
||||
@ -3546,12 +3516,10 @@ pmap_pinit(pmap_t pmap)
|
||||
return (1);
|
||||
}
|
||||
|
||||
|
||||
/***************************************************
|
||||
* page management routines.
|
||||
***************************************************/
|
||||
|
||||
|
||||
static void
|
||||
pmap_free_pv_entry(pv_entry_t pv)
|
||||
{
|
||||
@ -3559,7 +3527,6 @@ pmap_free_pv_entry(pv_entry_t pv)
|
||||
uma_zfree(pvzone, pv);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* get a new pv_entry, allocating a block from the system
|
||||
* when needed.
|
||||
@ -3595,7 +3562,6 @@ pmap_remove(pmap_t pm, vm_offset_t sva, vm_offset_t eva)
|
||||
u_int mappings, is_exec, is_refd;
|
||||
int flushall = 0;
|
||||
|
||||
|
||||
/*
|
||||
* we lock in the pmap => pv_head direction
|
||||
*/
|
||||
@ -3745,7 +3711,6 @@ pmap_zero_page(vm_page_t m)
|
||||
pmap_zero_page_generic(VM_PAGE_TO_PHYS(m), 0, PAGE_SIZE);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pmap_zero_page_area zeros the specified hardware page by mapping
|
||||
* the page into KVM and using bzero to clear its contents.
|
||||
@ -3759,7 +3724,6 @@ pmap_zero_page_area(vm_page_t m, int off, int size)
|
||||
pmap_zero_page_generic(VM_PAGE_TO_PHYS(m), off, size);
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* pmap_clean_page()
|
||||
@ -4077,7 +4041,6 @@ pmap_ts_referenced(vm_page_t m)
|
||||
return (pmap_clearbit(m, PVF_REF));
|
||||
}
|
||||
|
||||
|
||||
boolean_t
|
||||
pmap_is_modified(vm_page_t m)
|
||||
{
|
||||
@ -4090,7 +4053,6 @@ pmap_is_modified(vm_page_t m)
|
||||
return(FALSE);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Clear the modify bits on the specified physical page.
|
||||
*/
|
||||
@ -4108,7 +4070,6 @@ pmap_clear_modify(vm_page_t m)
|
||||
pmap_clearbit(m, PVF_MOD);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pmap_is_referenced:
|
||||
*
|
||||
@ -4124,7 +4085,6 @@ pmap_is_referenced(vm_page_t m)
|
||||
return ((m->md.pvh_attrs & PVF_REF) != 0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Clear the write and modified bits in each of the given page's mappings.
|
||||
*/
|
||||
@ -4140,7 +4100,6 @@ pmap_remove_write(vm_page_t m)
|
||||
pmap_clearbit(m, PVF_WRITE);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Perform the pmap work for mincore(2). If the page is not both referenced and
|
||||
* modified by this pmap, returns its physical address so that the caller can
|
||||
@ -4199,13 +4158,11 @@ pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t *pap)
|
||||
return (val);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
pmap_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Increase the starting virtual address of the given mapping if a
|
||||
* different alignment might result in more superpage mappings.
|
||||
@ -4277,7 +4234,6 @@ pmap_link_l2pt(vm_offset_t l1pt, vm_offset_t va, struct pv_addr *l2pv)
|
||||
|
||||
SLIST_INSERT_HEAD(&kernel_pt_list, l2pv, pv_list);
|
||||
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -1461,7 +1461,6 @@ pmap_kenter_temporary(vm_paddr_t pa, int i)
|
||||
return ((void *)crashdumpmap);
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
*
|
||||
* TLB & cache maintenance routines.
|
||||
@ -5737,7 +5736,6 @@ pmap_clear_modify(vm_page_t m)
|
||||
rw_wunlock(&pvh_global_lock);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Sets the memory attribute for the specified page.
|
||||
*/
|
||||
@ -6309,7 +6307,6 @@ pmap_set_pcb_pagedir(pmap_t pmap, struct pcb *pcb)
|
||||
pcb->pcb_pagedir = pmap_ttb_get(pmap);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Clean L1 data cache range by physical address.
|
||||
* The range must be within a single page.
|
||||
|
||||
@ -78,7 +78,6 @@
|
||||
* Created : 28/11/94
|
||||
*/
|
||||
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
|
||||
@ -213,7 +213,6 @@ abort_handler(struct trapframe *tf, int type)
|
||||
td->td_frame = tf;
|
||||
if (td->td_cowgen != td->td_proc->p_cowgen)
|
||||
thread_cow_update(td);
|
||||
|
||||
}
|
||||
/* Grab the current pcb */
|
||||
pcb = td->td_pcb;
|
||||
@ -225,7 +224,6 @@ abort_handler(struct trapframe *tf, int type)
|
||||
enable_interrupts(PSR_F);
|
||||
}
|
||||
|
||||
|
||||
/* Invoke the appropriate handler, if necessary */
|
||||
if (__predict_false(data_aborts[fsr & FAULT_TYPE_MASK].func != NULL)) {
|
||||
if ((data_aborts[fsr & FAULT_TYPE_MASK].func)(tf, fsr, far,
|
||||
@ -293,7 +291,6 @@ abort_handler(struct trapframe *tf, int type)
|
||||
|
||||
/* Was the fault due to the FPE/IPKDB ? */
|
||||
if (__predict_false((tf->tf_spsr & PSR_MODE)==PSR_UND32_MODE)) {
|
||||
|
||||
/*
|
||||
* Force exit via userret()
|
||||
* This is necessary as the FPE is an extension to
|
||||
@ -369,7 +366,6 @@ abort_handler(struct trapframe *tf, int type)
|
||||
dab_fatal(tf, fsr, far, td, &ksig);
|
||||
}
|
||||
|
||||
|
||||
do_trapsignal:
|
||||
call_trapsignal(td, signo, ucode);
|
||||
out:
|
||||
@ -639,7 +635,6 @@ prefetch_abort_handler(struct trapframe *tf)
|
||||
dab_fatal(tf, 0, tf->tf_pc, NULL, &ksig);
|
||||
td->td_pticks = 0;
|
||||
|
||||
|
||||
/* Ok validate the address, can only execute in USER space */
|
||||
if (__predict_false(fault_pc >= VM_MAXUSER_ADDRESS ||
|
||||
(fault_pc < VM_MIN_ADDRESS && vector_page == ARM_VECTORS_LOW))) {
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
* Created : 06/01/95
|
||||
*/
|
||||
|
||||
|
||||
#include "opt_ddb.h"
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
@ -106,7 +105,6 @@ static int gdb_trapper(u_int, u_int, struct trapframe *, int);
|
||||
|
||||
LIST_HEAD(, undefined_handler) undefined_handlers[MAX_COPROCS];
|
||||
|
||||
|
||||
void *
|
||||
install_coproc_handler(int coproc, undef_handler_t handler)
|
||||
{
|
||||
@ -138,7 +136,6 @@ remove_coproc_handler(void *cookie)
|
||||
free(uh, M_TEMP);
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
gdb_trapper(u_int addr, u_int insn, struct trapframe *frame, int code)
|
||||
{
|
||||
@ -183,7 +180,7 @@ gdb_trapper(u_int addr, u_int insn, struct trapframe *frame, int code)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -203,7 +200,6 @@ undefined_init(void)
|
||||
install_coproc_handler_static(0, &gdb_uh);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
undefinedinstruction(struct trapframe *frame)
|
||||
{
|
||||
|
||||
@ -100,7 +100,6 @@ set_coprocessorACR(u_int val)
|
||||
isb();
|
||||
}
|
||||
|
||||
|
||||
/* called for each cpu */
|
||||
void
|
||||
vfp_init(void)
|
||||
@ -170,7 +169,6 @@ vfp_init(void)
|
||||
|
||||
SYSINIT(vfp, SI_SUB_CPU, SI_ORDER_ANY, vfp_init, NULL);
|
||||
|
||||
|
||||
/* start VFP unit, restore the vfp registers from the PCB and retry
|
||||
* the instruction
|
||||
*/
|
||||
@ -324,4 +322,3 @@ vfp_discard(struct thread *td)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -148,7 +148,6 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
|
||||
tf->tf_r0 = 0;
|
||||
tf->tf_r1 = 0;
|
||||
|
||||
|
||||
/* Setup to release spin count in fork_exit(). */
|
||||
td2->td_md.md_spinlock_count = 1;
|
||||
td2->td_md.md_saved_cspr = PSR_SVC32_MODE;
|
||||
|
||||
@ -412,7 +412,7 @@ bcm2835_audio_update_params(struct bcm2835_audio_info *sc, uint32_t fmt, uint32_
|
||||
static bool
|
||||
bcm2835_audio_buffer_should_sleep(struct bcm2835_audio_chinfo *ch)
|
||||
{
|
||||
|
||||
|
||||
if (ch->playback_state != PLAYBACK_PLAYING)
|
||||
return (true);
|
||||
|
||||
@ -953,7 +953,6 @@ static device_method_t bcm2835_audio_methods[] = {
|
||||
DEVMETHOD(device_probe, bcm2835_audio_probe),
|
||||
DEVMETHOD(device_attach, bcm2835_audio_attach),
|
||||
DEVMETHOD(device_detach, bcm2835_audio_detach),
|
||||
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
||||
@ -642,8 +642,6 @@ bcm2835_cpufreq_get_temperature(struct bcm2835_cpufreq_softc *sc)
|
||||
return (value);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
sysctl_bcm2835_cpufreq_arm_freq(SYSCTL_HANDLER_ARGS)
|
||||
{
|
||||
@ -1022,7 +1020,6 @@ sysctl_bcm2835_devcpu_temperature(SYSCTL_HANDLER_ARGS)
|
||||
return (EINVAL);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
bcm2835_cpufreq_init(void *arg)
|
||||
{
|
||||
|
||||
@ -191,7 +191,6 @@ static device_method_t bcm_fb_methods[] = {
|
||||
/* Device interface */
|
||||
DEVMETHOD(device_probe, bcm_fb_probe),
|
||||
DEVMETHOD(device_attach, bcm_fb_attach),
|
||||
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
||||
@ -598,7 +598,6 @@ bcm_gpio_sysctl_init(struct bcm_gpio_softc *sc)
|
||||
pin_tree = SYSCTL_CHILDREN(pin_node);
|
||||
|
||||
for (i = 0; i < sc->sc_gpio_npins; i++) {
|
||||
|
||||
snprintf(pinbuf, sizeof(pinbuf), "%d", i);
|
||||
pinN_node = SYSCTL_ADD_NODE(ctx, pin_tree, OID_AUTO, pinbuf,
|
||||
CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "GPIO Pin");
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
@ -439,7 +438,6 @@ static device_method_t bcm_intc_methods[] = {
|
||||
DEVMETHOD(pic_post_filter, bcm_intc_post_filter),
|
||||
DEVMETHOD(pic_post_ithread, bcm_intc_post_ithread),
|
||||
DEVMETHOD(pic_pre_ithread, bcm_intc_pre_ithread),
|
||||
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
||||
@ -119,8 +119,6 @@ bcm2836_devmap_init(platform_t plat)
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
static void
|
||||
bcm2835_cpu_reset(platform_t plat)
|
||||
{
|
||||
|
||||
@ -535,18 +535,18 @@ bcm2835_mbox_fb_get_bpp(struct bcm2835_fb_config *fb)
|
||||
{
|
||||
int err;
|
||||
struct msg_fb_get_bpp msg;
|
||||
|
||||
|
||||
memset(&msg, 0, sizeof(msg));
|
||||
msg.hdr.buf_size = sizeof(msg);
|
||||
msg.hdr.code = BCM2835_MBOX_CODE_REQ;
|
||||
BCM2835_MBOX_INIT_TAG(&msg.bpp, GET_DEPTH);
|
||||
msg.bpp.tag_hdr.val_len = 0;
|
||||
msg.end_tag = 0;
|
||||
|
||||
|
||||
err = bcm2835_mbox_property(&msg, sizeof(msg));
|
||||
if (err == 0)
|
||||
fb->bpp = msg.bpp.body.resp.bpp;
|
||||
|
||||
|
||||
return (err);
|
||||
}
|
||||
|
||||
@ -592,4 +592,3 @@ bcm2835_mbox_fb_init(struct bcm2835_fb_config *fb)
|
||||
|
||||
return (err);
|
||||
}
|
||||
|
||||
|
||||
@ -60,8 +60,6 @@ struct bcm2835_mbox_tag_hdr {
|
||||
|
||||
#define BCM2835_MBOX_TAG_FIRMWARE_REVISION 0x00000001
|
||||
|
||||
|
||||
|
||||
#define BCM2835_MBOX_POWER_ID_EMMC 0x00000000
|
||||
#define BCM2835_MBOX_POWER_ID_UART0 0x00000001
|
||||
#define BCM2835_MBOX_POWER_ID_UART1 0x00000002
|
||||
|
||||
@ -490,7 +490,6 @@ bcm_pwm_get_node(device_t bus, device_t dev)
|
||||
return (ofw_bus_get_node(bus));
|
||||
}
|
||||
|
||||
|
||||
static device_method_t bcm_pwm_methods[] = {
|
||||
/* Device interface */
|
||||
DEVMETHOD(device_probe, bcm_pwm_probe),
|
||||
|
||||
@ -105,10 +105,8 @@ __FBSDID("$FreeBSD$");
|
||||
#include <arm/broadcom/bcm2835/bcm2835_mbox_prop.h>
|
||||
#include "bcm2835_vcbus.h"
|
||||
|
||||
|
||||
/* #define SDHOST_DEBUG */
|
||||
|
||||
|
||||
/* Registers */
|
||||
#define HC_COMMAND 0x00 /* Command and flags */
|
||||
#define HC_ARGUMENT 0x04
|
||||
@ -233,7 +231,6 @@ static void bcm_sdhost_intr(void *);
|
||||
|
||||
static int bcm_sdhost_get_ro(device_t, device_t);
|
||||
|
||||
|
||||
static inline uint32_t
|
||||
RD4(struct bcm_sdhost_softc *sc, bus_size_t off)
|
||||
{
|
||||
@ -301,7 +298,6 @@ bcm_sdhost_print_regs(struct bcm_sdhost_softc *sc, struct sdhci_slot *slot,
|
||||
{
|
||||
|
||||
if (bcm2835_sdhost_debug > 0 || error > 0) {
|
||||
|
||||
printf("%s: sc=%p slot=%p\n",
|
||||
__func__, sc, slot);
|
||||
printf("HC_COMMAND: 0x%08x\n",
|
||||
@ -334,7 +330,6 @@ bcm_sdhost_print_regs(struct bcm_sdhost_softc *sc, struct sdhci_slot *slot,
|
||||
RD4(sc, HC_BLOCKCOUNT));
|
||||
|
||||
} else {
|
||||
|
||||
/*
|
||||
printf("%04d | HC_COMMAND: 0x%08x HC_ARGUMENT: 0x%08x "
|
||||
"HC_HOSTSTATUS: 0x%08x HC_HOSTCONFIG: 0x%08x\n",
|
||||
|
||||
@ -138,7 +138,6 @@ bcm_systimer_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
|
||||
register_t s;
|
||||
|
||||
if (first != 0) {
|
||||
|
||||
count = ((uint32_t)et->et_frequency * first) >> 32;
|
||||
|
||||
s = intr_disable();
|
||||
|
||||
@ -124,7 +124,6 @@ static struct ofw_compat_data compat_data[] = {
|
||||
{"brcm,bcm2711-pcie", 1},
|
||||
{"brcm,bcm7211-pcie", 1},
|
||||
{"brcm,bcm7445-pcie", 1},
|
||||
|
||||
{NULL, 0}
|
||||
};
|
||||
|
||||
@ -740,4 +739,3 @@ DEFINE_CLASS_1(pcib, bcm_pcib_driver, bcm_pcib_methods,
|
||||
|
||||
static devclass_t bcm_pcib_devclass;
|
||||
DRIVER_MODULE(bcm_pcib, simplebus, bcm_pcib_driver, bcm_pcib_devclass, 0, 0);
|
||||
|
||||
|
||||
@ -214,4 +214,3 @@ DEFINE_CLASS_1(bcm_xhci, bcm_xhci_driver, bcm_xhci_methods,
|
||||
|
||||
static devclass_t xhci_devclass;
|
||||
DRIVER_MODULE(bcm_xhci, pci, bcm_xhci_driver, xhci_devclass, 0, 0); MODULE_DEPEND(bcm_xhci, usb, 1, 1, 1);
|
||||
|
||||
|
||||
@ -204,4 +204,3 @@ static devclass_t ocotp_devclass;
|
||||
|
||||
EARLY_DRIVER_MODULE(ocotp, simplebus, ocotp_driver, ocotp_devclass, 0, 0,
|
||||
BUS_PASS_CPU + BUS_PASS_ORDER_FIRST);
|
||||
|
||||
|
||||
@ -249,7 +249,6 @@ imxccm_attach(device_t dev)
|
||||
imx51_get_clock(IMX51CLK_IPG_CLK_ROOT),
|
||||
imx51_get_clock(IMX51CLK_PERCLK_ROOT));
|
||||
|
||||
|
||||
return (0);
|
||||
|
||||
noclocks:
|
||||
@ -438,7 +437,6 @@ imx51_get_clock(enum imx51_clock clk)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static uint64_t
|
||||
imx51_get_pll_freq(u_int pll_no)
|
||||
{
|
||||
@ -661,4 +659,3 @@ imx_ccm_ahb_hz(void)
|
||||
|
||||
return (imx51_get_clock(IMX51CLK_AHB_CLK_ROOT));
|
||||
}
|
||||
|
||||
|
||||
@ -257,4 +257,3 @@
|
||||
#define CCGR_CLK_MODE_ALWAYS 3
|
||||
|
||||
#endif /* _IMX51_CCMREG_H */
|
||||
|
||||
|
||||
@ -155,7 +155,6 @@ static uint32_t colors_24[16] = {
|
||||
0xFFFF00,/* Yellow */
|
||||
0xFFFFFF,/* White */
|
||||
|
||||
|
||||
};
|
||||
|
||||
#define IPUV3_READ(ipuv3, module, reg) \
|
||||
@ -422,7 +421,6 @@ static device_method_t ipu3_fb_methods[] = {
|
||||
/* Device interface */
|
||||
DEVMETHOD(device_probe, ipu3_fb_probe),
|
||||
DEVMETHOD(device_attach, ipu3_fb_attach),
|
||||
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
||||
@ -816,4 +816,3 @@ EARLY_DRIVER_MODULE(imx6_anatop, simplebus, imx6_anatop_driver,
|
||||
imx6_anatop_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
|
||||
EARLY_DRIVER_MODULE(imx6_anatop, ofwbus, imx6_anatop_driver,
|
||||
imx6_anatop_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
|
||||
|
||||
|
||||
@ -518,4 +518,3 @@ static devclass_t ccm_devclass;
|
||||
|
||||
EARLY_DRIVER_MODULE(ccm, simplebus, ccm_driver, ccm_devclass, 0, 0,
|
||||
BUS_PASS_CPU + BUS_PASS_ORDER_EARLY);
|
||||
|
||||
|
||||
@ -154,7 +154,7 @@
|
||||
|
||||
#define CCM_ANALOG_PLL_VIDEO_NUM 0x000040b0
|
||||
#define CCM_ANALOG_PLL_VIDEO_DENOM 0x000040c0
|
||||
|
||||
|
||||
#define CCM_ANALOG_PLL_ENET 0x000040e0
|
||||
#define CCM_ANALOG_PLL_ENET_LOCK (1u << 31)
|
||||
#define CCM_ANALOG_PLL_ENET_ENABLE_100M (1u << 20) /* SATA */
|
||||
|
||||
@ -152,7 +152,6 @@ imx6_mp_start_ap(platform_t plat)
|
||||
|
||||
val |= ((1 << (SRC_CONTROL_C1ENA_SHIFT - 1 + i )) |
|
||||
( 1 << (SRC_CONTROL_C1RST_SHIFT - 1 + i)));
|
||||
|
||||
}
|
||||
bus_space_write_4(fdtbus_bs_tag, src, SRC_CONTROL_REG, val);
|
||||
|
||||
|
||||
@ -279,7 +279,6 @@ static kobj_method_t ssimixer_methods[] = {
|
||||
};
|
||||
MIXER_DECLARE(ssimixer);
|
||||
|
||||
|
||||
/*
|
||||
* Channel interface.
|
||||
*/
|
||||
|
||||
@ -207,4 +207,3 @@ static devclass_t usbphy_devclass;
|
||||
*/
|
||||
EARLY_DRIVER_MODULE(usbphy, simplebus, usbphy_driver, usbphy_devclass, 0, 0,
|
||||
BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE);
|
||||
|
||||
|
||||
@ -137,7 +137,6 @@ uart_cnungrab(struct consdev *cp)
|
||||
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
uart_cnprobe(struct consdev *cp)
|
||||
{
|
||||
|
||||
@ -864,7 +864,7 @@ imx51_gpio_attach(device_t dev)
|
||||
intr_pic_register(dev, OF_xref_from_node(ofw_bus_get_node(dev)));
|
||||
#endif
|
||||
sc->sc_busdev = gpiobus_attach_bus(dev);
|
||||
|
||||
|
||||
if (sc->sc_busdev == NULL) {
|
||||
imx51_gpio_detach(dev);
|
||||
return (ENXIO);
|
||||
|
||||
@ -328,4 +328,3 @@ static devclass_t imx_iomux_devclass;
|
||||
|
||||
EARLY_DRIVER_MODULE(imx_iomux, simplebus, imx_iomux_driver,
|
||||
imx_iomux_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_LATE);
|
||||
|
||||
|
||||
@ -130,4 +130,3 @@ imx_wdog_init_last_reset(vm_offset_t wdsr_phys)
|
||||
sysctl___hw_imx_last_reset_reason.oid_arg1 = "PowerOnReset";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -69,4 +69,3 @@ imx_soc_family(void)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -120,4 +120,3 @@ static driver_t usbphy_driver = {
|
||||
static devclass_t usbphy_devclass;
|
||||
|
||||
DRIVER_MODULE(usbphy, simplebus, usbphy_driver, usbphy_devclass, 0, 0);
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user