Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47b816ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull a few more things for powerpc by Benjamin Herrenschmidt:
 - Anton's did some recent improvements to EPOW event reporting on
   pSeries (power supply failures and such).  The patches are self
   contained enough and replace really nasty code so I felt it should
   still go in
 - I did the vio driver registration change Greg requested, I don't see
   the point of leaving that til the next merge window
 - The remaining EEH changes I said were still pending to get rid of the
   EEH references from the generic struct device_node
 - A few more iSeries removal bits
 - A perf bug fix on 970

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/perf: Fix instruction address sampling on 970 and Power4
  powerpc+sparc/vio: Modernize driver registration
  powerpc: Random little legacy iSeries removal tidy ups
  powerpc: Remove NO_IRQ_IGNORE
  powerpc/pseries: Cut down on enthusiastic use of defines in RAS code
  powerpc/pseries: Clean up ras_error_interrupt code
  powerpc/pseries: Remove RTAS_POWERMGM_EVENTS
  powerpc/pseries: Use rtas_get_sensor in RAS code
  powerpc/pseries: Parse and handle EPOW interrupts
  powerpc: Make function that parses RTAS error logs global
  powerpc/eeh: Retrieve PHB from global list
  powerpc/eeh: Remove eeh information from pci_dn
  powerpc/eeh: Remove eeh device from OF node
parents 2e7580b0 1ce447b9

arch/powerpc/boot/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ zImage.bin.* 
zImage.chrp

zImage.coff

zImage.holly

zImage.iseries

zImage.*lds

zImage.miboot

zImage.pmac

arch/powerpc/include/asm/iommu.h

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ extern void iommu_unmap_page(struct iommu_table *tbl, dma_addr_t dma_handle, 
			     struct dma_attrs *attrs);



extern void iommu_init_early_pSeries(void);

extern void iommu_init_early_iSeries(void);

extern void iommu_init_early_dart(void);

extern void iommu_init_early_pasemi(void);

arch/powerpc/include/asm/irq.h

+0 −6
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ extern atomic_t ppc_n_lost_interrupts; 
/* This number is used when no interrupt has been assigned */

#define NO_IRQ			(0)



/* This is a special irq number to return from get_irq() to tell that

 * no interrupt happened _and_ ignore it (don't count it as bad). Some

 * platforms like iSeries rely on that.

 */

#define NO_IRQ_IGNORE		((unsigned int)-1)



/* Total number of virq in the platform */

#define NR_IRQS		CONFIG_NR_IRQS

arch/powerpc/include/asm/machdep.h

+1 −3
Original line number Diff line number Diff line
@@ -99,9 +99,7 @@ struct machdep_calls { 


	void		(*init_IRQ)(void);



	/* Return an irq, or NO_IRQ to indicate there are none pending.

	 * If for some reason there is no irq, but the interrupt

	 * shouldn't be counted as spurious, return NO_IRQ_IGNORE. */

	/* Return an irq, or NO_IRQ to indicate there are none pending. */

	unsigned int	(*get_irq)(void);



	/* PCI stuff */

arch/powerpc/include/asm/mmu-hash64.h

+0 −12
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr); 


extern void hpte_init_native(void);

extern void hpte_init_lpar(void);

extern void hpte_init_iSeries(void);

extern void hpte_init_beat(void);

extern void hpte_init_beat_v3(void);
@@ -325,9 +324,6 @@ extern void slb_set_size(u16 size); 
 * WARNING - If you change these you must make sure the asm

 * implementations in slb_allocate (slb_low.S), do_stab_bolted

 * (head.S) and ASM_VSID_SCRAMBLE (below) are changed accordingly.

 *

 * You'll also need to change the precomputed VSID values in head.S

 * which are used by the iSeries firmware.

 */



#define VSID_MULTIPLIER_256M	ASM_CONST(200730139)	/* 28-bit prime */
@@ -484,14 +480,6 @@ static inline unsigned long get_vsid(unsigned long context, unsigned long ea, 
			     | (ea >> SID_SHIFT_1T), 1T);

}



/*

 * This is only used on legacy iSeries in lparmap.c,

 * hence the 256MB segment assumption.

 */

#define VSID_SCRAMBLE(pvsid)	(((pvsid) * VSID_MULTIPLIER_256M) %	\

				 VSID_MODULUS_256M)

#define KERNEL_VSID(ea)		VSID_SCRAMBLE(GET_ESID(ea))



#endif /* __ASSEMBLY__ */



#endif /* _ASM_POWERPC_MMU_HASH64_H_ */