Signed-off-by: Elyes HAOUAS <[email protected]> --- diff --git sys/arch/arm64/arm64/cpu.c sys/arch/arm64/arm64/cpu.c index 8d1618419a7..83bb862a5a6 100644 --- sys/arch/arm64/arm64/cpu.c +++ sys/arch/arm64/arm64/cpu.c @@ -1186,7 +1186,7 @@ cpu_opp_get_cooling_level(void *cookie, uint32_t *cells) { struct cpu_info *ci = cookie; struct opp_table *ot = ci->ci_opp_table; - + return ot->ot_nopp - ci->ci_opp_max - 1; } diff --git sys/arch/arm64/arm64/pmap.c sys/arch/arm64/arm64/pmap.c index a34968e2848..e7ac80250a2 100644 --- sys/arch/arm64/arm64/pmap.c +++ sys/arch/arm64/arm64/pmap.c @@ -267,7 +267,7 @@ pmap_rollover_asid(pmap_t pm) memset(pmap_asid, 0, (pmap_nasid / 32) * sizeof(uint32_t)); pmap_asid[0] |= (3U << 0); - /* + /* * Carry over all the ASIDs that are currently active into the * new generation and reserve them. */ @@ -1020,7 +1020,7 @@ pmap_vp_destroy_l2_l3(pmap_t pm, struct pmapvp1 *vp1) if (pted == NULL) continue; vp3->vp[l] = NULL; - + pool_put(&pmap_pted_pool, pted); } pool_put(&pmap_vp_pool, vp3); @@ -1150,7 +1150,7 @@ pmap_kpted_alloc(void) if (pted == NULL) return NULL; } - + npted = PAGE_SIZE / sizeof(struct pte_desc); } @@ -1228,7 +1228,7 @@ pmap_growkernel(vaddr_t maxkvaddr) fail: splx(s); - + return pmap_maxkvaddr; } diff --git sys/arch/arm64/arm64/syscall.c sys/arch/arm64/arm64/syscall.c index 8412c2b93cc..00d9b79efca 100644 --- sys/arch/arm64/arm64/syscall.c +++ sys/arch/arm64/arm64/syscall.c @@ -58,7 +58,7 @@ svc_handler(trapframe_t *frame) ap = &frame->tf_x[0]; callp = p->p_p->ps_emul->e_sysent; - switch (code) { + switch (code) { case SYS_syscall: code = *ap++; nap--; diff --git sys/arch/arm64/dev/acpipci.c sys/arch/arm64/dev/acpipci.c index 28d35d09c87..1789738dafe 100644 --- sys/arch/arm64/dev/acpipci.c +++ sys/arch/arm64/dev/acpipci.c @@ -162,7 +162,7 @@ acpipci_attach(struct device *parent, struct device *self, void *aux) sc->sc_seg = seg; sc->sc_iot = aaa->aaa_memt; - + printf("\n"); /* Create extents for our address spaces. */ @@ -500,7 +500,7 @@ acpipci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp) val->v_package[2]->type != AML_OBJTYPE_INTEGER || val->v_package[3]->type != AML_OBJTYPE_INTEGER) continue; - + addr = val->v_package[0]->v_integer; pin = val->v_package[1]->v_integer; source = val->v_package[2]->v_integer; @@ -509,7 +509,7 @@ acpipci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp) ACPI_ADR_PCIFUN(addr) != 0xffff || pin != pa->pa_intrpin - 1 || source != 0) continue; - + ihp->ih_pc = pa->pa_pc; ihp->ih_tag = pa->pa_tag; ihp->ih_intrpin = index; @@ -633,7 +633,7 @@ acpipci_bs_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, addr + at->at_offset, size, flags, bshp); } } - + return ENXIO; } diff --git sys/arch/arm64/dev/agintc.c sys/arch/arm64/dev/agintc.c index 9c96c4636e9..35e535f429f 100644 --- sys/arch/arm64/dev/agintc.c +++ sys/arch/arm64/dev/agintc.c @@ -426,7 +426,7 @@ agintc_attach(struct device *parent, struct device *self, void *aux) } printf(" nirq %d nredist %d", nintr, sc->sc_num_redist); - + sc->sc_r_ioh = mallocarray(sc->sc_num_redist, sizeof(*sc->sc_r_ioh), M_DEVBUF, M_WAITOK); sc->sc_processor = mallocarray(sc->sc_num_redist, @@ -795,7 +795,7 @@ agintc_calc_irq(struct agintc_softc *sc, int irq) struct intrhand *ih; int max = IPL_NONE; int min = IPL_HIGH; - + TAILQ_FOREACH(ih, &sc->sc_handler[irq].iq_list, ih_list) { if (ih->ih_ipl > max) max = ih->ih_ipl; @@ -987,7 +987,7 @@ agintc_irq_handler(void *frame) ih = sc->sc_lpi_handler[irq - LPI_BASE]; if (ih == NULL) return; - + s = agintc_splraise(ih->ih_ipl); intr_enable(); agintc_run_handler(ih, frame, s); @@ -1400,7 +1400,7 @@ agintc_msi_attach(struct device *parent, struct device *self, void *aux) baser = bus_space_read_8(sc->sc_iot, sc->sc_ioh, GITS_BASER(i)); if ((baser & GITS_BASER_PGSZ_MASK) == GITS_BASER_PGSZ_64K) goto found; - + bus_space_write_8(sc->sc_iot, sc->sc_ioh, GITS_BASER(i), (baser & ~GITS_BASER_PGSZ_MASK) | GITS_BASER_PGSZ_16K); baser = bus_space_read_8(sc->sc_iot, sc->sc_ioh, GITS_BASER(i)); @@ -1441,7 +1441,7 @@ agintc_msi_attach(struct device *parent, struct device *self, void *aux) dtt_pa = AGINTC_DMA_DVA(sc->sc_dtt); KASSERT((dtt_pa & GITS_BASER_PA_MASK) == dtt_pa); bus_space_write_8(sc->sc_iot, sc->sc_ioh, GITS_BASER(i), - GITS_BASER_IC_NORM_NC | baser & GITS_BASER_PGSZ_MASK | + GITS_BASER_IC_NORM_NC | baser & GITS_BASER_PGSZ_MASK | dtt_pa | (size / sc->sc_dtt_pgsz) - 1 | GITS_BASER_VALID); } diff --git sys/arch/arm64/dev/aplns.c sys/arch/arm64/dev/aplns.c index 52cb2a63f45..07d76406b00 100644 --- sys/arch/arm64/dev/aplns.c +++ sys/arch/arm64/dev/aplns.c @@ -263,7 +263,7 @@ nvme_ans_tcb(struct nvme_queue *q, unsigned int qid) } void -nvme_ans_sq_leave(struct nvme_softc *sc, +nvme_ans_sq_leave(struct nvme_softc *sc, struct nvme_queue *q, struct nvme_ccb *ccb) { unsigned int id = ccb->ccb_id; diff --git sys/arch/arm64/dev/aplpcie.c sys/arch/arm64/dev/aplpcie.c index 17af9b11815..7f9b67ffadc 100644 --- sys/arch/arm64/dev/aplpcie.c +++ sys/arch/arm64/dev/aplpcie.c @@ -80,7 +80,7 @@ struct aplpcie_softc { struct bus_space sc_bus_iot; struct bus_space sc_bus_memt; - + struct machine_pci_chipset sc_pc; struct extent *sc_busex; struct extent *sc_memex; @@ -556,7 +556,7 @@ aplpcie_bs_iomap(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, addr - pci_start + phys_start, size, flags, bshp); } } - + return ENXIO; } @@ -580,6 +580,6 @@ aplpcie_bs_memmap(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, addr - pci_start + phys_start, size, flags, bshp); } } - + return ENXIO; } diff --git sys/arch/arm64/dev/bcm2836_intr.c sys/arch/arm64/dev/bcm2836_intr.c index 6196b55cd9c..fcd804f0729 100644 --- sys/arch/arm64/dev/bcm2836_intr.c +++ sys/arch/arm64/dev/bcm2836_intr.c @@ -228,7 +228,7 @@ bcm_intc_attach(struct device *parent, struct device *self, void *aux) arm_intr_register_fdt(&sc->sc_l1_intc); intr_send_ipi_func = bcm_intc_send_ipi; - + bcm_intc_setipl(IPL_HIGH); /* XXX ??? */ intr_enable(); } @@ -604,7 +604,7 @@ bcm_intc_intr_route(void *cookie, int enable, struct cpu_info *ci) sc->sc_localcoremask[ci->ci_cpuid] |= (1 << lirq); else sc->sc_localcoremask[ci->ci_cpuid] &= ~(1 << lirq); - + if (ci == curcpu()) { bus_space_write_4(sc->sc_iot, sc->sc_lioh, ARM_LOCAL_INT_TIMER(cpu_number()), diff --git sys/arch/arm64/dev/efi.c sys/arch/arm64/dev/efi.c index 078ab74a163..4006088f33c 100644 --- sys/arch/arm64/dev/efi.c +++ sys/arch/arm64/dev/efi.c @@ -205,7 +205,7 @@ efi_attach(struct device *parent, struct device *self, void *aux) fa.fa_nreg = 1; config_found(self, &fa, NULL); } - + if (rs == NULL) return; diff --git sys/arch/arm64/include/armreg.h sys/arch/arm64/include/armreg.h index fe96344af2a..4705d523c89 100644 --- sys/arch/arm64/include/armreg.h +++ sys/arch/arm64/include/armreg.h @@ -164,10 +164,10 @@ #define EXCP_SVC 0x15 /* SVC trap */ #define EXCP_MSR 0x18 /* MSR/MRS trap */ #define EXCP_INSN_ABORT_L 0x20 /* Instruction abort, from lower EL */ -#define EXCP_INSN_ABORT 0x21 /* Instruction abort, from same EL */ +#define EXCP_INSN_ABORT 0x21 /* Instruction abort, from same EL */ #define EXCP_PC_ALIGN 0x22 /* PC alignment fault */ #define EXCP_DATA_ABORT_L 0x24 /* Data abort, from lower EL */ -#define EXCP_DATA_ABORT 0x25 /* Data abort, from same EL */ +#define EXCP_DATA_ABORT 0x25 /* Data abort, from same EL */ #define EXCP_SP_ALIGN 0x26 /* SP slignment fault */ #define EXCP_TRAP_FP 0x2c /* Trapped FP exception */ #define EXCP_SERROR 0x2f /* SError interrupt */ diff --git sys/arch/arm64/include/cpu.h sys/arch/arm64/include/cpu.h index 9f9e4761aae..ef2a3f7d6b5 100644 --- sys/arch/arm64/include/cpu.h +++ sys/arch/arm64/include/cpu.h @@ -22,7 +22,7 @@ * User-visible definitions */ -/* +/* * CTL_MACHDEP definitions. */ #define CPU_COMPATIBLE 1 /* compatible property */ diff --git sys/arch/arm64/include/db_machdep.h sys/arch/arm64/include/db_machdep.h index 6a3e4be0b98..2f53bc2cbc1 100644 --- sys/arch/arm64/include/db_machdep.h +++ sys/arch/arm64/include/db_machdep.h @@ -68,7 +68,7 @@ extern db_regs_t ddb_regs; /* register state */ // ALL BROKEN!!! #define inst_trap_return(ins) ((ins) == 0 && (ins) == 1) #define inst_return(ins) ((ins) == 0 && (ins) == 1) - + #define inst_call(ins) ((ins) == 0 && (ins) == 1) #define inst_branch(ins) ((ins) == 0 && (ins) == 1) #define inst_unconditional_flow_transfer(ins) (0) @@ -89,7 +89,7 @@ void db_machine_init (void); void db_show_frame_cmd(db_expr_t, int, db_expr_t, char *); -#define DDB_STATE_NOT_RUNNING 0 +#define DDB_STATE_NOT_RUNNING 0 #define DDB_STATE_RUNNING 1 #define DDB_STATE_EXITING 2 diff --git sys/arch/arm64/include/pmap.h sys/arch/arm64/include/pmap.h index c5911b909ca..cbce2dad3b7 100644 --- sys/arch/arm64/include/pmap.h +++ sys/arch/arm64/include/pmap.h @@ -44,7 +44,7 @@ #define PMAP_CACHE_WB (PMAP_MD1|PMAP_MD0) /* writeback */ #define PMAP_CACHE_DEV_NGNRNE (PMAP_MD2) /* device nGnRnE */ #define PMAP_CACHE_DEV_NGNRE (PMAP_MD2|PMAP_MD0) /* device nGnRE */ -#define PMAP_CACHE_BITS (PMAP_MD0|PMAP_MD1|PMAP_MD2) +#define PMAP_CACHE_BITS (PMAP_MD0|PMAP_MD1|PMAP_MD2) #define PTED_VA_MANAGED_M (PMAP_MD3) #define PTED_VA_WIRED_M (PMAP_MD3 << 1) diff --git sys/arch/arm64/include/profile.h sys/arch/arm64/include/profile.h index 1c53b7e6af1..e58e75cda9a 100644 --- sys/arch/arm64/include/profile.h +++ sys/arch/arm64/include/profile.h @@ -64,5 +64,5 @@ __asm__ (".text;" \ __asm__ ("mrs %x0, daif; msr daifset, #0x3": "=r"(s)); #define MCOUNT_EXIT \ __asm__ ("msr daif, %x0":: "r"(s)); - + #endif // _KERNEL diff --git sys/arch/arm64/include/trap.h sys/arch/arm64/include/trap.h index 0e9e595589c..4c339b274d4 100644 --- sys/arch/arm64/include/trap.h +++ sys/arch/arm64/include/trap.h @@ -19,4 +19,4 @@ #define KBPT_ASM "brk #0" -#define USER_BREAKPOINT 0x42000000 +#define USER_BREAKPOINT 0x42000000 diff --git sys/arch/arm64/stand/efiboot/fdt.c sys/arch/arm64/stand/efiboot/fdt.c index 48b4ba8f178..9f4dededa99 100644 --- sys/arch/arm64/stand/efiboot/fdt.c +++ sys/arch/arm64/stand/efiboot/fdt.c @@ -196,7 +196,7 @@ fdt_node_property(void *node, char *name, char **out) uint32_t *ptr; uint32_t nameid; char *tmp; - + if (!tree_inited) return 0; @@ -606,7 +606,7 @@ fdt_print_node(void *node, int level) { uint32_t *ptr; int cnt; - + ptr = (uint32_t *)node; if (betoh32(*ptr) != FDT_NODE_BEGIN) -- 2.33.0
