Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

-38

arch/powerpc/include/asm/hw_irq.h

··· 130 130 */ 131 131 struct irq_chip; 132 132 133 - #ifdef CONFIG_PERF_EVENTS 134 - 135 - #ifdef CONFIG_PPC64 136 - static inline unsigned long test_perf_event_pending(void) 137 - { 138 - unsigned long x; 139 - 140 - asm volatile("lbz %0,%1(13)" 141 - : "=r" (x) 142 - : "i" (offsetof(struct paca_struct, perf_event_pending))); 143 - return x; 144 - } 145 - 146 - static inline void set_perf_event_pending(void) 147 - { 148 - asm volatile("stb %0,%1(13)" : : 149 - "r" (1), 150 - "i" (offsetof(struct paca_struct, perf_event_pending))); 151 - } 152 - 153 - static inline void clear_perf_event_pending(void) 154 - { 155 - asm volatile("stb %0,%1(13)" : : 156 - "r" (0), 157 - "i" (offsetof(struct paca_struct, perf_event_pending))); 158 - } 159 - #endif /* CONFIG_PPC64 */ 160 - 161 - #else /* CONFIG_PERF_EVENTS */ 162 - 163 - static inline unsigned long test_perf_event_pending(void) 164 - { 165 - return 0; 166 - } 167 - 168 - static inline void clear_perf_event_pending(void) {} 169 - #endif /* CONFIG_PERF_EVENTS */ 170 - 171 133 #endif /* __KERNEL__ */ 172 134 #endif /* _ASM_POWERPC_HW_IRQ_H */

-1

arch/powerpc/kernel/asm-offsets.c

··· 133 133 DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr)); 134 134 DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled)); 135 135 DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled)); 136 - DEFINE(PACAPERFPEND, offsetof(struct paca_struct, perf_event_pending)); 137 136 DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id)); 138 137 #ifdef CONFIG_PPC_MM_SLICES 139 138 DEFINE(PACALOWSLICESPSIZE, offsetof(struct paca_struct,

+3 -2

arch/powerpc/kernel/dma-swiotlb.c

··· 1 1 /* 2 2 * Contains routines needed to support swiotlb for ppc. 3 3 * 4 - * Copyright (C) 2009 Becky Bruce, Freescale Semiconductor 4 + * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. 5 + * Author: Becky Bruce 5 6 * 6 7 * This program is free software; you can redistribute it and/or modify it 7 8 * under the terms of the GNU General Public License as published by the ··· 71 70 sd->max_direct_dma_addr = 0; 72 71 73 72 /* May need to bounce if the device can't address all of DRAM */ 74 - if (dma_get_mask(dev) < lmb_end_of_DRAM()) 73 + if ((dma_get_mask(dev) + 1) < lmb_end_of_DRAM()) 75 74 set_dma_ops(dev, &swiotlb_dma_ops); 76 75 77 76 return NOTIFY_DONE;

-9

arch/powerpc/kernel/entry_64.S

··· 556 556 2: 557 557 TRACE_AND_RESTORE_IRQ(r5); 558 558 559 - #ifdef CONFIG_PERF_EVENTS 560 - /* check paca->perf_event_pending if we're enabling ints */ 561 - lbz r3,PACAPERFPEND(r13) 562 - and. r3,r3,r5 563 - beq 27f 564 - bl .perf_event_do_pending 565 - 27: 566 - #endif /* CONFIG_PERF_EVENTS */ 567 - 568 559 /* extract EE bit and use it to restore paca->hard_enabled */ 569 560 ld r3,_MSR(r1) 570 561 rldicl r4,r3,49,63 /* r0 = (r3 >> 15) & 1 */

-6

arch/powerpc/kernel/irq.c

··· 53 53 #include <linux/bootmem.h> 54 54 #include <linux/pci.h> 55 55 #include <linux/debugfs.h> 56 - #include <linux/perf_event.h> 57 56 58 57 #include <asm/uaccess.h> 59 58 #include <asm/system.h> ··· 143 144 iseries_handle_interrupts(); 144 145 } 145 146 #endif /* CONFIG_PPC_STD_MMU_64 */ 146 - 147 - if (test_perf_event_pending()) { 148 - clear_perf_event_pending(); 149 - perf_event_do_pending(); 150 - } 151 147 152 148 /* 153 149 * if (get_paca()->hard_enabled) return;

+48 -12

arch/powerpc/kernel/time.c

··· 532 532 } 533 533 #endif /* CONFIG_PPC_ISERIES */ 534 534 535 - #if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_PPC32) 536 - DEFINE_PER_CPU(u8, perf_event_pending); 535 + #ifdef CONFIG_PERF_EVENTS 537 536 538 - void set_perf_event_pending(void) 537 + /* 538 + * 64-bit uses a byte in the PACA, 32-bit uses a per-cpu variable... 539 + */ 540 + #ifdef CONFIG_PPC64 541 + static inline unsigned long test_perf_event_pending(void) 539 542 { 540 - get_cpu_var(perf_event_pending) = 1; 541 - set_dec(1); 542 - put_cpu_var(perf_event_pending); 543 + unsigned long x; 544 + 545 + asm volatile("lbz %0,%1(13)" 546 + : "=r" (x) 547 + : "i" (offsetof(struct paca_struct, perf_event_pending))); 548 + return x; 543 549 } 544 550 551 + static inline void set_perf_event_pending_flag(void) 552 + { 553 + asm volatile("stb %0,%1(13)" : : 554 + "r" (1), 555 + "i" (offsetof(struct paca_struct, perf_event_pending))); 556 + } 557 + 558 + static inline void clear_perf_event_pending(void) 559 + { 560 + asm volatile("stb %0,%1(13)" : : 561 + "r" (0), 562 + "i" (offsetof(struct paca_struct, perf_event_pending))); 563 + } 564 + 565 + #else /* 32-bit */ 566 + 567 + DEFINE_PER_CPU(u8, perf_event_pending); 568 + 569 + #define set_perf_event_pending_flag() __get_cpu_var(perf_event_pending) = 1 545 570 #define test_perf_event_pending() __get_cpu_var(perf_event_pending) 546 571 #define clear_perf_event_pending() __get_cpu_var(perf_event_pending) = 0 547 572 548 - #else /* CONFIG_PERF_EVENTS && CONFIG_PPC32 */ 573 + #endif /* 32 vs 64 bit */ 574 + 575 + void set_perf_event_pending(void) 576 + { 577 + preempt_disable(); 578 + set_perf_event_pending_flag(); 579 + set_dec(1); 580 + preempt_enable(); 581 + } 582 + 583 + #else /* CONFIG_PERF_EVENTS */ 549 584 550 585 #define test_perf_event_pending() 0 551 586 #define clear_perf_event_pending() 552 587 553 - #endif /* CONFIG_PERF_EVENTS && CONFIG_PPC32 */ 588 + #endif /* CONFIG_PERF_EVENTS */ 554 589 555 590 /* 556 591 * For iSeries shared processors, we have to let the hypervisor ··· 617 582 set_dec(DECREMENTER_MAX); 618 583 619 584 #ifdef CONFIG_PPC32 620 - if (test_perf_event_pending()) { 621 - clear_perf_event_pending(); 622 - perf_event_do_pending(); 623 - } 624 585 if (atomic_read(&ppc_n_lost_interrupts) != 0) 625 586 do_IRQ(regs); 626 587 #endif ··· 634 603 irq_enter(); 635 604 636 605 calculate_steal_time(); 606 + 607 + if (test_perf_event_pending()) { 608 + clear_perf_event_pending(); 609 + perf_event_do_pending(); 610 + } 637 611 638 612 #ifdef CONFIG_PPC_ISERIES 639 613 if (firmware_has_feature(FW_FEATURE_ISERIES))

Configure Feed

Configure Feed