diff options
Diffstat (limited to 'sys/powerpc')
148 files changed, 163 insertions, 417 deletions
diff --git a/sys/powerpc/aim/aim_machdep.c b/sys/powerpc/aim/aim_machdep.c index 4d7ffa7dfd4e..e6bf48ae41c0 100644 --- a/sys/powerpc/aim/aim_machdep.c +++ b/sys/powerpc/aim/aim_machdep.c @@ -391,7 +391,6 @@ aim_cpu_init(vm_offset_t toc) bcopy(&restorebridge, (void *)EXC_TRC, trap_offset); bcopy(&restorebridge, (void *)EXC_BPT, trap_offset); } else { - /* * Use an IBAT and a DBAT to map the bottom 256M segment. * @@ -572,7 +571,6 @@ cpu_machine_check(struct thread *td, struct trapframe *frame, int *ucode) return (SIGBUS); } - #ifndef __powerpc64__ uint64_t va_to_vsid(pmap_t pm, vm_offset_t va) @@ -779,4 +777,3 @@ cpu_sleep() enable_vec(curthread); powerpc_sync(); } - diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index 3b2fda4c852c..8a32c503ec12 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -326,7 +326,6 @@ static int moea_map_user_ptr(pmap_t pm, static int moea_decode_kernel_ptr(vm_offset_t addr, int *is_user, vm_offset_t *decoded_addr); - static struct pmap_funcs moea_methods = { .clear_modify = moea_clear_modify, .copy_page = moea_copy_page, @@ -1573,14 +1572,14 @@ moea_map_user_ptr(pmap_t pm, volatile const void *uaddr, return (EFAULT); vsid = va_to_vsid(pm, (vm_offset_t)uaddr); - + /* Mark segment no-execute */ vsid |= SR_N; - + /* If we have already set this VSID, we can just return */ if (curthread->td_pcb->pcb_cpu.aim.usr_vsid == vsid) return (0); - + __asm __volatile("isync"); curthread->td_pcb->pcb_cpu.aim.usr_segm = (uintptr_t)uaddr >> ADDR_SR_SHFT; @@ -1717,7 +1716,6 @@ moea_pinit(pmap_t pmap) pmap->pmap_phys = pmap; } - mtx_lock(&moea_vsid_mutex); /* * Allocate some segment registers for this pmap. @@ -2481,7 +2479,6 @@ moea_query_bit(vm_page_t m, int ptebit) return (TRUE); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - /* * See if we saved the bit off. If so, cache it and return * success. @@ -2499,7 +2496,6 @@ moea_query_bit(vm_page_t m, int ptebit) */ powerpc_sync(); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - /* * See if this pvo has a valid PTE. if so, fetch the * REF/CHG bits from the valid PTE. If the appropriate diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 64d6d2f1df84..af651f01671a 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -316,7 +316,6 @@ static void *moea64_dump_pmap_init(unsigned blkpgs); static void moea64_page_array_startup(long); #endif - static struct pmap_funcs moea64_methods = { .clear_modify = moea64_clear_modify, .copy_page = moea64_copy_page, @@ -408,7 +407,6 @@ alloc_pvo_entry(int bootstrap) return (pvo); } - static void init_pvo_entry(struct pvo_entry *pvo, pmap_t pmap, vm_offset_t va) { @@ -445,7 +443,7 @@ moea64_pte_from_pvo(const struct pvo_entry *pvo, struct lpte *lpte) lpte->pte_hi = moea64_pte_vpn_from_pvo_vpn(pvo); lpte->pte_hi |= LPTE_VALID; - + if (pvo->pvo_vaddr & PVO_LARGE) lpte->pte_hi |= LPTE_BIG; if (pvo->pvo_vaddr & PVO_WIRED) @@ -1688,7 +1686,7 @@ moea64_uma_page_alloc(uma_zone_t zone, vm_size_t bytes, int domain, if (needed_lock) PMAP_UNLOCK(kernel_pmap); - + if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) bzero((void *)va, PAGE_SIZE); @@ -2373,7 +2371,6 @@ moea64_release_vsid(uint64_t vsid) moea64_vsid_bitmap[idx] &= ~mask; mtx_unlock(&moea64_slb_mutex); } - void moea64_release(pmap_t pmap) diff --git a/sys/powerpc/aim/mmu_oea64.h b/sys/powerpc/aim/mmu_oea64.h index e529475e93e9..a73a31250188 100644 --- a/sys/powerpc/aim/mmu_oea64.h +++ b/sys/powerpc/aim/mmu_oea64.h @@ -83,7 +83,6 @@ int64_t moea64_pte_unset(struct pvo_entry *); int64_t moea64_pte_clear(struct pvo_entry *, uint64_t); int64_t moea64_pte_synch(struct pvo_entry *); - typedef int64_t (*moea64_pte_replace_t)(struct pvo_entry *, int); typedef int64_t (*moea64_pte_insert_t)(struct pvo_entry *); typedef int64_t (*moea64_pte_unset_t)(struct pvo_entry *); @@ -131,4 +130,3 @@ extern u_long moea64_pteg_mask; extern int n_slbs; #endif /* _POWERPC_AIM_MMU_OEA64_H */ - diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index 1b7d7412b234..e2deb68705c2 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -25,11 +25,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> @@ -597,8 +595,6 @@ static int pmap_change_attr_locked(vm_offset_t va, vm_size_t size, int mode, boo #define UNIMPLEMENTED() panic("%s not implemented", __func__) #define UNTESTED() panic("%s not yet tested", __func__) - - /* Number of supported PID bits */ static unsigned int isa3_pid_bits; @@ -608,7 +604,6 @@ static unsigned int isa3_base_pid; #define PROCTAB_SIZE_SHIFT (isa3_pid_bits + 4) #define PROCTAB_ENTRIES (1ul << isa3_pid_bits) - /* * Map of physical memory regions. */ @@ -712,7 +707,6 @@ static struct md_page pv_dummy; */ #define RTS_SIZE ((0x2UL << 61) | (0x5UL << 5)) - static int powernv_enabled = 1; static __always_inline void @@ -846,7 +840,6 @@ pa_cmp(const void *a, const void *b) #define PG_PTE_PROMOTE (PG_X | PG_MANAGED | PG_W | PG_PTE_CACHE | \ PG_M | PG_A | RPTE_EAA_MASK | PG_V) - static __inline void pmap_resident_count_inc(pmap_t pmap, int count) { @@ -3069,7 +3062,6 @@ out: return (rv); } - /* * Tries to create a read- and/or execute-only 2MB page mapping. Returns true * if successful. Returns false if (1) a page table page cannot be allocated @@ -4914,7 +4906,6 @@ pmap_demote_l3e_locked(pmap_t pmap, pml3_entry_t *l3e, vm_offset_t va, if ((oldpde & PG_MANAGED) != 0) pmap_pv_demote_l3e(pmap, va, oldpde & PG_PS_FRAME, lockp); - atomic_add_long(&pmap_l3e_demotions, 1); CTR2(KTR_PMAP, "pmap_demote_l3e: success for va %#lx" " in pmap %p", va, pmap); @@ -5000,7 +4991,6 @@ pmap_remove_l3e(pmap_t pmap, pml3_entry_t *pdq, vm_offset_t sva, return (pmap_unuse_pt(pmap, sva, *pmap_pml2e(pmap, sva), free)); } - /* * pmap_remove_pte: do the things to unmap a page in a process */ @@ -5103,7 +5093,6 @@ pmap_remove_ptes(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, return (anyvalid); } - void mmu_radix_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { @@ -5147,7 +5136,6 @@ mmu_radix_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) lock = NULL; for (; sva < eva; sva = va_next) { - if (pmap->pm_stats.resident_count == 0) break; l1e = pmap_pml1e(pmap, sva); @@ -5683,9 +5671,6 @@ mmu_radix_zero_page_area(vm_page_t m, int off, int size) memset(addr + off, 0, size); } - - - static int mmu_radix_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t *locked_pa) { @@ -6272,7 +6257,6 @@ pmap_change_attr_locked(vm_offset_t va, vm_size_t size, int mode, bool flush) if (flush) pmap_invalidate_cache_range(base, tmpva); - } return (error); } @@ -6404,4 +6388,3 @@ DB_SHOW_COMMAND(pte, pmap_print_pte) } #endif - diff --git a/sys/powerpc/aim/moea64_native.c b/sys/powerpc/aim/moea64_native.c index 7c5982a7db7a..3d9ed727bc90 100644 --- a/sys/powerpc/aim/moea64_native.c +++ b/sys/powerpc/aim/moea64_native.c @@ -282,7 +282,7 @@ moea64_pte_synch_native(struct pvo_entry *pvo) ptelo = be64toh(pt->pte_lo); rw_runlock(&moea64_eviction_lock); - + return (ptelo & (LPTE_REF | LPTE_CHG)); } diff --git a/sys/powerpc/aim/mp_cpudep.c b/sys/powerpc/aim/mp_cpudep.c index 6fa916899570..b5931786f8f7 100644 --- a/sys/powerpc/aim/mp_cpudep.c +++ b/sys/powerpc/aim/mp_cpudep.c @@ -425,4 +425,3 @@ cpudep_ap_setup() break; } } - diff --git a/sys/powerpc/aim/slb.c b/sys/powerpc/aim/slb.c index 5a9971a12cbf..886e11c9b356 100644 --- a/sys/powerpc/aim/slb.c +++ b/sys/powerpc/aim/slb.c @@ -100,7 +100,6 @@ esid2idx(uint64_t esid, int level) #define uad_baseok(ua) \ (esid2base(ua->ua_base, ua->ua_level) == ua->ua_base) - static inline uint64_t esid2base(uint64_t esid, int level) { @@ -561,7 +560,7 @@ handle_kernel_slb_spill(int type, register_t dar, register_t srr0) slbcache = PCPU_GET(aim.slb); esid = (uintptr_t)addr >> ADDR_SR_SHFT; slbe = (esid << SLBE_ESID_SHIFT) | SLBE_VALID; - + /* See if the hardware flushed this somehow (can happen in LPARs) */ for (i = 0; i < n_slbs; i++) if (slbcache[i].slbe == (slbe | (uint64_t)i)) diff --git a/sys/powerpc/amigaone/cpld_a1222.c b/sys/powerpc/amigaone/cpld_a1222.c index d8d70b106162..086e8386d128 100644 --- a/sys/powerpc/amigaone/cpld_a1222.c +++ b/sys/powerpc/amigaone/cpld_a1222.c @@ -165,10 +165,10 @@ cpld_read_pair(struct cpld_softc *sc, int addr) KASSERT(addr <= 0xff, ("Invalid register-pair base address %x.", addr)); bus_write_1(sc->sc_mem, CPLD_MEM_ADDR_H, addr); tmp = bus_read_1(sc->sc_mem, CPLD_MEM_DATA) << 8; - + bus_write_1(sc->sc_mem, CPLD_MEM_ADDR_H, addr + 1); tmp |= bus_read_1(sc->sc_mem, CPLD_MEM_DATA); - + return (tmp); } @@ -317,7 +317,7 @@ cpld_send(device_t dev, struct cpld_cmd_data *d) if (d->cmd > USHRT_MAX) return (EINVAL); - + sc = device_get_softc(dev); mtx_lock(&sc->sc_mutex); diff --git a/sys/powerpc/amigaone/cpld_x5000.c b/sys/powerpc/amigaone/cpld_x5000.c index 6267f105f89d..30c28eef0835 100644 --- a/sys/powerpc/amigaone/cpld_x5000.c +++ b/sys/powerpc/amigaone/cpld_x5000.c @@ -255,7 +255,7 @@ cpld_send(device_t dev, struct cpld_cmd_data *d) if (d->cmd > USHRT_MAX) return (EINVAL); - + sc = device_get_softc(dev); mtx_lock(&sc->sc_mutex); diff --git a/sys/powerpc/booke/booke_machdep.c b/sys/powerpc/booke/booke_machdep.c index f1426d06ce13..09396d854045 100644 --- a/sys/powerpc/booke/booke_machdep.c +++ b/sys/powerpc/booke/booke_machdep.c @@ -360,7 +360,7 @@ booke_init(u_long arg1, u_long arg2) * string 0x45504150 ('EPAP') in r6 (which has been lost by now). * r4 (arg2) is supposed to be set to zero, but is not always. */ - + if (arg1 == 0) /* Juniper loader */ mdp = (void *)arg2; else if (booke_check_for_fdt(arg1, &dtbp) == 0) { /* ePAPR */ @@ -471,4 +471,3 @@ kdb_cpu_set_singlestep(void) mtspr(SPR_DBCR0, r | DBCR0_IC | DBCR0_IDM); kdb_frame->srr1 |= PSL_DE; } - diff --git a/sys/powerpc/booke/platform_bare.c b/sys/powerpc/booke/platform_bare.c index b2354eaed4e8..0fc1e299f78e 100644 --- a/sys/powerpc/booke/platform_bare.c +++ b/sys/powerpc/booke/platform_bare.c @@ -159,4 +159,3 @@ bare_reset(platform_t plat) while (1) ; } - diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index adeaee998fc7..9ff94529d955 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -354,7 +354,6 @@ static int mmu_booke_decode_kernel_ptr(vm_offset_t addr, static void mmu_booke_page_array_startup(long); static boolean_t mmu_booke_page_is_mapped(vm_page_t m); - static struct pmap_funcs mmu_booke_methods = { /* pmap dispatcher interface */ .clear_modify = mmu_booke_clear_modify, @@ -475,7 +474,6 @@ tlb_miss_lock(void) STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) { if (pc != pcpup) { - CTR3(KTR_PMAP, "%s: tlb miss LOCK of CPU=%d, " "tlb_lock=%p", __func__, pc->pc_cpuid, pc->pc_booke.tlb_lock); @@ -561,7 +559,6 @@ pv_free(pv_entry_t pve) uma_zfree(pvzone, pve); } - /* Allocate and initialize pv_entry structure. */ static void pv_insert(pmap_t pmap, vm_offset_t va, vm_page_t m) @@ -842,7 +839,6 @@ mmu_booke_bootstrap(vm_offset_t start, vm_offset_t kernelend) debugf("fill in phys_avail:\n"); for (i = 0, j = 0; i < availmem_regions_sz; i++, j += 2) { - debugf(" region: 0x%jx - 0x%jx (0x%jx)\n", (uintmax_t)availmem_regions[i].mr_start, (uintmax_t)availmem_regions[i].mr_start + @@ -930,7 +926,7 @@ mmu_booke_bootstrap(vm_offset_t start, vm_offset_t kernelend) (uintmax_t)kstack0_phys, (uintmax_t)kstack0_phys + kstack0_sz); debugf("kstack0 at 0x%"PRI0ptrX" - 0x%"PRI0ptrX"\n", kstack0, kstack0 + kstack0_sz); - + virtual_avail += KSTACK_GUARD_PAGES * PAGE_SIZE + kstack0_sz; for (i = 0; i < kstack_pages; i++) { mmu_booke_kenter(kstack0, kstack0_phys); @@ -939,7 +935,7 @@ mmu_booke_bootstrap(vm_offset_t start, vm_offset_t kernelend) } pmap_bootstrapped = 1; - + debugf("virtual_avail = %"PRI0ptrX"\n", virtual_avail); debugf("virtual_end = %"PRI0ptrX"\n", virtual_end); @@ -1034,7 +1030,7 @@ mmu_booke_kextract(vm_offset_t va) if (va >= VM_MIN_KERNEL_ADDRESS && va <= VM_MAX_KERNEL_ADDRESS) p = pte_vatopa(kernel_pmap, va); - + if (p == 0) { /* Check TLB1 mappings */ for (i = 0; i < TLB1_ENTRIES; i++) { @@ -1148,9 +1144,8 @@ mmu_booke_kenter_attr(vm_offset_t va, vm_paddr_t pa, vm_memattr_t ma) mtx_lock_spin(&tlbivax_mutex); tlb_miss_lock(); - + if (PTE_ISVALID(pte)) { - CTR1(KTR_PMAP, "%s: replacing entry!", __func__); /* Flush entry from TLB0 */ @@ -1188,7 +1183,6 @@ mmu_booke_kremove(vm_offset_t va) pte = pte_find(kernel_pmap, va); if (!PTE_ISVALID(pte)) { - CTR1(KTR_PMAP, "%s: invalid pte", __func__); return; @@ -1599,7 +1593,7 @@ mmu_booke_activate(struct thread *td) cpuid = PCPU_GET(cpuid); CPU_SET_ATOMIC(cpuid, &pmap->pm_active); PCPU_SET(curpmap, pmap); - + if (pmap->pm_tid[cpuid] == TID_NONE) tid_alloc(pmap); @@ -1624,7 +1618,7 @@ mmu_booke_deactivate(struct thread *td) pmap_t pmap; pmap = &td->td_proc->p_vmspace->vm_pmap; - + CTR5(KTR_PMAP, "%s: td=%p, proc = '%s', id = %d, pmap = 0x%"PRI0ptrX, __func__, td, td->td_proc->p_comm, td->td_proc->p_pid, pmap); @@ -2464,7 +2458,6 @@ tid_alloc(pmap_t pmap) /* If we are stealing TID then clear the relevant pmap's field */ if (tidbusy[thiscpu][tid] != NULL) { - CTR2(KTR_PMAP, "%s: warning: stealing tid %d", __func__, tid); tidbusy[thiscpu][tid]->pm_tid[thiscpu] = TID_NONE; @@ -2516,7 +2509,6 @@ tlb0_flush_entry(vm_offset_t va) CTR1(KTR_PMAP, "%s: e", __func__); } - /**************************************************************************/ /* TLB1 handling */ /**************************************************************************/ @@ -2890,7 +2882,7 @@ pmap_early_io_map(vm_paddr_t pa, vm_size_t size) tlb_entry_t e; KASSERT(!pmap_bootstrapped, ("Do not use after PMAP is up!")); - + for (i = 0; i < TLB1_ENTRIES; i++) { tlb1_read_entry(&e, i); if (!(e.mas1 & MAS1_VALID)) @@ -2943,7 +2935,6 @@ out: rw_wunlock(&pvh_global_lock); } - /* * Setup MAS4 defaults. * These values are loaded to MAS0-2 on a TLB miss. @@ -2963,7 +2954,6 @@ set_mas4_defaults(void) __asm __volatile("isync"); } - /* * Return 0 if the physical IO range is encompassed by one of the * the TLB1 entries, otherwise return related error code. @@ -3068,7 +3058,6 @@ DB_SHOW_COMMAND(tlb0, tlb0_print_tlbentries) printf("TLB0 entries:\n"); for (way = 0; way < TLB0_WAYS; way ++) for (entryidx = 0; entryidx < TLB0_ENTRIES_PER_WAY; entryidx++) { - mas0 = MAS0_TLBSEL(0) | MAS0_ESEL(way); mtspr(SPR_MAS0, mas0); @@ -3102,7 +3091,6 @@ DB_SHOW_COMMAND(tlb1, tlb1_print_tlbentries) printf("TLB1 entries:\n"); for (i = 0; i < TLB1_ENTRIES; i++) { - mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(i); mtspr(SPR_MAS0, mas0); diff --git a/sys/powerpc/booke/pmap_32.c b/sys/powerpc/booke/pmap_32.c index 1f380060494b..a9f8af0565f0 100644 --- a/sys/powerpc/booke/pmap_32.c +++ b/sys/powerpc/booke/pmap_32.c @@ -162,7 +162,6 @@ static struct ptbl_buf *ptbl_bufs; /* Page table related */ /**************************************************************************/ - /* Initialize pool of kva ptbl buffers. */ static void ptbl_init(void) @@ -323,7 +322,7 @@ ptbl_free(pmap_t pmap, unsigned int pdir_idx) */ mtx_lock_spin(&tlbivax_mutex); tlb_miss_lock(); - + pmap->pm_pdir[pdir_idx] = NULL; tlb_miss_unlock(); @@ -458,7 +457,6 @@ pte_remove(pmap_t pmap, vm_offset_t va, uint8_t flags) /* Handle managed entry. */ if (PTE_ISMANAGED(pte)) { - if (PTE_ISMODIFIED(pte)) vm_page_dirty(m); @@ -553,7 +551,7 @@ pte_enter(pmap_t pmap, vm_page_t m, vm_offset_t va, uint32_t flags, } pmap->pm_stats.resident_count++; - + pte_tmp = PTE_RPN_FROM_PA(VM_PAGE_TO_PHYS(m)); pte_tmp |= (PTE_VALID | flags | PTE_PS_4KB); /* 4KB pages only */ @@ -735,7 +733,7 @@ mmu_booke_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz) vm_page_t m; vm_offset_t addr; int active; - + rw_wlock(&pvh_global_lock); pmap = PCPU_GET(curpmap); active = (pm == kernel_pmap || pm == pmap) ? 1 : 0; @@ -950,7 +948,6 @@ tid_flush(tlbtid_t tid) uint32_t mas0, mas1, mas2; int entry, way; - /* Don't evict kernel translations */ if (tid == TID_KERNEL) return; @@ -975,7 +972,6 @@ tid_flush(tlbtid_t tid) for (way = 0; way < TLB0_WAYS; way++) for (entry = 0; entry < TLB0_ENTRIES_PER_WAY; entry++) { - mas0 = MAS0_TLBSEL(0) | MAS0_ESEL(way); mtspr(SPR_MAS0, mas0); diff --git a/sys/powerpc/booke/pmap_64.c b/sys/powerpc/booke/pmap_64.c index 18aaf918f9d2..55db7a325be5 100644 --- a/sys/powerpc/booke/pmap_64.c +++ b/sys/powerpc/booke/pmap_64.c @@ -408,7 +408,6 @@ pte_remove(pmap_t pmap, vm_offset_t va, u_int8_t flags) /* Handle managed entry. */ if (PTE_ISMANAGED(pte)) { - /* Handle modified pages. */ if (PTE_ISMODIFIED(pte)) vm_page_dirty(m); @@ -519,7 +518,6 @@ pte_vatopa(pmap_t pmap, vm_offset_t va) return (pa); } - /* allocate pte entries to manage (addr & mask) to (addr & mask) + size */ static void kernel_pte_alloc(vm_offset_t data_end, vm_offset_t addr) @@ -590,7 +588,6 @@ mmu_booke_alloc_kernel_pgtables(vm_offset_t data_end) return (data_end); } - /* * Initialize a preallocated and zeroed pmap structure, * such as one in a vmspace structure. @@ -645,7 +642,7 @@ mmu_booke_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz) pte_t *pte; vm_paddr_t pa = 0; int sync_sz, valid; - + while (sz > 0) { PMAP_LOCK(pm); pte = pte_find(pm, va); diff --git a/sys/powerpc/booke/spe.c b/sys/powerpc/booke/spe.c index 0f43b9c6ef1b..89c1c14d7381 100644 --- a/sys/powerpc/booke/spe.c +++ b/sys/powerpc/booke/spe.c @@ -197,7 +197,6 @@ save_vec_nodrop(struct thread *td) } } - #define SPE_INST_MASK 0x31f #define EADD 0x200 #define ESUB 0x201 @@ -485,7 +484,7 @@ spe_handle_fpdata(struct trapframe *frame) uint32_t msr; err = fueword32((void *)frame->srr0, &instr); - + if (err != 0) return; /* Fault. */; diff --git a/sys/powerpc/cpufreq/dfs.c b/sys/powerpc/cpufreq/dfs.c index de4d077a7338..d5c605908951 100644 --- a/sys/powerpc/cpufreq/dfs.c +++ b/sys/powerpc/cpufreq/dfs.c @@ -62,7 +62,6 @@ static device_method_t dfs_methods[] = { DEVMETHOD(cpufreq_drv_get, dfs_get), DEVMETHOD(cpufreq_drv_type, dfs_type), DEVMETHOD(cpufreq_drv_settings, dfs_settings), - {0, 0} }; @@ -170,7 +169,7 @@ static int dfs_set(device_t dev, const struct cf_setting *set) { register_t hid1; - + if (set == NULL) return (EINVAL); @@ -181,7 +180,7 @@ dfs_set(device_t dev, const struct cf_setting *set) hid1 |= HID1_DFS2; else if (set->freq == 2500) hid1 |= HID1_DFS4; - + /* * Now set the HID1 register with new values. Calling sequence * taken from page 2-26 of the MPC7450 family CPU manual. @@ -229,4 +228,3 @@ dfs_type(device_t dev, int *type) *type = CPUFREQ_TYPE_RELATIVE; return (0); } - diff --git a/sys/powerpc/cpufreq/mpc85xx_jog.c b/sys/powerpc/cpufreq/mpc85xx_jog.c index bbdc7193054f..ef2552f1485e 100644 --- a/sys/powerpc/cpufreq/mpc85xx_jog.c +++ b/sys/powerpc/cpufreq/mpc85xx_jog.c @@ -88,7 +88,6 @@ static device_method_t mpc85xx_jog_methods[] = { DEVMETHOD(cpufreq_drv_get, mpc85xx_jog_get), DEVMETHOD(cpufreq_drv_type, mpc85xx_jog_type), DEVMETHOD(cpufreq_drv_settings, mpc85xx_jog_settings), - {0, 0} }; @@ -154,7 +153,7 @@ mpc85xx_jog_identify(driver_t *driver, device_t parent) compat = mpc85xx_jog_devcompat(); if (compat == NULL) return; - + /* * We attach a child for every CPU since settings need to * be performed on every CPU in the SMP case. @@ -200,7 +199,7 @@ mpc85xx_jog_attach(device_t dev) OF_getencprop(cpu, "reg", &sc->cpu, sizeof(sc->cpu)); reg = ccsr_read4(GUTS_PORPLLSR); - + /* * Assume power-on PLL is the highest PLL config supported on the * board. @@ -290,7 +289,7 @@ mpc85xx_jog_set(device_t dev, const struct cf_setting *set) { struct mpc85xx_jog_softc *sc; struct jog_rv_args args; - + if (set == NULL) return (EINVAL); @@ -323,7 +322,7 @@ mpc85xx_jog_get(device_t dev, struct cf_setting *set) freq = PMJCR_GET_CORE_MULT(pmjcr, sc->cpu); freq *= mpc85xx_get_system_clock(); freq /= MHZ; - + set->freq = freq; set->dev = dev; @@ -340,4 +339,3 @@ mpc85xx_jog_type(device_t dev, int *type) *type = CPUFREQ_TYPE_ABSOLUTE; return (0); } - diff --git a/sys/powerpc/cpufreq/pcr.c b/sys/powerpc/cpufreq/pcr.c index 15f37bd46d82..4537b652d7f5 100644 --- a/sys/powerpc/cpufreq/pcr.c +++ b/sys/powerpc/cpufreq/pcr.c @@ -65,7 +65,6 @@ static device_method_t pcr_methods[] = { DEVMETHOD(cpufreq_drv_get, pcr_get), DEVMETHOD(cpufreq_drv_type, pcr_type), DEVMETHOD(cpufreq_drv_settings, pcr_settings), - {0, 0} }; @@ -266,7 +265,7 @@ pcr_set(device_t dev, const struct cf_setting *set) struct pcr_softc *sc; register_t pcr, msr; uint64_t psr; - + if (set == NULL) return (EINVAL); sc = device_get_softc(dev); @@ -342,4 +341,3 @@ pcr_type(device_t dev, int *type) *type = CPUFREQ_TYPE_RELATIVE; return (0); } - diff --git a/sys/powerpc/cpufreq/pmcr.c b/sys/powerpc/cpufreq/pmcr.c index 681e053444d5..1bc6ba09b01f 100644 --- a/sys/powerpc/cpufreq/pmcr.c +++ b/sys/powerpc/cpufreq/pmcr.c @@ -102,7 +102,6 @@ static device_method_t pmcr_methods[] = { DEVMETHOD(cpufreq_drv_get, pmcr_get), DEVMETHOD(cpufreq_drv_type, pmcr_type), DEVMETHOD(cpufreq_drv_settings, pmcr_settings), - {0, 0} }; @@ -186,7 +185,7 @@ static int pmcr_set(device_t dev, const struct cf_setting *set) { register_t pmcr; - + if (set == NULL) return (EINVAL); @@ -245,4 +244,3 @@ pmcr_type(device_t dev, int *type) *type = CPUFREQ_TYPE_ABSOLUTE; return (0); } - diff --git a/sys/powerpc/cpufreq/pmufreq.c b/sys/powerpc/cpufreq/pmufreq.c index b902e04ac03b..8dae34c38fff 100644 --- a/sys/powerpc/cpufreq/pmufreq.c +++ b/sys/powerpc/cpufreq/pmufreq.c @@ -70,7 +70,6 @@ static device_method_t pmufreq_methods[] = { DEVMETHOD(cpufreq_drv_get, pmufreq_get), DEVMETHOD(cpufreq_drv_type, pmufreq_type), DEVMETHOD(cpufreq_drv_settings, pmufreq_settings), - {0, 0} }; @@ -220,4 +219,3 @@ pmufreq_type(device_t dev, int *type) *type = CPUFREQ_TYPE_ABSOLUTE; return (0); } - diff --git a/sys/powerpc/fpu/fpu_arith.h b/sys/powerpc/fpu/fpu_arith.h index e70256927baf..c39862217fac 100644 --- a/sys/powerpc/fpu/fpu_arith.h +++ b/sys/powerpc/fpu/fpu_arith.h @@ -57,7 +57,6 @@ * for example. */ - #ifndef FPE_USE_ASM /* set up for extended-precision arithemtic */ diff --git a/sys/powerpc/fpu/fpu_emu.c b/sys/powerpc/fpu/fpu_emu.c index 9187077d1215..6c1b91fb9725 100644 --- a/sys/powerpc/fpu/fpu_emu.c +++ b/sys/powerpc/fpu/fpu_emu.c @@ -179,7 +179,6 @@ fpu_dumpfpn(struct fpn *fp) #define NOTFPU 2 /* not an FPU instruction */ #define FAULT 3 - /* * Emulate a floating-point instruction. * Return zero for success, else signal number. @@ -208,7 +207,6 @@ fpu_emulate(struct trapframe *frame, struct fpu *fpf) DPRINTF(FPE_EX, ("fpu_emulate: emulating insn %x at %p\n", insn.i_int, (void *)frame->srr0)); - if ((insn.i_any.i_opcd == OPC_TWI) || ((insn.i_any.i_opcd == OPC_integer_31) && (insn.i_x.i_xo == OPC31_TW))) { @@ -314,7 +312,6 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn) cond = 0; /* ld/st never set condition codes */ - if (instr.i_any.i_opcd == OPC_integer_31) { if (instr.i_x.i_xo == OPC31_STFIWX) { FPU_EMU_EVCNT_INCR(stfiwx); @@ -427,8 +424,6 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn) #endif } else if (instr.i_any.i_opcd == OPC_sp_fp_59 || instr.i_any.i_opcd == OPC_dp_fp_63) { - - if (instr.i_any.i_opcd == OPC_dp_fp_63 && !(instr.i_a.i_xo & OPC63M_MASK)) { /* Format X */ @@ -436,7 +431,6 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn) ra = instr.i_x.i_ra; rb = instr.i_x.i_rb; - /* One of the special opcodes.... */ switch (instr.i_x.i_xo) { case OPC63_FCMPU: diff --git a/sys/powerpc/fpu/fpu_explode.c b/sys/powerpc/fpu/fpu_explode.c index 010c4e3dd67f..1c30f821031a 100644 --- a/sys/powerpc/fpu/fpu_explode.c +++ b/sys/powerpc/fpu/fpu_explode.c @@ -220,7 +220,6 @@ fpu_explode(struct fpemu *fe, struct fpn *fp, int type, int reg) fp->fp_sign = s >> 31; fp->fp_sticky = 0; switch (type) { - case FTYPE_LNG: s = fpu_xtof(fp, l); break; diff --git a/sys/powerpc/fpu/fpu_extern.h b/sys/powerpc/fpu/fpu_extern.h index 02caa2312b96..f3a7fcf71da5 100644 --- a/sys/powerpc/fpu/fpu_extern.h +++ b/sys/powerpc/fpu/fpu_extern.h @@ -54,4 +54,3 @@ u_int fpu_ftoi(struct fpemu *, struct fpn *); u_int fpu_ftox(struct fpemu *, struct fpn *, u_int *); u_int fpu_ftos(struct fpemu *, struct fpn *); u_int fpu_ftod(struct fpemu *, struct fpn *, u_int *); - diff --git a/sys/powerpc/fpu/fpu_implode.c b/sys/powerpc/fpu/fpu_implode.c index e05747631661..69a58bf79315 100644 --- a/sys/powerpc/fpu/fpu_implode.c +++ b/sys/powerpc/fpu/fpu_implode.c @@ -105,7 +105,6 @@ round(struct fpemu *fe, struct fpn *fp) /* Go to rounddown to round down; break to round up. */ switch ((fe->fe_fpscr) & FPSCR_RN) { - case FP_RN: default: /* @@ -169,7 +168,6 @@ toinf(struct fpemu *fe, int sign) /* look at rounding direction */ switch ((fe->fe_fpscr) & FPSCR_RN) { - default: case FP_RN: /* the nearest value is always Inf */ inf = 1; @@ -206,7 +204,6 @@ fpu_ftoi(struct fpemu *fe, struct fpn *fp) sign = fp->fp_sign; switch (fp->fp_class) { - case FPC_ZERO: return (0); @@ -253,7 +250,6 @@ fpu_ftox(struct fpemu *fe, struct fpn *fp, u_int *res) sign = fp->fp_sign; switch (fp->fp_class) { - case FPC_ZERO: res[1] = 0; return (0); @@ -432,7 +428,6 @@ fpu_implode(struct fpemu *fe, struct fpn *fp, int type, u_int *space) { switch (type) { - case FTYPE_LNG: space[0] = fpu_ftox(fe, fp, space); DPRINTF(FPE_REG, ("fpu_implode: long %x %x\n", diff --git a/sys/powerpc/fpu/fpu_instr.h b/sys/powerpc/fpu/fpu_instr.h index eb2d09989a53..10893d5964c7 100644 --- a/sys/powerpc/fpu/fpu_instr.h +++ b/sys/powerpc/fpu/fpu_instr.h @@ -48,7 +48,7 @@ */ union instr { int i_int; /* as a whole */ - + /* * Any instruction type. */ @@ -156,7 +156,6 @@ union instr { u_int i_rc:1; } i_mds; - /* * Format S */ @@ -385,4 +384,3 @@ union instr { #define FTYPE_INT 0 /* data = 32-bit signed integer */ #define FTYPE_SNG 1 /* data = 32-bit float */ #define FTYPE_DBL 2 /* data = 64-bit double */ - diff --git a/sys/powerpc/include/altivec.h b/sys/powerpc/include/altivec.h index fa666a988d41..f392c708e6df 100644 --- a/sys/powerpc/include/altivec.h +++ b/sys/powerpc/include/altivec.h @@ -39,4 +39,3 @@ void save_vec(struct thread *); void save_vec_nodrop(struct thread *); #endif /* _MACHINE_ALTIVEC_H_ */ - diff --git a/sys/powerpc/include/atomic.h b/sys/powerpc/include/atomic.h index 7f70e1a0fdfb..aa03165de46c 100644 --- a/sys/powerpc/include/atomic.h +++ b/sys/powerpc/include/atomic.h @@ -228,7 +228,6 @@ _ATOMIC_ADD(long) } \ /* _ATOMIC_CLEAR */ - _ATOMIC_CLEAR(int) _ATOMIC_CLEAR(long) @@ -726,7 +725,6 @@ atomic_cmpset_long(volatile u_long* p, u_long cmpval, u_long newval) ATOMIC_CMPSET_ACQ_REL(int); ATOMIC_CMPSET_ACQ_REL(long); - #ifdef ISA_206_ATOMICS #define atomic_cmpset_8 atomic_cmpset_char #endif diff --git a/sys/powerpc/include/bat.h b/sys/powerpc/include/bat.h index 517ebd4a45c6..78f8f14d1167 100644 --- a/sys/powerpc/include/bat.h +++ b/sys/powerpc/include/bat.h @@ -113,7 +113,6 @@ struct bat { #define BATL(pa, wimg, pp) \ (((pa) & BAT_PBS) | (wimg) | (pp)) - /* Lower BAT bits (PowerPC 601): */ #define BAT601_PBN 0xfffe0000 /* physical block number */ #define BAT601_V 0x00000040 /* valid */ diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h index b24bec8372dd..7f332aa49118 100644 --- a/sys/powerpc/include/cpufunc.h +++ b/sys/powerpc/include/cpufunc.h @@ -108,7 +108,6 @@ mfctrl(void) return (value); } - static __inline void mtdec(register_t value) { diff --git a/sys/powerpc/include/mmuvar.h b/sys/powerpc/include/mmuvar.h index 7569d4ccccf6..f94ca56df441 100644 --- a/sys/powerpc/include/mmuvar.h +++ b/sys/powerpc/include/mmuvar.h @@ -200,7 +200,6 @@ extern mmu_t mmu_obj; } while (mmu != NULL); \ f;}) - #define MMU_DEF(name, ident, methods) \ \ const struct mmu_kobj name = { \ diff --git a/sys/powerpc/include/openpicreg.h b/sys/powerpc/include/openpicreg.h index 2471de06505c..70b07447aa36 100644 --- a/sys/powerpc/include/openpicreg.h +++ b/sys/powerpc/include/openpicreg.h @@ -140,4 +140,3 @@ #define OPENPIC_PCPU_EOI(cpu) \ (OPENPIC_PCPU_BASE(cpu) + OPENPIC_EOI) - diff --git a/sys/powerpc/include/openpicvar.h b/sys/powerpc/include/openpicvar.h index 3629444c3fe0..123af7c1a502 100644 --- a/sys/powerpc/include/openpicvar.h +++ b/sys/powerpc/include/openpicvar.h @@ -66,7 +66,7 @@ struct openpic_softc { uint32_t sc_saved_prios[4]; struct openpic_timer sc_saved_timers[OPENPIC_TIMERS]; uint32_t sc_saved_vectors[OPENPIC_SRC_VECTOR_COUNT]; - + }; extern devclass_t openpic_devclass; diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h index 5e6c1581a121..386c7e2a26e3 100644 --- a/sys/powerpc/include/pcb.h +++ b/sys/powerpc/include/pcb.h @@ -82,7 +82,7 @@ struct pcb { uint64_t texasr; uint64_t tfiar; } pcb_htm; - + struct ebb { uint64_t ebbhr; uint64_t ebbrr; diff --git a/sys/powerpc/include/pio.h b/sys/powerpc/include/pio.h index a4d9b327fa86..263188c57fb6 100644 --- a/sys/powerpc/include/pio.h +++ b/sys/powerpc/include/pio.h @@ -178,7 +178,6 @@ __inlrb(volatile u_int32_t *a) #define inlrb(a) (__inlrb((volatile u_int32_t *)(a))) #define in32rb(a) inlrb(a) - static __inline void __outsb(volatile u_int8_t *a, const u_int8_t *s, size_t c) { diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h index edde0d73d043..1ae90494ebfa 100644 --- a/sys/powerpc/include/pmap.h +++ b/sys/powerpc/include/pmap.h @@ -80,7 +80,6 @@ #include <vm/vm_radix.h> #endif - /* * The radix page table structure is described by levels 1-4. * See Fig 33. on p. 1002 of Power ISA v3.0B diff --git a/sys/powerpc/include/rtas.h b/sys/powerpc/include/rtas.h index 4ae04270f398..574a404fc302 100644 --- a/sys/powerpc/include/rtas.h +++ b/sys/powerpc/include/rtas.h @@ -60,4 +60,3 @@ cell_t rtas_token_lookup(const char *method); #define RTAS_VENDOR_ERROR_BEGIN -9004 #endif /* _MACHINE_RTAS_H_ */ - diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h index 9ee165285d18..4830a43ec457 100644 --- a/sys/powerpc/include/spr.h +++ b/sys/powerpc/include/spr.h @@ -39,7 +39,6 @@ __asm __volatile("mfspr %0,%1" : "=r"(val) : "K"(reg)); \ val; } ) - #ifndef __powerpc64__ /* The following routines allow manipulation of the full 64-bit width @@ -246,7 +245,7 @@ #define FSL_E300C4 0x8086 #define LPCR_PECE_WAKESET (LPCR_PECE_EXT | LPCR_PECE_DECR | LPCR_PECE_ME) - + #define SPR_DBSR 0x130 /* ..8 Debug Status Register */ #define DBSR_IDE 0x80000000 /* Imprecise debug event. */ #define DBSR_UDE 0x40000000 /* Unconditional debug event. */ diff --git a/sys/powerpc/include/trap.h b/sys/powerpc/include/trap.h index d507bb27c771..71e41929c632 100644 --- a/sys/powerpc/include/trap.h +++ b/sys/powerpc/include/trap.h @@ -113,7 +113,6 @@ /* Trap was in user mode */ #define EXC_USER 0x10000 - /* * EXC_ALI sets bits in the DSISR and DAR to provide enough * information to recover from the unaligned access without needing to diff --git a/sys/powerpc/mambo/mambo.c b/sys/powerpc/mambo/mambo.c index 65e4bcb8a663..6b57d052943a 100644 --- a/sys/powerpc/mambo/mambo.c +++ b/sys/powerpc/mambo/mambo.c @@ -98,4 +98,3 @@ mambobus_attach(device_t dev) bus_generic_probe(dev); return (bus_generic_attach(dev)); } - diff --git a/sys/powerpc/mikrotik/rb_led.c b/sys/powerpc/mikrotik/rb_led.c index f6125f5162f9..d533df956cea 100644 --- a/sys/powerpc/mikrotik/rb_led.c +++ b/sys/powerpc/mikrotik/rb_led.c @@ -113,7 +113,7 @@ rbled_attach(device_t dev) if (OF_getprop(node, "user_led", gp, sizeof(gp)) <= 0) return (ENXIO); - + sc->sc_gpio = OF_device_from_xref(gp[0]); if (sc->sc_gpio == NULL) { device_printf(dev, "No GPIO resource found!\n"); diff --git a/sys/powerpc/mpc85xx/atpic.c b/sys/powerpc/mpc85xx/atpic.c index 6675d73f0c89..793311b0de55 100644 --- a/sys/powerpc/mpc85xx/atpic.c +++ b/sys/powerpc/mpc85xx/atpic.c @@ -242,7 +242,6 @@ atpic_isa_attach(device_t dev) return (error); } - /* * PIC interface. */ diff --git a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c index 18c3e7a70ee4..021bd529fe74 100644 --- a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c +++ b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c @@ -64,7 +64,6 @@ static device_method_t rtc_methods[] = { /* clock interface */ DEVMETHOD(clock_gettime, ds1553_gettime), DEVMETHOD(clock_settime, ds1553_settime), - { 0, 0 } }; diff --git a/sys/powerpc/mpc85xx/ds1553_reg.h b/sys/powerpc/mpc85xx/ds1553_reg.h index 125212f5e818..f81bc0e6ddd6 100644 --- a/sys/powerpc/mpc85xx/ds1553_reg.h +++ b/sys/powerpc/mpc85xx/ds1553_reg.h @@ -85,7 +85,6 @@ #define DS1553_MASK_SECONDS 0x7f struct ds1553_softc { - bus_space_tag_t sc_bst; /* bus space tag */ bus_space_handle_t sc_bsh; /* bus space handle */ diff --git a/sys/powerpc/mpc85xx/fsl_diu.c b/sys/powerpc/mpc85xx/fsl_diu.c index a31497ab8734..b116809011dc 100644 --- a/sys/powerpc/mpc85xx/fsl_diu.c +++ b/sys/powerpc/mpc85xx/fsl_diu.c @@ -413,7 +413,7 @@ diu_attach(device_t dev) sc->sc_info.fb_pbase = (intptr_t)vtophys(sc->sc_info.fb_vbase); sc->sc_info.fb_flags = FB_FLAG_MEMATTR; sc->sc_info.fb_memattr = VM_MEMATTR_DEFAULT; - + /* Gamma table is 3 consecutive segments of 256 bytes. */ sc->sc_gamma = contigmalloc(3 * 256, M_DEVBUF, 0, 0, BUS_SPACE_MAXADDR_32BIT, PAGE_SIZE, 0); diff --git a/sys/powerpc/mpc85xx/fsl_sata.c b/sys/powerpc/mpc85xx/fsl_sata.c index 02d828d45432..64fe1cafa38a 100644 --- a/sys/powerpc/mpc85xx/fsl_sata.c +++ b/sys/powerpc/mpc85xx/fsl_sata.c @@ -58,7 +58,6 @@ struct fsl_sata_slot; enum fsl_sata_err_type; struct fsl_sata_cmd_tab; - /* local prototypes */ static int fsl_sata_init(device_t dev); static int fsl_sata_deinit(device_t dev); diff --git a/sys/powerpc/mpc85xx/fsl_sata.h b/sys/powerpc/mpc85xx/fsl_sata.h index 3a9ea20484b0..ba9efac8ba77 100644 --- a/sys/powerpc/mpc85xx/fsl_sata.h +++ b/sys/powerpc/mpc85xx/fsl_sata.h @@ -138,4 +138,3 @@ #define ATA_SC_IPM_DIS_PARTIAL 0x00000100 #define ATA_SC_IPM_DIS_SLUMBER 0x00000200 #define ATA_SC_IPM_DIS_DEVSLEEP 0x00000400 - diff --git a/sys/powerpc/mpc85xx/i2c.c b/sys/powerpc/mpc85xx/i2c.c index e3d48b36fa8a..390e492b2d0b 100644 --- a/sys/powerpc/mpc85xx/i2c.c +++ b/sys/powerpc/mpc85xx/i2c.c @@ -114,7 +114,6 @@ static device_method_t i2c_methods[] = { DEVMETHOD(iicbus_write, i2c_write), DEVMETHOD(iicbus_transfer, iicbus_transfer_gen), DEVMETHOD(ofw_bus_get_node, i2c_get_node), - { 0, 0 } }; @@ -252,7 +251,7 @@ i2c_repeated_start(device_t dev, u_char slave, int timeout) { struct i2c_softc *sc; int error; - + sc = device_get_softc(dev); mtx_lock(&sc->mutex); diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c index afe68b86baf9..f79161c25282 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -110,7 +110,6 @@ static device_method_t lbc_methods[] = { DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name), DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - { 0, 0 } }; @@ -384,7 +383,6 @@ fdt_lbc_reg_decode(phandle_t node, struct lbc_softc *sc, regptr = reg; for (i = 0; i < tuples; i++) { - bank = fdt_data_get((void *)reg, 1); di->di_bank = bank; reg += 1; @@ -562,7 +560,6 @@ lbc_attach(device_t dev) start = 0; size = 0; for (i = 0; i < tuples; i++) { - /* The first cell is the bank (chip select) number. */ bank = fdt_data_get(ranges, 1); if (bank < 0 || bank > LBC_DEV_MAX) { @@ -623,7 +620,6 @@ lbc_attach(device_t dev) * Walk the localbus and add direct subordinates as our children. */ for (child = OF_child(node); child != 0; child = OF_peer(child)) { - di = malloc(sizeof(*di), M_LBC, M_WAITOK | M_ZERO); if (ofw_bus_gen_setup_devinfo(&di->di_ofw, child) != 0) { diff --git a/sys/powerpc/mpc85xx/mpc85xx.c b/sys/powerpc/mpc85xx/mpc85xx.c index 221f8bff011e..062407713730 100644 --- a/sys/powerpc/mpc85xx/mpc85xx.c +++ b/sys/powerpc/mpc85xx/mpc85xx.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include <powerpc/mpc85xx/mpc85xx.h> - /* * MPC85xx system specific routines */ diff --git a/sys/powerpc/mpc85xx/mpc85xx_gpio.c b/sys/powerpc/mpc85xx/mpc85xx_gpio.c index 062694d77674..729a00b8e45d 100644 --- a/sys/powerpc/mpc85xx/mpc85xx_gpio.c +++ b/sys/powerpc/mpc85xx/mpc85xx_gpio.c @@ -170,7 +170,7 @@ mpc85xx_gpio_pin_toggle(device_t dev, uint32_t pin) val = bus_read_4(sc->out_res, 0); val ^= (1 << (31 - pin)); bus_write_4(sc->out_res, 0, val); - + GPIO_UNLOCK(sc); return (0); diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx.c b/sys/powerpc/mpc85xx/pci_mpc85xx.c index df1473a26c66..b7035e372105 100644 --- a/sys/powerpc/mpc85xx/pci_mpc85xx.c +++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c @@ -625,7 +625,6 @@ fsl_pcib_outbound(struct fsl_pcib_softc *sc, int wnd, int res, uint64_t start, bus_space_write_4(sc->sc_bst, sc->sc_bsh, REG_POWAR(wnd), attr); } - static void fsl_pcib_err_init(device_t dev) { @@ -827,7 +826,6 @@ static int fsl_pcib_map_msi(device_t dev, device_t child, return (0); } - /* * Linux device trees put the msi@<x> as children of the SoC, with ranges based * on the CCSR. Since rman doesn't permit overlapping or sub-ranges between diff --git a/sys/powerpc/mpc85xx/platform_mpc85xx.c b/sys/powerpc/mpc85xx/platform_mpc85xx.c index a19a177f2097..bbb1870c6648 100644 --- a/sys/powerpc/mpc85xx/platform_mpc85xx.c +++ b/sys/powerpc/mpc85xx/platform_mpc85xx.c @@ -569,7 +569,6 @@ dummy_freeze(device_t dev, bool freeze) /* Nothing to do here, move along. */ } - /* QorIQ Run control/power management timebase management. */ #define RCPM_CTBENR 0x00000084 @@ -583,7 +582,7 @@ mpc85xx_rcpm_freeze_timebase(device_t dev, bool freeze) struct mpc85xx_rcpm_softc *sc; sc = device_get_softc(dev); - + if (freeze) bus_write_4(sc->sc_mem, RCPM_CTBENR, 0); else @@ -634,7 +633,6 @@ static driver_t mpc85xx_rcpm_driver = { EARLY_DRIVER_MODULE(mpc85xx_rcpm, simplebus, mpc85xx_rcpm_driver, mpc85xx_rcpm_devclass, 0, 0, BUS_PASS_BUS); - /* "Global utilities" power management/Timebase management. */ #define GUTS_DEVDISR 0x00000070 @@ -652,7 +650,7 @@ mpc85xx_guts_freeze_timebase(device_t dev, bool freeze) uint32_t devdisr; sc = device_get_softc(dev); - + devdisr = bus_read_4(sc->sc_mem, GUTS_DEVDISR); if (freeze) bus_write_4(sc->sc_mem, GUTS_DEVDISR, diff --git a/sys/powerpc/mpc85xx/qoriq_gpio.c b/sys/powerpc/mpc85xx/qoriq_gpio.c index 189945dde73f..7abae276e8d1 100644 --- a/sys/powerpc/mpc85xx/qoriq_gpio.c +++ b/sys/powerpc/mpc85xx/qoriq_gpio.c @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #define GPIO_GPIMR 0x10 #define GPIO_GPICR 0x14 - struct qoriq_gpio_softc { device_t dev; device_t busdev; @@ -209,7 +208,7 @@ qoriq_gpio_pin_toggle(device_t dev, uint32_t pin) val = bus_read_4(sc->sc_mem, GPIO_GPDAT); val ^= (1 << (31 - pin)); bus_write_4(sc->sc_mem, GPIO_GPDAT, val); - + GPIO_UNLOCK(sc); return (0); diff --git a/sys/powerpc/ofw/ofw_initrd.c b/sys/powerpc/ofw/ofw_initrd.c index 16076fb10e6f..a60eee8b16f8 100644 --- a/sys/powerpc/ofw/ofw_initrd.c +++ b/sys/powerpc/ofw/ofw_initrd.c @@ -109,4 +109,3 @@ ofw_initrd_probe_and_attach(void *junk) start, end); } } - diff --git a/sys/powerpc/ofw/ofw_machdep.c b/sys/powerpc/ofw/ofw_machdep.c index 459960fc2b6b..0a2b78e77361 100644 --- a/sys/powerpc/ofw/ofw_machdep.c +++ b/sys/powerpc/ofw/ofw_machdep.c @@ -122,7 +122,7 @@ ofw_sprg_prepare(void) { if (ofw_real_mode) return; - + /* * Assume that interrupt are disabled at this point, or * SPRG1-3 could be trashed @@ -154,7 +154,7 @@ ofw_sprg_restore(void) { if (ofw_real_mode) return; - + /* * Note that SPRG1-3 contents are irrelevant. They are scratch * registers used in the early portion of trap handling when @@ -869,4 +869,3 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag, return (bus_space_map(*tag, addr, size, flags, handle)); } - diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c index 480475afd0eb..c39df7f43814 100644 --- a/sys/powerpc/ofw/ofw_pcib_pci.c +++ b/sys/powerpc/ofw/ofw_pcib_pci.c @@ -173,4 +173,3 @@ ofw_pcib_pci_route_interrupt(device_t bridge, device_t dev, int intpin) return (PCIB_ROUTE_INTERRUPT(device_get_parent(device_get_parent( bridge)), bridge, intpin)); } - diff --git a/sys/powerpc/ofw/ofw_pcibus.c b/sys/powerpc/ofw/ofw_pcibus.c index 3ccd25828ddd..47cb4665b832 100644 --- a/sys/powerpc/ofw/ofw_pcibus.c +++ b/sys/powerpc/ofw/ofw_pcibus.c @@ -312,7 +312,7 @@ ofw_pcibus_child_pnpinfo_str_method(device_t cbdev, device_t child, char *buf, return (0); } - + static int ofw_pcibus_assign_interrupt(device_t dev, device_t child) { @@ -324,12 +324,12 @@ ofw_pcibus_assign_interrupt(device_t dev, device_t child) if (node == -1) { /* Non-firmware enumerated child, use standard routing */ - + intr[0] = pci_get_intpin(child); return (PCIB_ROUTE_INTERRUPT(device_get_parent(dev), child, intr[0])); } - + /* * Try to determine the node's interrupt parent so we know which * PIC to use. @@ -343,7 +343,7 @@ ofw_pcibus_assign_interrupt(device_t dev, device_t child) if (iparent != -1) OF_getencprop(OF_node_from_xref(iparent), "#interrupt-cells", &icells, sizeof(icells)); - + /* * Any AAPL,interrupts property gets priority and is * fully specified (i.e. does not need routing) @@ -362,7 +362,7 @@ ofw_pcibus_assign_interrupt(device_t dev, device_t child) /* No property: our best guess is the intpin. */ intr[0] = pci_get_intpin(child); } - + /* * If we got intr from a property, it may or may not be an intpin. * For on-board devices, it frequently is not, and is completely out diff --git a/sys/powerpc/ofw/ofw_pcibus.h b/sys/powerpc/ofw/ofw_pcibus.h index 82e8b42d4e67..8feec5e9db9a 100644 --- a/sys/powerpc/ofw/ofw_pcibus.h +++ b/sys/powerpc/ofw/ofw_pcibus.h @@ -50,4 +50,3 @@ struct ofw_pcibus_devinfo { }; #endif // POWERPC_OFW_OFW_PCIBUS_H - diff --git a/sys/powerpc/ofw/ofw_real.c b/sys/powerpc/ofw/ofw_real.c index cc21dab6a4f9..dadb6cd948b6 100644 --- a/sys/powerpc/ofw/ofw_real.c +++ b/sys/powerpc/ofw/ofw_real.c @@ -141,7 +141,6 @@ static ofw_method_t ofw_real_methods[] = { OFWMETHOD(ofw_release, ofw_real_release), OFWMETHOD(ofw_enter, ofw_real_enter), OFWMETHOD(ofw_exit, ofw_real_exit), - { 0, 0 } }; @@ -1184,4 +1183,3 @@ ofw_real_exit(ofw_t ofw) ; ofw_real_stop(); } - diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c index 0f89d1380649..633750e1351c 100644 --- a/sys/powerpc/ofw/ofw_syscons.c +++ b/sys/powerpc/ofw/ofw_syscons.c @@ -817,7 +817,6 @@ ofwfb_putc8(video_adapter_t *adp, vm_offset_t off, uint8_t c, uint8_t a) uint8_t c[4]; } ch1, ch2; - sc = (struct ofwfb_softc *)adp; row = (off / adp->va_info.vi_width) * adp->va_info.vi_cheight; col = (off % adp->va_info.vi_width) * adp->va_info.vi_cwidth; diff --git a/sys/powerpc/ofw/openpic_ofw.c b/sys/powerpc/ofw/openpic_ofw.c index b6c888631f9f..7790a9b3aa3a 100644 --- a/sys/powerpc/ofw/openpic_ofw.c +++ b/sys/powerpc/ofw/openpic_ofw.c @@ -138,7 +138,7 @@ openpic_ofw_attach(device_t dev) OF_getencprop(node, "ibm,phandle", &xref, sizeof(xref)) == -1 && OF_getencprop(node, "linux,phandle", &xref, sizeof(xref)) == -1) xref = node; - + if (ofw_bus_is_compatible(dev, "fsl,mpic")) { sc->sc_quirks = OPENPIC_QUIRK_SINGLE_BIND; sc->sc_quirks |= OPENPIC_QUIRK_HIDDEN_IRQS; @@ -177,4 +177,3 @@ openpic_ofw_translate_code(device_t dev, u_int irq, int code, *pol = INTR_POLARITY_CONFORM; } } - diff --git a/sys/powerpc/ofw/rtas.c b/sys/powerpc/ofw/rtas.c index 99f51fd8cf12..89bcef26bf7d 100644 --- a/sys/powerpc/ofw/rtas.c +++ b/sys/powerpc/ofw/rtas.c @@ -259,7 +259,7 @@ cell_t rtas_token_lookup(const char *method) { cell_t token; - + if (!rtas_exists()) return (-1); @@ -268,5 +268,3 @@ rtas_token_lookup(const char *method) return (token); } - - diff --git a/sys/powerpc/powermac/ata_dbdma.c b/sys/powerpc/powermac/ata_dbdma.c index 8bfc8ad7a3ea..f2484bc0ae0f 100644 --- a/sys/powerpc/powermac/ata_dbdma.c +++ b/sys/powerpc/powermac/ata_dbdma.c @@ -175,7 +175,7 @@ ata_dbdma_stop(struct ata_request *request) struct ata_dbdma_channel *sc = device_get_softc(request->parent); uint16_t status; - + status = dbdma_get_chan_status(sc->dbdma); dbdma_pause(sc->dbdma); diff --git a/sys/powerpc/powermac/ata_dbdma.h b/sys/powerpc/powermac/ata_dbdma.h index ec3a842f1e4c..44ef2f1d083d 100644 --- a/sys/powerpc/powermac/ata_dbdma.h +++ b/sys/powerpc/powermac/ata_dbdma.h @@ -54,4 +54,3 @@ struct ata_dbdma_channel { void ata_dbdma_dmainit(device_t dev); #endif /* ATA_DBDMA_H */ - diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c index 67facef72d34..0d19a2a2233b 100644 --- a/sys/powerpc/powermac/ata_macio.c +++ b/sys/powerpc/powermac/ata_macio.c @@ -270,7 +270,7 @@ ata_macio_setmode(device_t dev, int target, int mode) if ((mode & ATA_DMA_MASK) == ATA_UDMA0) { min_cycle = udma_timings[mode & ATA_MODE_MASK].cycle; min_active = udma_timings[mode & ATA_MODE_MASK].active; - + cycle_tick = ATA_TIME_TO_TICK(sc->rev,min_cycle); act_tick = ATA_TIME_TO_TICK(sc->rev,min_active); @@ -280,7 +280,7 @@ ata_macio_setmode(device_t dev, int target, int mode) } else if ((mode & ATA_DMA_MASK) == ATA_WDMA0) { min_cycle = dma_timings[mode & ATA_MODE_MASK].cycle; min_active = dma_timings[mode & ATA_MODE_MASK].active; - + cycle_tick = ATA_TIME_TO_TICK(sc->rev,min_cycle); act_tick = ATA_TIME_TO_TICK(sc->rev,min_active); @@ -304,7 +304,7 @@ ata_macio_setmode(device_t dev, int target, int mode) pio_timings[(mode & ATA_MODE_MASK) - ATA_PIO0].cycle; min_active = pio_timings[(mode & ATA_MODE_MASK) - ATA_PIO0].active; - + cycle_tick = ATA_TIME_TO_TICK(sc->rev,min_cycle); act_tick = ATA_TIME_TO_TICK(sc->rev,min_active); @@ -372,4 +372,3 @@ ata_macio_resume(device_t dev) return (error); } - diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c index 08961e70fceb..a475cafb93cd 100644 --- a/sys/powerpc/powermac/cpcht.c +++ b/sys/powerpc/powermac/cpcht.c @@ -465,7 +465,7 @@ cpcht_alloc_msix(device_t dev, device_t child, int *irq) return (ENXIO); } - + static int cpcht_release_msix(device_t dev, device_t child, int irq) { diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c index e1b1f23e2373..ede3ee7eccf1 100644 --- a/sys/powerpc/powermac/cuda.c +++ b/sys/powerpc/powermac/cuda.c @@ -150,10 +150,10 @@ cuda_attach(device_t dev) volatile int i; uint8_t reg; phandle_t node,child; - + sc = device_get_softc(dev); sc->sc_dev = dev; - + sc->sc_memrid = 0; sc->sc_memr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_memrid, RF_ACTIVE); @@ -445,7 +445,7 @@ cuda_send_inbound(struct cuda_softc *sc) struct cuda_packet *pkt; dev = sc->sc_dev; - + mtx_lock(&sc->sc_mutex); while ((pkt = STAILQ_FIRST(&sc->sc_inq)) != NULL) { @@ -799,4 +799,3 @@ cuda_settime(device_t dev, struct timespec *ts) return (0); } - diff --git a/sys/powerpc/powermac/dbdma.c b/sys/powerpc/powermac/dbdma.c index 4dec076b47fe..4fcd161281ec 100644 --- a/sys/powerpc/powermac/dbdma.c +++ b/sys/powerpc/powermac/dbdma.c @@ -97,7 +97,7 @@ dbdma_resize_channel(dbdma_channel_t *chan, int newslots) if (newslots > (PAGE_SIZE / sizeof(struct dbdma_command))) return (-1); - + chan->sc_nslots = newslots; return (0); } @@ -234,7 +234,7 @@ void dbdma_set_device_status(dbdma_channel_t *chan, uint8_t mask, uint8_t value) { uint32_t control_reg; - + control_reg = mask; control_reg <<= DBDMA_REG_MASK_SHIFT; control_reg |= value; diff --git a/sys/powerpc/powermac/dbdmavar.h b/sys/powerpc/powermac/dbdmavar.h index e4855257b5f9..d9b498781daf 100644 --- a/sys/powerpc/powermac/dbdmavar.h +++ b/sys/powerpc/powermac/dbdmavar.h @@ -64,12 +64,11 @@ struct dbdma_channel { bus_dmamap_t sc_dmamap; uint32_t sc_saved_regs[5]; }; - /* DBDMA registers are found at 0x8000 + n*0x100 in the macio register space, and are laid out as follows within each block: - + Address: Description: Length (bytes): 0x000 Channel Control 4 0x004 Channel Status 4 diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c index a77d80351b62..af5f5a389998 100644 --- a/sys/powerpc/powermac/grackle.c +++ b/sys/powerpc/powermac/grackle.c @@ -152,7 +152,6 @@ grackle_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, caoff = sc->sc_data + (reg & 0x03); if (grackle_enable_config(sc, bus, slot, func, reg) != 0) { - /* * Config probes to non-existent devices on the * secondary bus generates machine checks. Be sure @@ -311,7 +310,6 @@ static device_method_t grackle_hb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, grackle_hb_probe), DEVMETHOD(device_attach, grackle_hb_attach), - { 0, 0 } }; diff --git a/sys/powerpc/powermac/kiic.c b/sys/powerpc/powermac/kiic.c index 49574f2f810a..b08444763724 100644 --- a/sys/powerpc/powermac/kiic.c +++ b/sys/powerpc/powermac/kiic.c @@ -137,7 +137,6 @@ static device_method_t kiic_methods[] = { /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_node, kiic_get_node), - { 0, 0 } }; @@ -175,7 +174,7 @@ kiic_attach(device_t self) bzero(sc, sizeof(*sc)); sc->sc_dev = self; - + node = ofw_bus_get_node(self); if (node == 0 || node == -1) { return (EINVAL); @@ -236,7 +235,7 @@ kiic_attach(device_t self) kiic_setmode(sc, I2C_STDMODE); kiic_setspeed(sc, I2C_100kHz); /* XXX rate */ - + kiic_writereg(sc, IER, I2C_INT_DATA | I2C_INT_ADDR | I2C_INT_STOP); if (bootverbose) @@ -443,4 +442,3 @@ kiic_get_node(device_t bus, device_t dev) return sc->sc_node; } - diff --git a/sys/powerpc/powermac/macgpio.c b/sys/powerpc/powermac/macgpio.c index 806ff54b905a..68eb07e7b391 100644 --- a/sys/powerpc/powermac/macgpio.c +++ b/sys/powerpc/powermac/macgpio.c @@ -92,7 +92,7 @@ static device_method_t macgpio_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, macgpio_suspend), DEVMETHOD(device_resume, macgpio_resume), - + /* Bus interface */ DEVMETHOD(bus_print_child, macgpio_print_child), DEVMETHOD(bus_probe_nomatch, macgpio_probe_nomatch), @@ -113,7 +113,6 @@ static device_method_t macgpio_methods[] = { DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name), DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - { 0, 0 } }; @@ -145,7 +144,7 @@ macgpio_probe(device_t dev) device_set_desc(dev, "MacIO GPIO Controller"); return (0); } - + return (ENXIO); } @@ -164,7 +163,7 @@ macgpio_attach(device_t dev) sc = device_get_softc(dev); root = sc->sc_node = ofw_bus_get_node(dev); - + sc->sc_gpios = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_gpios_rid, RF_ACTIVE); @@ -220,7 +219,6 @@ macgpio_attach(device_t dev) return (bus_generic_attach(dev)); } - static int macgpio_print_child(device_t dev, device_t child) { @@ -230,7 +228,7 @@ macgpio_print_child(device_t dev, device_t child) dinfo = device_get_ivars(child); retval += bus_print_child_header(dev, child); - + if (dinfo->gpio_num >= GPIO_BASE) printf(" gpio %d", dinfo->gpio_num - GPIO_BASE); else if (dinfo->gpio_num >= GPIO_EXTINT_BASE) @@ -245,7 +243,6 @@ macgpio_print_child(device_t dev, device_t child) return (retval); } - static void macgpio_probe_nomatch(device_t dev, device_t child) { @@ -266,7 +263,6 @@ macgpio_probe_nomatch(device_t dev, device_t child) } } - static struct resource * macgpio_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, @@ -306,7 +302,6 @@ macgpio_activate_resource(device_t bus, device_t child, int type, int rid, return (bus_activate_resource(bus, type, rid, res)); } - static int macgpio_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c index 797ffc86d4a6..35ee90fb75b5 100644 --- a/sys/powerpc/powermac/macio.c +++ b/sys/powerpc/powermac/macio.c @@ -101,7 +101,7 @@ static device_method_t macio_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), - + /* Bus interface */ DEVMETHOD(bus_print_child, macio_print_child), DEVMETHOD(bus_probe_nomatch, macio_probe_nomatch), @@ -123,7 +123,6 @@ static device_method_t macio_methods[] = { DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name), DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - { 0, 0 } }; @@ -187,7 +186,6 @@ macio_get_quirks(const char *name) return (0); } - /* * Add an interrupt to the dev's resource list if present */ @@ -235,7 +233,6 @@ macio_add_intr(phandle_t devnode, struct macio_devinfo *dinfo) } } - static void macio_add_reg(phandle_t devnode, struct macio_devinfo *dinfo) { @@ -293,7 +290,7 @@ macio_probe(device_t dev) { int i; u_int32_t devid; - + devid = pci_get_devid(dev); for (i = 0; macio_pci_devlist[i].mpd_desc != NULL; i++) { if (devid == macio_pci_devlist[i].mpd_devid) { @@ -301,7 +298,7 @@ macio_probe(device_t dev) return (0); } } - + return (ENXIO); } @@ -324,7 +321,7 @@ macio_attach(device_t dev) sc = device_get_softc(dev); root = sc->sc_node = ofw_bus_get_node(dev); - + /* * Locate the device node and it's base address */ @@ -425,20 +422,17 @@ macio_attach(device_t dev) */ if ((strcmp(ofw_bus_get_name(cdev), "i2s") == 0) && (strcmp(compat, "K2-Keylargo") == 0)) { - uint32_t fcr1; fcr1 = bus_read_4(sc->sc_memr, KEYLARGO_FCR1); fcr1 |= FCR1_I2S0_CLK_ENABLE | FCR1_I2S0_ENABLE; bus_write_4(sc->sc_memr, KEYLARGO_FCR1, fcr1); } - } return (bus_generic_attach(dev)); } - static int macio_print_child(device_t dev, device_t child) { @@ -459,7 +453,6 @@ macio_print_child(device_t dev, device_t child) return (retval); } - static void macio_probe_nomatch(device_t dev, device_t child) { @@ -480,7 +473,6 @@ macio_probe_nomatch(device_t dev, device_t child) } } - static struct resource * macio_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, @@ -585,7 +577,6 @@ macio_alloc_resource(device_t bus, device_t child, int type, int *rid, return (rv); } - static int macio_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) @@ -599,7 +590,6 @@ macio_release_resource(device_t bus, device_t child, int type, int rid, return (rman_release_resource(res)); } - static int macio_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) @@ -625,7 +615,6 @@ macio_activate_resource(device_t bus, device_t child, int type, int rid, return (rman_activate_resource(res)); } - static int macio_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) @@ -643,7 +632,6 @@ macio_deactivate_resource(device_t bus, device_t child, int type, int rid, return (rman_deactivate_resource(res)); } - static struct resource_list * macio_get_resource_list (device_t dev, device_t child) { diff --git a/sys/powerpc/powermac/nvbl.c b/sys/powerpc/powermac/nvbl.c index 71162278a487..ba1f84badf94 100644 --- a/sys/powerpc/powermac/nvbl.c +++ b/sys/powerpc/powermac/nvbl.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #define NVIDIA_PMC_BL_SHIFT (16) #define NVIDIA_PMC_BL_EN (1U << 31) - struct nvbl_softc { device_t dev; struct resource *sc_memr; diff --git a/sys/powerpc/powermac/platform_powermac.c b/sys/powerpc/powermac/platform_powermac.c index fe818829dc74..d08b3fe9181c 100644 --- a/sys/powerpc/powermac/platform_powermac.c +++ b/sys/powerpc/powermac/platform_powermac.c @@ -75,7 +75,7 @@ static platform_method_t powermac_methods[] = { PLATFORMMETHOD(platform_attach, powermac_attach), PLATFORMMETHOD(platform_mem_regions, powermac_mem_regions), PLATFORMMETHOD(platform_timebase_freq, powermac_timebase_freq), - + PLATFORMMETHOD(platform_smp_first_cpu, powermac_smp_first_cpu), PLATFORMMETHOD(platform_smp_next_cpu, powermac_smp_next_cpu), PLATFORMMETHOD(platform_smp_get_bsp, powermac_smp_get_bsp), @@ -109,7 +109,7 @@ powermac_probe(platform_t plat) return (ENXIO); compatlen = OF_getprop(root, "compatible", compat, sizeof(compat)); - + for (curstr = compat; curstr < compat + compatlen; curstr += strlen(curstr) + 1) { if (strncmp(curstr, "MacRISC", 7) == 0) @@ -193,7 +193,6 @@ powermac_attach(platform_t plat) phandle_t rootnode; char model[32]; - /* * Quiesce Open Firmware on PowerMac11,2 and 12,1. It is * necessary there to shut down a background thread doing fan @@ -232,7 +231,6 @@ powermac_timebase_freq(platform_t plat, struct cpuref *cpuref) return (ticks); } - static int powermac_smp_fill_cpuref(struct cpuref *cpuref, phandle_t cpu) { @@ -413,4 +411,3 @@ powermac_sleep(platform_t platform) *(unsigned long *)0x80 = 0x100; cpu_sleep(); } - diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c index 91ec57e8e4c9..97865174cc2f 100644 --- a/sys/powerpc/powermac/pmu.c +++ b/sys/powerpc/powermac/pmu.c @@ -167,7 +167,6 @@ static device_method_t pmuextint_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pmuextint_probe), DEVMETHOD(device_attach, pmuextint_attach), - {0,0} }; @@ -304,7 +303,6 @@ pmu_probe(device_t dev) return (0); } - static int setup_pmu_intr(device_t dev, device_t extint) { @@ -352,10 +350,10 @@ pmu_attach(device_t dev) phandle_t node,child; struct sysctl_ctx_list *ctx; struct sysctl_oid *tree; - + sc = device_get_softc(dev); sc->sc_dev = dev; - + sc->sc_memrid = 0; sc->sc_memr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_memrid, RF_ACTIVE); @@ -447,7 +445,6 @@ pmu_attach(device_t dev) CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, sc, 0, pmu_battmon, "I", "Post battery events to devd"); - SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "acline", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, pmu_acline_state, "I", "AC Line Status"); @@ -649,7 +646,6 @@ done: return rcv_len; } - static u_int pmu_poll(device_t dev) { @@ -814,7 +810,7 @@ pmu_adb_autopoll(device_t dev, uint16_t mask) pmu_send(sc, PMU_ADB_POLL_OFF, 0, NULL, 16, resp); mtx_unlock(&sc->sc_mutex); - + return 0; } @@ -823,7 +819,7 @@ pmu_shutdown(void *xsc, int howto) { struct pmu_softc *sc = xsc; uint8_t cmd[] = {'M', 'A', 'T', 'T'}; - + if (howto & RB_HALT) pmu_send(sc, PMU_POWER_OFF, 4, cmd, 0, NULL); else @@ -839,7 +835,7 @@ pmu_set_sleepled(void *xsc, int onoff) uint8_t cmd[] = {4, 0, 0}; cmd[2] = onoff; - + mtx_lock(&sc->sc_mutex); pmu_send(sc, PMU_SET_SLEEPLED, 3, cmd, 0, NULL); mtx_unlock(&sc->sc_mutex); @@ -849,7 +845,7 @@ static int pmu_server_mode(SYSCTL_HANDLER_ARGS) { struct pmu_softc *sc = arg1; - + u_int server_mode = 0; uint8_t getcmd[] = {PMU_PWR_GET_POWERUP_EVENTS}; uint8_t setcmd[] = {0, 0, PMU_PWR_WAKEUP_AC_INSERT}; @@ -1000,7 +996,7 @@ pmu_battmon(SYSCTL_HANDLER_ARGS) if (error || !req->newptr) return (error); - + if (!result && pmu_battmon_enabled) error = kproc_suspend(pmubattproc, hz); else if (result && pmu_battmon_enabled == 0) @@ -1024,7 +1020,7 @@ pmu_acline_state(SYSCTL_HANDLER_ARGS) if (error != 0) return (error); - + result = (batt.state & PMU_PWR_AC_PRESENT) ? 1 : 0; error = sysctl_handle_int(oidp, &result, 0, req); diff --git a/sys/powerpc/powermac/pmuvar.h b/sys/powerpc/powermac/pmuvar.h index 16c56fb6a3c3..d20296b13a5e 100644 --- a/sys/powerpc/powermac/pmuvar.h +++ b/sys/powerpc/powermac/pmuvar.h @@ -122,7 +122,6 @@ enum { #define PMU_PWR_PCHARGE_RESET (1 << 6) #define PMU_PWR_BATT_EXIST (1 << 7) - /* I2C related definitions */ #define PMU_I2C_MODE_SIMPLE 0 #define PMU_I2C_MODE_STDSUB 1 diff --git a/sys/powerpc/powermac/powermac_thermal.c b/sys/powerpc/powermac/powermac_thermal.c index 1a5db378daf8..2b1c383ded10 100644 --- a/sys/powerpc/powermac/powermac_thermal.c +++ b/sys/powerpc/powermac/powermac_thermal.c @@ -88,7 +88,7 @@ fan_management_proc(void) /* Nothing to manage? */ if (SLIST_EMPTY(&fans)) kproc_exit(0); - + while (1) { pmac_therm_manage_fans(); pause("pmac_therm", hz); @@ -217,4 +217,3 @@ pmac_thermal_sensor_register(struct pmac_therm *sensor) SLIST_INSERT_HEAD(&sensors, list_entry, entries); } - diff --git a/sys/powerpc/powermac/powermac_thermal.h b/sys/powerpc/powermac/powermac_thermal.h index 1f396c5ddcbb..967f29eeb40c 100644 --- a/sys/powerpc/powermac/powermac_thermal.h +++ b/sys/powerpc/powermac/powermac_thermal.h @@ -35,7 +35,7 @@ struct pmac_fan { int min_rpm, max_rpm, default_rpm; - + char name[32]; int zone; @@ -45,7 +45,7 @@ struct pmac_fan { struct pmac_therm { int target_temp, max_temp; /* Tenths of a degree K */ - + char name[32]; int zone; diff --git a/sys/powerpc/powermac/pswitch.c b/sys/powerpc/powermac/pswitch.c index 48033585a19d..df47b5ae6d1f 100644 --- a/sys/powerpc/powermac/pswitch.c +++ b/sys/powerpc/powermac/pswitch.c @@ -60,7 +60,6 @@ static device_method_t pswitch_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pswitch_probe), DEVMETHOD(device_attach, pswitch_attach), - { 0, 0 } }; diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c index 1967f9d77b63..6c0badec2ec2 100644 --- a/sys/powerpc/powermac/smu.c +++ b/sys/powerpc/powermac/smu.c @@ -464,7 +464,7 @@ smu_doorbell_intr(void *xdev) /* Check result. First invalidate the cache again... */ __asm __volatile("dcbf 0,%0; sync" :: "r"(sc->sc_cmd) : "memory"); - + bus_dmamap_sync(sc->sc_dmatag, sc->sc_cmd_dmamap, BUS_DMASYNC_POSTREAD); sc->sc_cur_cmd->cmd = sc->sc_cmd->cmd; @@ -676,7 +676,7 @@ smu_fan_check_old_style(struct smu_fan *fan) * them except by seeing if the new one fails. If the new one * fails, use the old one. */ - + cmd.cmd = SMU_FAN; cmd.len = 2; cmd.data[0] = 0x31; @@ -787,14 +787,14 @@ smu_fan_set_pwm(struct smu_fan *fan, int pwm) * them except by seeing if the new one fails. If the new one * fails, use the old one. */ - + if (!fan->old_style) { cmd.len = 4; cmd.data[0] = 0x30; cmd.data[1] = fan->reg; cmd.data[2] = (pwm >> 8) & 0xff; cmd.data[3] = pwm & 0xff; - + error = smu_run_cmd(smu, &cmd, 1); if (error && error != EWOULDBLOCK) fan->old_style = 1; @@ -1014,7 +1014,7 @@ smu_attach_fans(device_t dev, phandle_t fanroot) /* Now fill in the properties. */ smu_count_fans(dev); - + /* Register fans with pmac_thermal */ for (i = 0; i < sc->sc_nfans; i++) pmac_thermal_fan_register(&sc->sc_fans[i].fan); @@ -1079,7 +1079,6 @@ smu_attach_fans(device_t dev, phandle_t fanroot) smu_fanrpm_sysctl, "I", "Fan RPM"); fan->fan.read = NULL; fan->fan.set = (int (*)(struct pmac_fan *, int))smu_fan_set_pwm; - } if (bootverbose) device_printf(dev, "Fan: %s type: %d\n", @@ -1104,7 +1103,7 @@ smu_sensor_read(struct smu_sensor *sens) error = smu_run_cmd(smu, &cmd, 1); if (error != 0) return (-1); - + sc = device_get_softc(smu); value = (cmd.data[0] << 8) | cmd.data[1]; @@ -1286,7 +1285,7 @@ smu_server_mode(SYSCTL_HANDLER_ARGS) u_int server_mode; device_t smu = arg1; int error; - + cmd.cmd = SMU_POWER_EVENTS; cmd.len = 1; cmd.data[0] = SMU_PWR_GET_POWERUP; @@ -1402,7 +1401,6 @@ static device_method_t smuiic_methods[] = { /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_node, smuiic_get_node), - { 0, 0 } }; @@ -1582,4 +1580,3 @@ smuiic_get_node(device_t bus, device_t dev) return (ofw_bus_get_node(bus)); } - diff --git a/sys/powerpc/powermac/smusat.c b/sys/powerpc/powermac/smusat.c index 9572016c250c..a7df8b9227c8 100644 --- a/sys/powerpc/powermac/smusat.c +++ b/sys/powerpc/powermac/smusat.c @@ -292,4 +292,3 @@ smusat_sensor_sysctl(SYSCTL_HANDLER_ARGS) return (error); } - diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c index 821564295c2d..f1f6ffafad63 100644 --- a/sys/powerpc/powermac/uninorth.c +++ b/sys/powerpc/powermac/uninorth.c @@ -101,7 +101,6 @@ static void unin_enable_mpic(device_t dev); * Driver methods. */ static device_method_t unin_chip_methods[] = { - /* Device interface */ DEVMETHOD(device_probe, unin_chip_probe), DEVMETHOD(device_attach, unin_chip_attach), @@ -127,7 +126,6 @@ static device_method_t unin_chip_methods[] = { DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name), DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - { 0, 0 } }; @@ -403,7 +401,7 @@ unin_chip_attach(device_t dev) if (strcmp(compat, "chrp,open-pic") == 0) unin_enable_mpic(dev); } - + /* * GMAC lives under the PCI bus, so just check if enet is gmac. */ @@ -456,7 +454,6 @@ unin_chip_probe_nomatch(device_t dev, device_t child) } } - static struct resource * unin_chip_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, @@ -608,7 +605,6 @@ unin_chip_activate_resource(device_t bus, device_t child, int type, int rid, return (rman_activate_resource(res)); } - static int unin_chip_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) @@ -626,7 +622,6 @@ unin_chip_deactivate_resource(device_t bus, device_t child, int type, int rid, return (rman_deactivate_resource(res)); } - static struct resource_list * unin_chip_get_resource_list (device_t dev, device_t child) { diff --git a/sys/powerpc/powermac/uninorthpci.c b/sys/powerpc/powermac/uninorthpci.c index 3a0a120b7a01..8933693963f5 100644 --- a/sys/powerpc/powermac/uninorthpci.c +++ b/sys/powerpc/powermac/uninorthpci.c @@ -128,7 +128,7 @@ uninorth_probe(device_t dev) device_set_desc(dev, "IBM CPC945 PCI Express Root"); return (0); } - + return (ENXIO); } @@ -278,4 +278,3 @@ uninorth_enable_config(struct uninorth_softc *sc, u_int bus, u_int slot, return (1); } - diff --git a/sys/powerpc/powermac/uninorthvar.h b/sys/powerpc/powermac/uninorthvar.h index d89933c4f462..ee990d4d6351 100644 --- a/sys/powerpc/powermac/uninorthvar.h +++ b/sys/powerpc/powermac/uninorthvar.h @@ -98,7 +98,6 @@ struct unin_chip_devinfo { #define UNIN_SLEEPING 0x01 #define UNIN_RUNNING 0x02 - /* * Toggle registers */ diff --git a/sys/powerpc/powermac/vcoregpio.c b/sys/powerpc/powermac/vcoregpio.c index 6430bf5f9862..f2037f7b5039 100644 --- a/sys/powerpc/powermac/vcoregpio.c +++ b/sys/powerpc/powermac/vcoregpio.c @@ -112,4 +112,3 @@ vcoregpio_post_change(device_t dev, const struct cf_level *level) macgpio_write(dev, GPIO_DDR_OUTPUT | 0); } } - diff --git a/sys/powerpc/powernv/opal.c b/sys/powerpc/powernv/opal.c index 4331d0c56a37..63d9c40b30d8 100644 --- a/sys/powerpc/powernv/opal.c +++ b/sys/powerpc/powernv/opal.c @@ -51,7 +51,7 @@ opal_check(void) if (!OF_hasprop(opal, "opal-base-address") || !OF_hasprop(opal, "opal-entry-address")) return (ENOENT); - + OF_getencprop(opal, "opal-base-address", val, sizeof(val)); opal_data = ((uint64_t)val[0] << 32) | val[1]; OF_getencprop(opal, "opal-entry-address", val, sizeof(val)); @@ -63,4 +63,3 @@ opal_check(void) return (0); } - diff --git a/sys/powerpc/powernv/opal_console.c b/sys/powerpc/powernv/opal_console.c index c2da4c639c56..b18a7952bb13 100644 --- a/sys/powerpc/powernv/opal_console.c +++ b/sys/powerpc/powernv/opal_console.c @@ -110,7 +110,7 @@ static driver_t uart_opal_driver = { uart_opal_methods, sizeof(struct uart_opal_softc), }; - + DRIVER_MODULE(uart_opal, opalcons, uart_opal_driver, uart_devclass, 0, 0); static int uart_opal_getc(struct uart_opal_softc *sc); @@ -157,7 +157,7 @@ uart_opal_real_map_outbuffer(uint64_t *bufferp, uint64_t *lenp) *bufferp = (uint64_t)opalcons_buffer.tmpbuf; *lenp = (uint64_t)&opalcons_buffer.size; } - + static void uart_opal_real_unmap_outbuffer(uint64_t *len) { @@ -237,7 +237,7 @@ uart_opal_cnprobe(struct consdev *cp) /* Check if OF has an active stdin/stdout */ if (OF_getprop(chosen, "linux,stdout-path", buf, sizeof(buf)) <= 0) goto fail; - + input = OF_finddevice(buf); if (input == -1) goto fail; @@ -253,7 +253,7 @@ uart_opal_cnprobe(struct consdev *cp) cp->cn_arg = console_sc; stdout_cp = cp; return; - + fail: cp->cn_pri = CN_DEAD; return; @@ -573,4 +573,3 @@ static driver_t opalcons_driver = { static devclass_t opalcons_devclass; DRIVER_MODULE(opalcons, opal, opalcons_driver, opalcons_devclass, 0, 0); - diff --git a/sys/powerpc/powernv/opal_dev.c b/sys/powerpc/powernv/opal_dev.c index 860c2fb1cbc1..6213cbd573a5 100644 --- a/sys/powerpc/powernv/opal_dev.c +++ b/sys/powerpc/powernv/opal_dev.c @@ -84,7 +84,7 @@ static device_method_t opaldev_methods[] = { DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name), DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - + DEVMETHOD_END }; @@ -172,7 +172,6 @@ opaldev_probe(device_t dev) free(irqs, M_DEVBUF); } - return (BUS_PROBE_SPECIFIC); } @@ -197,7 +196,7 @@ opaldev_attach(device_t dev) if (rv == OPAL_SUCCESS) clock_register(dev, 2000); - + EVENTHANDLER_REGISTER(OPAL_SHUTDOWN, opal_handle_shutdown_message, NULL, EVENTHANDLER_PRI_ANY); EVENTHANDLER_REGISTER(shutdown_final, opal_shutdown, NULL, @@ -381,7 +380,7 @@ opal_handle_messages(void) uint32_t type; rv = opal_call(OPAL_GET_MSG, vtophys(&msg), sizeof(msg)); - + if (rv != OPAL_SUCCESS) return; @@ -422,4 +421,3 @@ opal_intr(void *xintr) wakeup(opal_hb_proc); } - diff --git a/sys/powerpc/powernv/opal_flash.c b/sys/powerpc/powernv/opal_flash.c index e9ba56451b8e..478285518725 100644 --- a/sys/powerpc/powernv/opal_flash.c +++ b/sys/powerpc/powernv/opal_flash.c @@ -324,7 +324,6 @@ opalflash_task(void *arg) } } - /* Device driver interfaces. */ static int diff --git a/sys/powerpc/powernv/opal_i2cm.c b/sys/powerpc/powernv/opal_i2cm.c index 57d9e7ebbff0..4f3ad518567b 100644 --- a/sys/powerpc/powernv/opal_i2cm.c +++ b/sys/powerpc/powernv/opal_i2cm.c @@ -130,4 +130,3 @@ DRIVER_MODULE(opal_i2cm, powernv_xscom, opal_i2cm_driver, opal_i2cm_devclass, NU NULL); DRIVER_MODULE(opal_i2cm, powernv_centaur, opal_i2cm_driver, opal_i2cm_devclass, NULL, NULL); - diff --git a/sys/powerpc/powernv/opal_nvram.c b/sys/powerpc/powernv/opal_nvram.c index 5acd4718640a..095f8ebd725b 100644 --- a/sys/powerpc/powernv/opal_nvram.c +++ b/sys/powerpc/powernv/opal_nvram.c @@ -84,7 +84,6 @@ static device_method_t opal_nvram_methods[] = { DEVMETHOD(device_probe, opal_nvram_probe), DEVMETHOD(device_attach, opal_nvram_attach), DEVMETHOD(device_detach, opal_nvram_detach), - { 0, 0 } }; @@ -157,7 +156,7 @@ opal_nvram_attach(device_t dev) sc->sc_cdev = make_dev(&opal_nvram_cdevsw, 0, 0, 0, 0600, "nvram"); sc->sc_cdev->si_drv1 = sc; - + mtx_init(&sc->sc_mtx, "opal_nvram", 0, MTX_DEF); return (0); @@ -176,7 +175,7 @@ opal_nvram_detach(device_t dev) contigfree(sc->sc_buf, NVRAM_BUFSIZE, M_DEVBUF); mtx_destroy(&sc->sc_mtx); - + return (0); } diff --git a/sys/powerpc/powernv/opal_pci.c b/sys/powerpc/powernv/opal_pci.c index 59aa081c8eb3..3a0b86f1e221 100644 --- a/sys/powerpc/powernv/opal_pci.c +++ b/sys/powerpc/powernv/opal_pci.c @@ -540,7 +540,7 @@ opalpci_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, * Poking config state for non-existant devices can make * the host bridge hang up. Clear any errors. */ - + if (error != OPAL_SUCCESS || (word == ((1UL << (8 * width)) - 1))) { if (error != OPAL_HARDWARE) { diff --git a/sys/powerpc/powernv/opal_sensor.c b/sys/powerpc/powernv/opal_sensor.c index d87f4725431e..dae1f97bc989 100644 --- a/sys/powerpc/powernv/opal_sensor.c +++ b/sys/powerpc/powernv/opal_sensor.c @@ -117,7 +117,7 @@ opal_sensor_get_val(struct opal_sensor_softc *sc, uint32_t key, uint64_t *val) *val = val32; else rv = EIO; - + opal_free_async_token(token); return (rv); } @@ -139,7 +139,7 @@ opal_sensor_sysctl(SYSCTL_HANDLER_ARGS) return (error); result = sensval; - + switch (sc->sc_type) { case OPAL_SENSOR_TEMP: result = result * 10 + 2731; /* Convert to K */ @@ -179,7 +179,7 @@ opal_sensor_attach(device_t dev) sc->sc_dev = dev; node = ofw_bus_get_node(dev); - + if (OF_getencprop(node, "sensor-data", &sensor_id, sizeof(sensor_id)) < 0) { device_printf(dev, "Missing sensor ID\n"); return (ENXIO); @@ -188,7 +188,7 @@ opal_sensor_attach(device_t dev) device_printf(dev, "Missing sensor type\n"); return (ENXIO); } - + sc->sc_type = -1; for (i = 0; i < OPAL_SENSOR_MAX; i++) { if (strcmp(type, opal_sensor_types[i]) == 0) { @@ -259,7 +259,6 @@ static devclass_t opal_sensor_devclass; DRIVER_MODULE(opal_sensor, opalsens, opal_sensor_driver, opal_sensor_devclass, NULL, NULL); - static int opalsens_probe(device_t dev) { diff --git a/sys/powerpc/powernv/platform_powernv.c b/sys/powerpc/powernv/platform_powernv.c index d8a2b231e7ea..c9f10c6e9cbc 100644 --- a/sys/powerpc/powernv/platform_powernv.c +++ b/sys/powerpc/powernv/platform_powernv.c @@ -89,7 +89,7 @@ static platform_method_t powernv_methods[] = { PLATFORMMETHOD(platform_mem_regions, powernv_mem_regions), PLATFORMMETHOD(platform_numa_mem_regions, powernv_numa_mem_regions), PLATFORMMETHOD(platform_timebase_freq, powernv_timebase_freq), - + PLATFORMMETHOD(platform_smp_ap_init, powernv_smp_ap_init), PLATFORMMETHOD(platform_smp_first_cpu, powernv_smp_first_cpu), PLATFORMMETHOD(platform_smp_next_cpu, powernv_smp_next_cpu), @@ -102,7 +102,6 @@ static platform_method_t powernv_methods[] = { PLATFORMMETHOD(platform_node_numa_domain, powernv_node_numa_domain), PLATFORMMETHOD(platform_reset, powernv_reset), - { 0, 0 } }; @@ -257,7 +256,6 @@ out: return (0); } - void powernv_mem_regions(platform_t plat, struct mem_region *phys, int *physsz, struct mem_region *avail, int *availsz) diff --git a/sys/powerpc/powernv/powernv_centaur.c b/sys/powerpc/powernv/powernv_centaur.c index 9053c491ff44..b112bd83b4ea 100644 --- a/sys/powerpc/powernv/powernv_centaur.c +++ b/sys/powerpc/powernv/powernv_centaur.c @@ -127,4 +127,3 @@ DEFINE_CLASS_0(powernv_centaur, powernv_centaur_driver, powernv_centaur_methods, sizeof(struct powernv_centaur_softc)); DRIVER_MODULE(powernv_centaur, ofwbus, powernv_centaur_driver, powernv_centaur_devclass, NULL, NULL); - diff --git a/sys/powerpc/powernv/powernv_xscom.c b/sys/powerpc/powernv/powernv_xscom.c index 669599e3a547..ba8a3a7d6690 100644 --- a/sys/powerpc/powernv/powernv_xscom.c +++ b/sys/powerpc/powernv/powernv_xscom.c @@ -127,4 +127,3 @@ DEFINE_CLASS_0(powernv_xscom, powernv_xscom_driver, powernv_xscom_methods, sizeof(struct powernv_xscom_softc)); DRIVER_MODULE(powernv_xscom, ofwbus, powernv_xscom_driver, powernv_xscom_devclass, NULL, NULL); - diff --git a/sys/powerpc/powernv/xive.c b/sys/powerpc/powernv/xive.c index 7be9ab5ab14b..054d0fd1a960 100644 --- a/sys/powerpc/powernv/xive.c +++ b/sys/powerpc/powernv/xive.c @@ -107,7 +107,6 @@ static void xive_init_irq(struct xive_irq *irqd, u_int irq); static struct xive_irq *xive_configure_irq(u_int irq); static int xive_provision_page(struct xive_softc *sc); - /* Interfaces */ static int xive_probe(device_t); static int xive_attach(device_t); @@ -292,7 +291,6 @@ xive_write_mmap8(vm_offset_t addr, uint64_t val) *(uint64_t *)(addr) = val; } - /* Device interfaces. */ static int xive_probe(device_t dev) @@ -467,7 +465,7 @@ xive_bind(device_t dev, u_int irq, cpuset_t cpumask, void **priv) } opal_call(OPAL_XIVE_SYNC, OPAL_XIVE_SYNC_QUEUE, irq); - + irqd->vp = pcpu_find(cpu)->pc_hwref; error = opal_call(OPAL_XIVE_SET_IRQ_CONFIG, irq, irqd->vp, XIVE_PRIORITY, irqd->lirq); @@ -708,7 +706,7 @@ xive_init_irq(struct xive_irq *irqd, u_int irq) irqd->girq = irq; irqd->esb_size = 1 << esb_shift; irqd->eoi_page = (vm_offset_t)pmap_mapdev(eoi_phys, irqd->esb_size); - + if (eoi_phys == trig_phys) irqd->trig_page = irqd->eoi_page; else if (trig_phys != 0) diff --git a/sys/powerpc/powerpc/bus_machdep.c b/sys/powerpc/powerpc/bus_machdep.c index b85b181edeca..322469f1245c 100644 --- a/sys/powerpc/powerpc/bus_machdep.c +++ b/sys/powerpc/powerpc/bus_machdep.c @@ -621,7 +621,7 @@ static void bs_le_ws_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t val) { volatile uint16_t *addr; - + addr = __ppc_ba(bsh, ofs); __asm __volatile("sthbrx %0, 0, %1" :: "r"(val), "r"(addr)); powerpc_iomb(); diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index 8e51fe0f5e7d..992066264b37 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -330,7 +330,7 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, /* Performed initial allocation */ newtag->flags |= BUS_DMA_MIN_ALLOC_COMP; } - + if (error != 0) { free(newtag, M_DEVBUF); } else { @@ -409,7 +409,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; @@ -456,14 +455,12 @@ bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) return (ENOMEM); } - /* * Bouncing might be required if the driver asks for an active * exclusion region, a data alignment that is stricter than 1, and/or * an active address boundary. */ if (dmat->flags & BUS_DMA_COULD_BOUNCE) { - /* Must bounce */ struct bounce_zone *bz; int maxpages; @@ -545,7 +542,6 @@ bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) return (0); } - /* * Allocate a piece of memory that can be efficiently mapped into * bus device space based on the constraints lited in the dma tag. @@ -960,7 +956,6 @@ bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op) vm_offset_t datavaddr, tempvaddr; if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { - /* * Handle data bouncing. We might also * want to add support for invalidating @@ -1276,4 +1271,3 @@ bus_dma_tag_set_iommu(bus_dma_tag_t tag, device_t iommu, void *cookie) return (0); } - diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c index d214e045b417..82e3dbd06f28 100644 --- a/sys/powerpc/powerpc/clock.c +++ b/sys/powerpc/powerpc/clock.c @@ -315,4 +315,3 @@ DELAY(int n) nop_prio_medium(); TSEXIT(); } - diff --git a/sys/powerpc/powerpc/copyinout.c b/sys/powerpc/powerpc/copyinout.c index b53cfafacdf2..76965ad996b8 100644 --- a/sys/powerpc/powerpc/copyinout.c +++ b/sys/powerpc/powerpc/copyinout.c @@ -155,7 +155,6 @@ DEFINE_COPY_FUNC(int, casueword, (volatile u_long *, u_long, u_long *, u_long)) #define REMAP(x) x #endif - int REMAP(copyout)(const void *kaddr, void *udaddr, size_t len) { diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index 31a607fba707..8967bcd9804f 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -284,7 +284,6 @@ cpu_feature_setup() cpu_features2 |= cp->features2; } - void cpu_setup(u_int cpuid) { @@ -504,7 +503,6 @@ cpu_6xx_setup(int cpuid, uint16_t vers) hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT; hid0 |= HID0_EIEC; break; - } mtspr(SPR_HID0, hid0); @@ -531,7 +529,6 @@ cpu_6xx_setup(int cpuid, uint16_t vers) cpu_idle_hook = cpu_idle_60x; } - static void cpu_6xx_print_cacheinfo(u_int cpuid, uint16_t vers) { @@ -834,7 +831,7 @@ cpu_idle_power9(sbintime_t sbt) * the wake up. */ mtmsr(msr); - + } #endif diff --git a/sys/powerpc/powerpc/db_disasm.c b/sys/powerpc/powerpc/db_disasm.c index 015ff4903ecb..d26ba25c0af0 100644 --- a/sys/powerpc/powerpc/db_disasm.c +++ b/sys/powerpc/powerpc/db_disasm.c @@ -108,14 +108,13 @@ op_class_func *opcodes_base[] = { /*x3C*/ op_ill, op_ill, op_cl_x3e, op_cl_x3f }; - /* This table could be modified to make significant the "reserved" fields * of the opcodes, But I didn't feel like it when typing in the table, * I would recommend that this table be looked over for errors, * This was derived from the table in Appendix A.2 of (Mot part # MPCFPE/AD) * PowerPC Microprocessor Family: The Programming Environments */ - + const struct opcode opcodes[] = { { "tdi", 0xfc000000, 0x08000000, Op_TO | Op_A | Op_SIMM }, { "twi", 0xfc000000, 0x0c000000, Op_TO | Op_A | Op_SIMM }, @@ -408,7 +407,6 @@ const struct opcode opcodes_3f[] = { { "", 0x0, 0x0, 0 } }; - struct specialreg { int reg; const char *name; @@ -587,7 +585,6 @@ static const char *condstr[8] = { "ge", "le", "ne", "ns", "lt", "gt", "eq", "so" }; - void op_ill(instr_t instr, vm_offset_t loc) { diff --git a/sys/powerpc/powerpc/db_interface.c b/sys/powerpc/powerpc/db_interface.c index d465b6408c9f..bc085c2c086e 100644 --- a/sys/powerpc/powerpc/db_interface.c +++ b/sys/powerpc/powerpc/db_interface.c @@ -2,7 +2,6 @@ /* $NetBSD: db_interface.c,v 1.20 2002/05/13 20:30:09 matt Exp $ */ /* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */ - #include <sys/param.h> #include <sys/systm.h> #include <sys/cons.h> diff --git a/sys/powerpc/powerpc/db_trace.c b/sys/powerpc/powerpc/db_trace.c index 87edb89e164c..3103399f06b4 100644 --- a/sys/powerpc/powerpc/db_trace.c +++ b/sys/powerpc/powerpc/db_trace.c @@ -126,7 +126,6 @@ db_frame(struct db_variable *vp, db_expr_t *valuep, int op) return (1); } - /* * Frame tracing. */ diff --git a/sys/powerpc/powerpc/elf32_machdep.c b/sys/powerpc/powerpc/elf32_machdep.c index c3d017e5e514..3bfa6693820e 100644 --- a/sys/powerpc/powerpc/elf32_machdep.c +++ b/sys/powerpc/powerpc/elf32_machdep.c @@ -257,7 +257,6 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, } switch (rtype) { - case R_PPC_NONE: break; diff --git a/sys/powerpc/powerpc/elf64_machdep.c b/sys/powerpc/powerpc/elf64_machdep.c index 82c25cb8c0ff..c9ba70dceea8 100644 --- a/sys/powerpc/powerpc/elf64_machdep.c +++ b/sys/powerpc/powerpc/elf64_machdep.c @@ -320,7 +320,6 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, } switch (rtype) { - case R_PPC_NONE: break; diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index e67a6a3349ff..d4ec621f7630 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -678,7 +678,7 @@ set_regs(struct thread *td, struct reg *regs) tf = td->td_frame; memcpy(tf, regs, sizeof(struct reg)); - + return (0); } @@ -752,7 +752,7 @@ grab_mcontext32(struct thread *td, mcontext32_t *mcp, int flags) error = grab_mcontext(td, &mcp64, flags); if (error != 0) return (error); - + mcp->mc_vers = mcp64.mc_vers; mcp->mc_flags = mcp64.mc_flags; mcp->mc_onstack = mcp64.mc_onstack; @@ -1193,4 +1193,3 @@ ppc_instr_emulate(struct trapframe *frame, struct thread *td) return (sig); } - diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c index f25783ee3145..d66070323ef4 100644 --- a/sys/powerpc/powerpc/genassym.c +++ b/sys/powerpc/powerpc/genassym.c @@ -280,4 +280,3 @@ ASSYM(PSL_FP, PSL_FP); ASSYM(PSL_ME, PSL_ME); ASSYM(PSL_PR, PSL_PR); ASSYM(PSL_PMM, PSL_PMM); - diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c index 34d53745f693..56d06ea8a628 100644 --- a/sys/powerpc/powerpc/intr_machdep.c +++ b/sys/powerpc/powerpc/intr_machdep.c @@ -554,7 +554,7 @@ powerpc_setup_intr(const char *name, u_int irq, driver_filter_t filter, if (i->trig == INTR_TRIGGER_INVALID) PIC_TRANSLATE_CODE(i->pic, i->intline, i->fwcode, &i->trig, &i->pol); - + if (i->trig != INTR_TRIGGER_CONFORM || i->pol != INTR_POLARITY_CONFORM) PIC_CONFIG(i->pic, i->intline, i->trig, i->pol); diff --git a/sys/powerpc/powerpc/mem.c b/sys/powerpc/powerpc/mem.c index 61b7a4ef6792..d7e8d05a548d 100644 --- a/sys/powerpc/powerpc/mem.c +++ b/sys/powerpc/powerpc/mem.c @@ -126,7 +126,7 @@ kmem_direct_mapped: off = v & PAGE_MASK; error = EFAULT; break; } - + if (hw_direct_map && !pmap_dev_direct_mapped(v, cnt)) { error = uiomove((void *)PHYS_TO_DMAP(v), cnt, uio); @@ -286,7 +286,7 @@ memioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags, int nd, error = 0; struct mem_range_op *mo = (struct mem_range_op *)data; struct mem_range_desc *md; - + /* is this for us? */ if ((cmd != MEMRANGE_GET) && (cmd != MEMRANGE_SET)) @@ -331,4 +331,3 @@ memioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags, } return (error); } - diff --git a/sys/powerpc/powerpc/minidump_machdep.c b/sys/powerpc/powerpc/minidump_machdep.c index f3a764b905f0..e93b11379db0 100644 --- a/sys/powerpc/powerpc/minidump_machdep.c +++ b/sys/powerpc/powerpc/minidump_machdep.c @@ -68,7 +68,6 @@ static void dump_total(const char *id, size_t sz); #define dump_total(...) #endif - extern vm_offset_t __startkernel, __endkernel; int vm_page_dump_size; diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c index 68fd7063b283..619c344b69a7 100644 --- a/sys/powerpc/powerpc/mp_machdep.c +++ b/sys/powerpc/powerpc/mp_machdep.c @@ -271,7 +271,7 @@ cpu_mp_unleash(void *dummy) /* Provide our current DEC and TB values for APs */ ap_timebase = mftb() + 10; __asm __volatile("msync; isync"); - + /* Let APs continue */ atomic_store_rel_int(&ap_letgo, 1); diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 958a89fb497c..1ea3bf7a2368 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -208,7 +208,7 @@ static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, enum intr_polarity pol) { - + return (powerpc_config_intr(irq, trig, pol)); } @@ -263,4 +263,3 @@ nexus_deactivate_resource(device_t bus __unused, device_t child __unused, return (rman_deactivate_resource(r)); } - diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c index 27f0172780e8..6f8f0361d11f 100644 --- a/sys/powerpc/powerpc/platform.c +++ b/sys/powerpc/powerpc/platform.c @@ -403,4 +403,3 @@ platform_probe_and_attach() PLATFORM_ATTACH(plat_obj); } - diff --git a/sys/powerpc/powerpc/syncicache.c b/sys/powerpc/powerpc/syncicache.c index 15ac490798d1..61403daf0734 100644 --- a/sys/powerpc/powerpc/syncicache.c +++ b/sys/powerpc/powerpc/syncicache.c @@ -69,4 +69,3 @@ __syncicache(void *from, int len) } while ((len -= cacheline_size) > 0); __asm __volatile ("sync; isync"); } - diff --git a/sys/powerpc/powerpc/sys_machdep.c b/sys/powerpc/powerpc/sys_machdep.c index 9138074ed7c9..0bd357f2d197 100644 --- a/sys/powerpc/powerpc/sys_machdep.c +++ b/sys/powerpc/powerpc/sys_machdep.c @@ -50,4 +50,3 @@ sysarch(struct thread *td, struct sysarch_args *uap) return (EINVAL); } - diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c index 743299c09fdb..ceb6e5be9830 100644 --- a/sys/powerpc/powerpc/trap.c +++ b/sys/powerpc/powerpc/trap.c @@ -172,7 +172,6 @@ static struct powerpc_exception powerpc_exceptions[] = { "\020L3DAT\017APE\016DPE\015TEA\014b20\013b21\012b22\011b23" \ "\010b24\007b25\006b26\005b27\004b28\003b29\002b30\001b31" - static const char * trapname(u_int vector) { diff --git a/sys/powerpc/powerpc/uma_machdep.c b/sys/powerpc/powerpc/uma_machdep.c index 2aa475d976d2..29d8af64fd42 100644 --- a/sys/powerpc/powerpc/uma_machdep.c +++ b/sys/powerpc/powerpc/uma_machdep.c @@ -57,7 +57,7 @@ uma_small_alloc(uma_zone_t zone, vm_size_t bytes, int domain, u_int8_t *flags, void *va; vm_paddr_t pa; vm_page_t m; - + *flags = UMA_SLAB_PRIV; m = vm_page_alloc_domain(NULL, 0, domain, diff --git a/sys/powerpc/ps3/if_glc.c b/sys/powerpc/ps3/if_glc.c index c7c69d5dbc2e..39aed8218411 100644 --- a/sys/powerpc/ps3/if_glc.c +++ b/sys/powerpc/ps3/if_glc.c @@ -83,7 +83,6 @@ static device_method_t glc_methods[] = { /* Device interface */ DEVMETHOD(device_probe, glc_probe), DEVMETHOD(device_attach, glc_attach), - { 0, 0 } }; @@ -590,7 +589,7 @@ static int glc_add_rxbuf_dma(struct glc_softc *sc, int idx) { struct glc_rxsoft *rxs = &sc->sc_rxsoft[idx]; - + bzero(&sc->sc_rxdmadesc[idx], sizeof(sc->sc_rxdmadesc[idx])); sc->sc_rxdmadesc[idx].paddr = rxs->segment.ds_addr; sc->sc_rxdmadesc[idx].len = rxs->segment.ds_len; @@ -639,7 +638,7 @@ glc_encap(struct glc_softc *sc, struct mbuf **m_head, bus_addr_t *pktdesc) } *m_head = m; } - + err = bus_dmamap_load_mbuf_sg(sc->sc_txdma_tag, txs->txs_dmamap, *m_head, segs, &nsegs, BUS_DMA_NOWAIT); if (err != 0) { @@ -959,4 +958,3 @@ glc_media_change(struct ifnet *ifp) return (result ? EIO : 0); } - diff --git a/sys/powerpc/ps3/if_glcreg.h b/sys/powerpc/ps3/if_glcreg.h index 2e8e577d2c13..dfd6a49126bb 100644 --- a/sys/powerpc/ps3/if_glcreg.h +++ b/sys/powerpc/ps3/if_glcreg.h @@ -38,7 +38,7 @@ struct glc_dmadesc; /* * software state for transmit job mbufs (may be elements of mbuf chains) */ - + struct glc_txsoft { struct mbuf *txs_mbuf; /* head of our mbuf chain */ bus_dmamap_t txs_dmamap; /* our DMA map */ @@ -96,7 +96,7 @@ struct glc_softc { struct glc_txsq sc_txdirtyq; /* Reception */ - + bus_dma_tag_t sc_rxdma_tag; struct glc_rxsoft sc_rxsoft[GLC_MAX_RX_PACKETS]; struct glc_dmadesc *sc_rxdmadesc; @@ -159,4 +159,3 @@ struct glc_dmadesc { }; #endif /* _POWERPC_PS3_IF_GLCREG_H */ - diff --git a/sys/powerpc/ps3/mmu_ps3.c b/sys/powerpc/ps3/mmu_ps3.c index eb410eff4587..2d9fdd06c5ac 100644 --- a/sys/powerpc/ps3/mmu_ps3.c +++ b/sys/powerpc/ps3/mmu_ps3.c @@ -73,7 +73,6 @@ static int64_t mps3_pte_clear(struct pvo_entry *, uint64_t ptebit); static int64_t mps3_pte_unset(struct pvo_entry *); static int64_t mps3_pte_insert(struct pvo_entry *); - static struct pmap_funcs mps3_methods = { .install = mps3_install, .bootstrap = mps3_bootstrap, @@ -161,7 +160,7 @@ static int64_t mps3_pte_synch_locked(struct pvo_entry *pvo) { uint64_t halfbucket[4], rcbits; - + PTESYNC(); lv1_read_htab_entries(mps3_vas_id, pvo->pvo_pte.slot & ~0x3UL, &halfbucket[0], &halfbucket[1], &halfbucket[2], &halfbucket[3], @@ -289,4 +288,3 @@ mps3_pte_insert(struct pvo_entry *pvo) return (0); } - diff --git a/sys/powerpc/ps3/ohci_ps3.c b/sys/powerpc/ps3/ohci_ps3.c index e39505664f11..1a2e64b2a1c3 100644 --- a/sys/powerpc/ps3/ohci_ps3.c +++ b/sys/powerpc/ps3/ohci_ps3.c @@ -171,4 +171,3 @@ static devclass_t ohci_ps3_devclass; DRIVER_MODULE(ohci_ps3, ps3bus, ohci_ps3_driver, ohci_ps3_devclass, 0, 0); MODULE_DEPEND(ohci_ps3, usb, 1, 1, 1); - diff --git a/sys/powerpc/ps3/platform_ps3.c b/sys/powerpc/ps3/platform_ps3.c index 104179f7eda2..5cdd8cf95b0a 100644 --- a/sys/powerpc/ps3/platform_ps3.c +++ b/sys/powerpc/ps3/platform_ps3.c @@ -116,7 +116,7 @@ ps3_probe(platform_t plat) root = OF_finddevice("/"); if (OF_getprop(root, "compatible", compatible, sizeof(compatible)) <= 0) return (BUS_PROBE_NOWILDCARD); - + if (strncmp(compatible, "sony,ps3", sizeof(compatible)) != 0) return (BUS_PROBE_NOWILDCARD); @@ -282,7 +282,7 @@ ps3_real_maxaddr(platform_t plat) ppe_id, lv1_repository_string("rm_size"), &rm_maxaddr, &junk); } - + return (rm_maxaddr); } @@ -291,4 +291,3 @@ ps3_cpu_idle(sbintime_t sbt) { lv1_pause(0); } - diff --git a/sys/powerpc/ps3/ps3_syscons.c b/sys/powerpc/ps3/ps3_syscons.c index aeec42b0cd25..ed339f199746 100644 --- a/sys/powerpc/ps3/ps3_syscons.c +++ b/sys/powerpc/ps3/ps3_syscons.c @@ -111,7 +111,7 @@ ps3fb_probe(struct vt_device *vd) root = OF_finddevice("/"); if (OF_getprop(root, "compatible", compatible, sizeof(compatible)) <= 0) return (CN_DEAD); - + if (strncmp(compatible, "sony,ps3", sizeof(compatible)) != 0) return (CN_DEAD); @@ -173,7 +173,7 @@ ps3fb_init(struct vt_device *vd) bzero(linux_video_mode, sizeof(linux_video_mode)); TUNABLE_STR_FETCH("video", linux_video_mode, sizeof(linux_video_mode)); sscanf(linux_video_mode, "ps3fb:mode:%d", &linux_video_mode_num); - + switch (linux_video_mode_num) { case 1: case 2: @@ -210,7 +210,7 @@ ps3fb_init(struct vt_device *vd) sc->fb_info.fb_width = 1920; break; } - + /* Allow explicitly-specified values for us to override everything */ TUNABLE_INT_FETCH("hw.ps3fb.height", &sc->fb_info.fb_height); TUNABLE_INT_FETCH("hw.ps3fb.width", &sc->fb_info.fb_width); @@ -241,4 +241,3 @@ ps3fb_init(struct vt_device *vd) return (CN_INTERNAL); } - diff --git a/sys/powerpc/ps3/ps3bus.c b/sys/powerpc/ps3/ps3bus.c index 0aa3ad8d7890..2cb4a85db58e 100644 --- a/sys/powerpc/ps3/ps3bus.c +++ b/sys/powerpc/ps3/ps3bus.c @@ -159,7 +159,7 @@ static int ps3bus_probe(device_t dev) { /* Do not attach to any OF nodes that may be present */ - + device_set_desc(dev, "Playstation 3 System Bus"); return (BUS_PROBE_NOWILDCARD); @@ -470,7 +470,7 @@ ps3bus_attach(device_t self) } } } - + clock_register(self, 1000); return (bus_generic_attach(self)); @@ -758,10 +758,9 @@ ps3_gettime(device_t dev, struct timespec *ts) ts->tv_nsec = 0; return (0); } - + static int ps3_settime(device_t dev, struct timespec *ts) { return (-1); } - diff --git a/sys/powerpc/ps3/ps3cdrom.c b/sys/powerpc/ps3/ps3cdrom.c index bc5bdd2e88cc..776f52d4db7b 100644 --- a/sys/powerpc/ps3/ps3cdrom.c +++ b/sys/powerpc/ps3/ps3cdrom.c @@ -506,7 +506,6 @@ ps3cdrom_intr(void *arg) if (!ps3cdrom_decode_lv1_status(status, &sense_key, &asc, &ascq)) { - CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("sense key 0x%02x asc 0x%02x ascq 0x%02x\n", sense_key, asc, ascq)); @@ -640,7 +639,7 @@ ps3cdrom_transfer(void *arg, bus_dma_segment_t *segs, int nsegs, int error) LV1_STORAGE_SEND_ATAPI_COMMAND, vtophys(&atapi_cmd), sizeof(atapi_cmd), atapi_cmd.buf, atapi_cmd.arglen, &xp->x_tag); - + break; } } diff --git a/sys/powerpc/ps3/ps3disk.c b/sys/powerpc/ps3/ps3disk.c index 3bb274b167e2..fc972fb9b65c 100644 --- a/sys/powerpc/ps3/ps3disk.c +++ b/sys/powerpc/ps3/ps3disk.c @@ -327,7 +327,6 @@ ps3disk_task(void *arg) struct ps3disk_softc *sc = (struct ps3disk_softc *) arg; struct bio *bp; - while (1) { kproc_suspend_check(sc->sc_task); tsleep(&sc->sc_deferredq, PRIBIO, "ps3disk", 10); @@ -421,7 +420,7 @@ ps3disk_intr(void *arg) if (lv1_storage_get_async_status(devid, &tag, &status) != 0) return; - + PS3DISK_LOCK(sc); DPRINTF(sc, PS3DISK_DEBUG_INTR, "%s: tag 0x%016lx " diff --git a/sys/powerpc/pseries/phyp-hvcall.h b/sys/powerpc/pseries/phyp-hvcall.h index d0d6a7671f09..19bcc2fe2a04 100644 --- a/sys/powerpc/pseries/phyp-hvcall.h +++ b/sys/powerpc/pseries/phyp-hvcall.h @@ -322,4 +322,3 @@ int64_t phyp_pft_hcall(uint64_t opcode, uint64_t flags, uint64_t pteidx, uint64_t *r6); #endif /* _PSERIES_PHYP_HVCALL_H_ */ - diff --git a/sys/powerpc/pseries/phyp_console.c b/sys/powerpc/pseries/phyp_console.c index f6e5c6f3c10d..7f678e761b0b 100644 --- a/sys/powerpc/pseries/phyp_console.c +++ b/sys/powerpc/pseries/phyp_console.c @@ -108,7 +108,7 @@ static driver_t uart_phyp_driver = { uart_phyp_methods, sizeof(struct uart_phyp_softc), }; - + DRIVER_MODULE(uart_phyp, vdevice, uart_phyp_driver, uart_devclass, 0, 0); static cn_probe_t uart_phyp_cnprobe; @@ -222,7 +222,7 @@ uart_phyp_cnprobe(struct consdev *cp) cp->cn_pri = CN_NORMAL; console_sc = ≻ return; - + fail: cp->cn_pri = CN_DEAD; return; @@ -431,7 +431,7 @@ uart_phyp_ttyoutwakeup(struct tty *tp) int len; sc = tty_softc(tp); - + while ((len = ttydisc_getc(tp, buffer, sizeof(buffer))) != 0) uart_phyp_put(sc, buffer, len); } @@ -453,4 +453,3 @@ uart_phyp_intr(void *v) if (sc->irqres == NULL) callout_reset(&sc->callout, sc->polltime, uart_phyp_intr, sc); } - diff --git a/sys/powerpc/pseries/phyp_dbg.c b/sys/powerpc/pseries/phyp_dbg.c index 6dd6eef78f8f..c6ba7aa151aa 100644 --- a/sys/powerpc/pseries/phyp_dbg.c +++ b/sys/powerpc/pseries/phyp_dbg.c @@ -160,4 +160,3 @@ uart_phyp_dbg_putc(int c) DELAY(100); } while (err == H_BUSY); } - diff --git a/sys/powerpc/pseries/phyp_llan.c b/sys/powerpc/pseries/phyp_llan.c index b387f350f9d8..9b76962f70f9 100644 --- a/sys/powerpc/pseries/phyp_llan.c +++ b/sys/powerpc/pseries/phyp_llan.c @@ -560,4 +560,3 @@ llan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) return (err); } - diff --git a/sys/powerpc/pseries/phyp_vscsi.c b/sys/powerpc/pseries/phyp_vscsi.c index 6c9c32f7bad9..8298776732ef 100644 --- a/sys/powerpc/pseries/phyp_vscsi.c +++ b/sys/powerpc/pseries/phyp_vscsi.c @@ -87,7 +87,7 @@ struct vscsi_xfer { union ccb *ccb; bus_dmamap_t dmamap; uint64_t tag; - + vmem_addr_t srp_iu_offset; vmem_size_t srp_iu_size; }; @@ -368,7 +368,6 @@ vscsi_attach(device_t dev) return (EINVAL); } - mtx_lock(&sc->io_lock); if (xpt_bus_register(sc->sim, dev, 0) != 0) { device_printf(dev, "XPT bus registration failed\n"); @@ -405,7 +404,7 @@ vscsi_detach(device_t dev) cam_simq_free(sc->devq); sc->devq = NULL; } - + mtx_destroy(&sc->io_lock); return (0); @@ -505,7 +504,7 @@ vscsi_srp_login(struct vscsi_softc *sc) xp->ccb = NULL; TAILQ_REMOVE(&sc->free_xferq, xp, queue); TAILQ_INSERT_TAIL(&sc->active_xferq, xp, queue); - + /* Set up command */ xp->srp_iu_size = crq.iu_length = 64; err = vmem_alloc(xp->sc->srp_iu_arena, xp->srp_iu_size, @@ -716,7 +715,7 @@ static void vscsi_crq_load_cb(void *xsc, bus_dma_segment_t *segs, int nsegs, int err) { struct vscsi_softc *sc = xsc; - + sc->crq_phys = segs[0].ds_addr; sc->n_crqs = PAGE_SIZE/sizeof(struct vscsi_crq); @@ -824,7 +823,6 @@ vscsi_setup_bus(struct vscsi_softc *sc) error = phyp_hcall(H_VIO_SIGNAL, sc->unit, 1); /* Enable interrupts */ } - static void vscsi_intr(void *xsc) @@ -992,4 +990,3 @@ vscsi_check_response_queue(struct vscsi_softc *sc) phyp_hcall(H_VIO_SIGNAL, sc->unit, 1); } } - diff --git a/sys/powerpc/pseries/platform_chrp.c b/sys/powerpc/pseries/platform_chrp.c index 0654abc0c655..8523693fdcf8 100644 --- a/sys/powerpc/pseries/platform_chrp.c +++ b/sys/powerpc/pseries/platform_chrp.c @@ -97,7 +97,7 @@ static platform_method_t chrp_methods[] = { PLATFORMMETHOD(platform_mem_regions, chrp_mem_regions), PLATFORMMETHOD(platform_real_maxaddr, chrp_real_maxaddr), PLATFORMMETHOD(platform_timebase_freq, chrp_timebase_freq), - + PLATFORMMETHOD(platform_smp_ap_init, chrp_smp_ap_init), PLATFORMMETHOD(platform_smp_first_cpu, chrp_smp_first_cpu), PLATFORMMETHOD(platform_smp_next_cpu, chrp_smp_next_cpu), @@ -109,7 +109,6 @@ static platform_method_t chrp_methods[] = { #endif PLATFORMMETHOD(platform_reset, chrp_reset), - { 0, 0 } }; @@ -222,7 +221,6 @@ parse_drconf_memory(struct mem_region *ofmem, int *msz, len = OF_getproplen(phandle, "ibm,dynamic-memory"); if (len > 0) { - /* We have to use a variable length array on the stack since we have very limited stack space. */ @@ -238,7 +236,7 @@ parse_drconf_memory(struct mem_region *ofmem, int *msz, /* First address, in arr[1], arr[2]*/ dmem = &arr[1]; - + for (i = 0; i < idx; i++) { base = ((uint64_t)dmem[0] << 32) + dmem[1]; dmem += 4; @@ -473,7 +471,6 @@ chrp_cpuref_init(void) return (0); } - #ifdef SMP static int chrp_smp_start_cpu(platform_t plat, struct pcpu *pc) @@ -595,4 +592,3 @@ chrp_smp_ap_init(platform_t platform) { } #endif - diff --git a/sys/powerpc/pseries/plpar_iommu.c b/sys/powerpc/pseries/plpar_iommu.c index 9511332dd6bb..d403d91ce94a 100644 --- a/sys/powerpc/pseries/plpar_iommu.c +++ b/sys/powerpc/pseries/plpar_iommu.c @@ -215,7 +215,7 @@ phyp_iommu_map(device_t dev, bus_dma_segment_t *segs, int *nsegs, return (0); } - + int phyp_iommu_unmap(device_t dev, bus_dma_segment_t *segs, int nsegs, void *cookie) { @@ -244,4 +244,3 @@ phyp_iommu_unmap(device_t dev, bus_dma_segment_t *segs, int nsegs, void *cookie) return (0); } - diff --git a/sys/powerpc/pseries/plpar_iommu.h b/sys/powerpc/pseries/plpar_iommu.h index 2814a4697527..12e8becd7325 100644 --- a/sys/powerpc/pseries/plpar_iommu.h +++ b/sys/powerpc/pseries/plpar_iommu.h @@ -42,4 +42,3 @@ int phyp_iommu_unmap(device_t dev, bus_dma_segment_t *segs, int nsegs, void *cookie); #endif - diff --git a/sys/powerpc/pseries/plpar_pcibus.c b/sys/powerpc/pseries/plpar_pcibus.c index 8bb4a51d1005..23abb4acd53b 100644 --- a/sys/powerpc/pseries/plpar_pcibus.c +++ b/sys/powerpc/pseries/plpar_pcibus.c @@ -78,7 +78,7 @@ static int plpar_pcibus_probe(device_t dev) { phandle_t rtas; - + if (ofw_bus_get_node(dev) == -1 || !rtas_exists()) return (ENXIO); @@ -112,4 +112,3 @@ plpar_pcibus_get_dma_tag(device_t dev, device_t child) return (dinfo->opd_dma_tag); } - diff --git a/sys/powerpc/pseries/rtas_dev.c b/sys/powerpc/pseries/rtas_dev.c index 2ffda9ebabb8..55d2b2d3a92f 100644 --- a/sys/powerpc/pseries/rtas_dev.c +++ b/sys/powerpc/pseries/rtas_dev.c @@ -64,7 +64,7 @@ static device_method_t rtasdev_methods[] = { /* clock interface */ DEVMETHOD(clock_gettime, rtas_gettime), DEVMETHOD(clock_settime, rtas_settime), - + { 0, 0 }, }; @@ -97,7 +97,7 @@ rtasdev_attach(device_t dev) { if (rtas_token_lookup("get-time-of-day") != -1) clock_register(dev, 2000); - + EVENTHANDLER_REGISTER(shutdown_final, rtas_shutdown, NULL, SHUTDOWN_PRI_LAST); @@ -110,7 +110,7 @@ rtas_gettime(device_t dev, struct timespec *ts) { cell_t tod[8]; cell_t token; int error; - + token = rtas_token_lookup("get-time-of-day"); if (token == -1) return (ENXIO); @@ -138,7 +138,7 @@ rtas_settime(device_t dev, struct timespec *ts) struct clocktime ct; cell_t token, status; int error; - + token = rtas_token_lookup("set-time-of-day"); if (token == -1) return (ENXIO); @@ -158,7 +158,7 @@ static void rtas_shutdown(void *arg, int howto) { cell_t token, status; - + if (howto & RB_HALT) { token = rtas_token_lookup("power-off"); if (token == -1) @@ -173,4 +173,3 @@ rtas_shutdown(void *arg, int howto) rtas_call_method(token, 0, 1, &status); } } - diff --git a/sys/powerpc/pseries/rtas_pci.c b/sys/powerpc/pseries/rtas_pci.c index 95221e759245..97ece878aa7b 100644 --- a/sys/powerpc/pseries/rtas_pci.c +++ b/sys/powerpc/pseries/rtas_pci.c @@ -156,7 +156,7 @@ rtaspci_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int error, pcierror; sc = device_get_softc(dev); - + config_addr = ((bus & 0xff) << 16) | ((slot & 0x1f) << 11) | ((func & 0x7) << 8) | (reg & 0xff); if (sc->sc_extended_config) @@ -179,7 +179,7 @@ rtaspci_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, retval = (int32_t)(int16_t)(retval); break; } - + if (error < 0 || pcierror != 0) retval = 0xffffffff; @@ -195,7 +195,7 @@ rtaspci_write_config(device_t dev, u_int bus, u_int slot, u_int func, int pcierror; sc = device_get_softc(dev); - + config_addr = ((bus & 0xff) << 16) | ((slot & 0x1f) << 11) | ((func & 0x7) << 8) | (reg & 0xff); if (sc->sc_extended_config) @@ -209,4 +209,3 @@ rtaspci_write_config(device_t dev, u_int bus, u_int slot, u_int func, rtas_call_method(sc->write_pci_config, 3, 1, config_addr, width, val, &pcierror); } - diff --git a/sys/powerpc/pseries/vdevice.c b/sys/powerpc/pseries/vdevice.c index 97a8ef156658..d300b2e8457b 100644 --- a/sys/powerpc/pseries/vdevice.c +++ b/sys/powerpc/pseries/vdevice.c @@ -216,4 +216,3 @@ vdevice_get_dma_tag(device_t dev, device_t child) return (dinfo->mdi_dma_tag); } - diff --git a/sys/powerpc/pseries/xics.c b/sys/powerpc/pseries/xics.c index f65a68861bf1..393b88976554 100644 --- a/sys/powerpc/pseries/xics.c +++ b/sys/powerpc/pseries/xics.c @@ -349,7 +349,7 @@ xicp_bind(device_t dev, u_int irq, cpuset_t cpumask, void **priv) break; ncpus++; } - + cpu = pcpu_find(cpu)->pc_hwref; iv->cpu = cpu; @@ -417,7 +417,6 @@ xicp_dispatch(device_t dev, struct trapframe *tf) 0xff); i = sc->ipi_vec; } else { - /* XXX: super inefficient */ for (i = 0; i < sc->nintvecs; i++) { if (sc->intvecs[i].irq == xirr) diff --git a/sys/powerpc/psim/ata_iobus.c b/sys/powerpc/psim/ata_iobus.c index 30e850bfc604..645e92792655 100644 --- a/sys/powerpc/psim/ata_iobus.c +++ b/sys/powerpc/psim/ata_iobus.c @@ -110,7 +110,6 @@ ata_iobus_probe(device_t dev) return (0); } - static int ata_iobus_attach(device_t dev) { @@ -122,7 +121,6 @@ ata_iobus_attach(device_t dev) return (bus_generic_attach(dev)); } - static int ata_iobus_print_child(device_t dev, device_t child) { @@ -135,7 +133,6 @@ ata_iobus_print_child(device_t dev, device_t child) return (retval); } - struct resource * ata_iobus_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, @@ -199,7 +196,6 @@ ata_iobus_alloc_resource(device_t dev, device_t child, int type, int *rid, } } - static int ata_iobus_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) @@ -208,7 +204,6 @@ ata_iobus_release_resource(device_t dev, device_t child, int type, int rid, return (0); } - /* * Define the actual ATA device. This is a sub-bus to the ata-iobus layer * to allow the higher layer bus to massage the resource allocation. diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index a4c0d77d110e..03aae266deaa 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -106,7 +106,6 @@ static device_method_t iobus_methods[] = { DEVMETHOD(bus_release_resource, iobus_release_resource), DEVMETHOD(bus_activate_resource, iobus_activate_resource), DEVMETHOD(bus_deactivate_resource, iobus_deactivate_resource), - { 0, 0 } }; @@ -147,7 +146,6 @@ iobus_add_intr(phandle_t devnode, struct iobus_devinfo *dinfo) dinfo->id_interrupt = intr; } - static void iobus_add_reg(phandle_t devnode, struct iobus_devinfo *dinfo, vm_offset_t iobus_off) @@ -178,7 +176,6 @@ iobus_add_reg(phandle_t devnode, struct iobus_devinfo *dinfo, } } - static int iobus_attach(device_t dev) { @@ -241,34 +238,31 @@ iobus_attach(device_t dev) return (bus_generic_attach(dev)); } - static int iobus_print_child(device_t dev, device_t child) { struct iobus_devinfo *dinfo; struct resource_list *rl; int retval = 0; - + dinfo = device_get_ivars(child); rl = &dinfo->id_resources; retval += bus_print_child_header(dev, child); - + retval += printf(" offset 0x%x", dinfo->id_reg[1]); retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd"); - + retval += bus_print_child_footer(dev, child); return (retval); } - static void iobus_probe_nomatch(device_t dev, device_t child) { } - static int iobus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { @@ -297,14 +291,12 @@ iobus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) return (0); } - static int iobus_write_ivar(device_t dev, device_t child, int which, uintptr_t value) { return (EINVAL); } - static struct resource * iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, @@ -356,7 +348,6 @@ iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, return (rv); } - static int iobus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) @@ -370,7 +361,6 @@ iobus_release_resource(device_t bus, device_t child, int type, int rid, return (rman_release_resource(res)); } - static int iobus_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) @@ -396,7 +386,6 @@ iobus_activate_resource(device_t bus, device_t child, int type, int rid, return (rman_activate_resource(res)); } - static int iobus_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) diff --git a/sys/powerpc/psim/openpic_iobus.c b/sys/powerpc/psim/openpic_iobus.c index 0c248b45ca92..85f2a34b2e0b 100644 --- a/sys/powerpc/psim/openpic_iobus.c +++ b/sys/powerpc/psim/openpic_iobus.c @@ -80,7 +80,6 @@ static device_method_t openpic_iobus_methods[] = { DEVMETHOD(pic_ipi, openpic_ipi), DEVMETHOD(pic_mask, openpic_mask), DEVMETHOD(pic_unmask, openpic_unmask), - { 0, 0 } }; diff --git a/sys/powerpc/psim/uart_iobus.c b/sys/powerpc/psim/uart_iobus.c index 6ddf147cd554..9aa0a345d324 100644 --- a/sys/powerpc/psim/uart_iobus.c +++ b/sys/powerpc/psim/uart_iobus.c @@ -58,7 +58,6 @@ static device_method_t uart_iobus_methods[] = { DEVMETHOD(device_probe, uart_iobus_probe), DEVMETHOD(device_attach, uart_bus_attach), DEVMETHOD(device_detach, uart_bus_detach), - { 0, 0 } }; |