Commit 609106b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (38 commits)
  ps3flash: Always read chunks of 256 KiB, and cache them
  ps3flash: Cache the last accessed FLASH chunk
  ps3: Replace direct file operations by callback
  ps3: Switch ps3_os_area_[gs]et_rtc_diff to EXPORT_SYMBOL_GPL()
  ps3: Correct debug message in dma_ioc0_map_pages()
  drivers/ps3: Add missing annotations
  ps3fb: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
  ps3flash: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
  ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata
  ps3: Use dev_[gs]et_drvdata() instead of direct access for system bus devices
  block/ps3: remove driver_data direct access of struct device
  ps3vram: Make ps3vram_priv.reports a void *
  ps3vram: Remove no longer used ps3vram_priv.ddr_base
  ps3vram: Replace mutex by spinlock + bio_list
  block: Add bio_list_peek()
  powerpc: Use generic atomic64_t implementation on 32-bit processors
  lib: Provide generic atomic64_t implementation
  powerpc: Add compiler memory barrier to mtmsr macro
  powerpc/iseries: Mark signal_vsp_instruction() as maybe unused
  powerpc/iseries: Fix unused function warning in iSeries DT code
  ...
parents 69257cae 42e27bfc

arch/powerpc/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -93,10 +93,6 @@ config GENERIC_HWEIGHT 
	bool

	default y



config GENERIC_CALIBRATE_DELAY

	bool

	default y



config GENERIC_FIND_NEXT_BIT

	bool

	default y
@@ -129,6 +125,7 @@ config PPC 
	select USE_GENERIC_SMP_HELPERS if SMP

	select HAVE_OPROFILE

	select HAVE_SYSCALL_WRAPPERS if PPC64

	select GENERIC_ATOMIC64 if PPC32



config EARLY_PRINTK

	bool

arch/powerpc/boot/install.sh

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#   $5 and more - kernel boot files; zImage*, uImage, cuImage.*, etc.

#



# Bail with error code if anything goes wrong

set -e



# User may have a custom install script



if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi

arch/powerpc/include/asm/atomic.h

+3 −0
Original line number Diff line number Diff line
@@ -470,6 +470,9 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) 


#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)



#else  /* __powerpc64__ */

#include <asm-generic/atomic64.h>



#endif /* __powerpc64__ */



#include <asm-generic/atomic-long.h>

arch/powerpc/include/asm/hw_irq.h

+2 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline void local_irq_disable(void) 
	__asm__ __volatile__("wrteei 0": : :"memory");

#else

	unsigned long msr;

	__asm__ __volatile__("": : :"memory");



	msr = mfmsr();

	SET_MSR_EE(msr & ~MSR_EE);

#endif
@@ -92,7 +92,7 @@ static inline void local_irq_enable(void) 
	__asm__ __volatile__("wrteei 1": : :"memory");

#else

	unsigned long msr;

	__asm__ __volatile__("": : :"memory");



	msr = mfmsr();

	SET_MSR_EE(msr | MSR_EE);

#endif
@@ -108,7 +108,6 @@ static inline void local_irq_save_ptr(unsigned long *flags) 
#else

	SET_MSR_EE(msr & ~MSR_EE);

#endif

	__asm__ __volatile__("": : :"memory");

}



#define local_save_flags(flags)	((flags) = mfmsr())

arch/powerpc/include/asm/iommu.h

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,16 @@ 
#define IOMMU_PAGE_MASK       (~((1 << IOMMU_PAGE_SHIFT) - 1))

#define IOMMU_PAGE_ALIGN(addr) _ALIGN_UP(addr, IOMMU_PAGE_SIZE)



/* Cell page table entries */

#define CBE_IOPTE_PP_W		0x8000000000000000ul /* protection: write */

#define CBE_IOPTE_PP_R		0x4000000000000000ul /* protection: read */

#define CBE_IOPTE_M		0x2000000000000000ul /* coherency required */

#define CBE_IOPTE_SO_R		0x1000000000000000ul /* ordering: writes */

#define CBE_IOPTE_SO_RW		0x1800000000000000ul /* ordering: r & w */

#define CBE_IOPTE_RPN_Mask	0x07fffffffffff000ul /* RPN */

#define CBE_IOPTE_H		0x0000000000000800ul /* cache hint */

#define CBE_IOPTE_IOID_Mask	0x00000000000007fful /* ioid */



/* Boot time flags */

extern int iommu_is_off;

extern int iommu_force_on;

CRA Git | Maintained and supported by SUSTech CRA and CCSE