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

Commit 1d508f8a 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 more powerpc updates from Ben Herrenschmidt:
 "Here are some more powerpc bits for 3.17, essentially fixes.

  The biggest series, also aimed at -stable, is from Aneesh and is the
  result of weeks and weeks of debugging to find out why the heck or THP
  implementation was occasionally triggering multi-hit errors in our
  level 1 TLB.  It ended up being a combination of issues including
  subtleties as to how we should invalidate those special 'MPSS' pages
  we use to allow the use of 16M pages inside 4K/64K "base page size"
  segments (you really have to love our MMU !)

  Another interesting one in the "OMG" category is the series from
  Michael adding memory barriers to spin_is_locked().  That's also the
  result of many days of debugging to figure out why the semaphore code
  would occasionally crash in ways that made no sense.  It ended up
  being some creative lock stacking that was defeated by the fact that
  our locks allow a load inside the locked section to be re-ordered with
  the load of the lock value itself (I'm still of two mind about whether
  to kill that once and for all by putting a heavier barrier back into
  our lock implementation...).  The fixes come with a long explanation
  in the cset comments, feel free to read it if you feel like having a
  headache today"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (25 commits)
  powerpc/thp: Add tracepoints to track hugepage invalidate
  powerpc/mm: Use read barrier when creating real_pte
  powerpc/thp: Use ACCESS_ONCE when loading pmdp
  powerpc/thp: Invalidate with vpn in loop
  powerpc/thp: Handle combo pages in invalidate
  powerpc/thp: Invalidate old 64K based hash page mapping before insert of 4k pte
  powerpc/thp: Don't recompute vsid and ssize in loop on invalidate
  powerpc/thp: Add write barrier after updating the valid bit
  powerpc: reorder per-cpu NUMA information's initialization
  powerpc/perf/hv-24x7: Use kmem_cache_free
  powerpc/pseries/hvcserver: Fix endian issue in hvcs_get_partner_info
  powerpc: Hard disable interrupts in xmon
  powerpc: remove duplicate definition of TEXASR_FS
  powerpc/pseries: Avoid deadlock on removing ddw
  powerpc/pseries: Failure on removing device node
  powerpc/boot: Use correct zlib types for comparison
  powerpc/powernv: Interface to register/unregister opal dump region
  printk: Add function to return log buffer address and size
  powerpc: Add POWER8 features to CPU_FTRS_POSSIBLE/ALWAYS
  powerpc/ppc476: Disable BTAC
  ...
parents 2d0c05e1 9e813308

arch/powerpc/boot/gunzip_util.c

+2 −2
Original line number Diff line number Diff line
@@ -112,10 +112,10 @@ int gunzip_partial(struct gunzip_state *state, void *dst, int dstlen) 
		r = zlib_inflate(&state->s, Z_FULL_FLUSH);

		if (r != Z_OK && r != Z_STREAM_END)

			fatal("inflate returned %d msg: %s\n\r", r, state->s.msg);

		len = state->s.next_out - (unsigned char *)dst;

		len = state->s.next_out - (Byte *)dst;

	} else {

		/* uncompressed image */

		len = min(state->s.avail_in, (unsigned)dstlen);

		len = min(state->s.avail_in, (uLong)dstlen);

		memcpy(dst, state->s.next_in, len);

		state->s.next_in += len;

		state->s.avail_in -= len;

arch/powerpc/include/asm/cputable.h

+4 −2
Original line number Diff line number Diff line
@@ -459,7 +459,8 @@ extern const char *powerpc_base_platform; 
#define CPU_FTRS_POSSIBLE	\

	    (CPU_FTRS_POWER4 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \

	     CPU_FTRS_POWER6 | CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | \

	     CPU_FTRS_POWER8 | CPU_FTRS_CELL | CPU_FTRS_PA6T | CPU_FTR_VSX)

	     CPU_FTRS_POWER8 | CPU_FTRS_POWER8_DD1 | CPU_FTRS_CELL | \

	     CPU_FTRS_PA6T | CPU_FTR_VSX)

#endif

#else

enum {
@@ -509,7 +510,8 @@ enum { 
#define CPU_FTRS_ALWAYS		\

	    (CPU_FTRS_POWER4 & CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \

	     CPU_FTRS_POWER6 & CPU_FTRS_POWER7 & CPU_FTRS_CELL & \

	     CPU_FTRS_PA6T & CPU_FTRS_POSSIBLE)

	     CPU_FTRS_PA6T & CPU_FTRS_POWER8 & CPU_FTRS_POWER8E & \

	     CPU_FTRS_POWER8_DD1 & CPU_FTRS_POSSIBLE)

#endif

#else

enum {

arch/powerpc/include/asm/machdep.h

+3 −3
Original line number Diff line number Diff line
@@ -57,10 +57,10 @@ struct machdep_calls { 
	void            (*hpte_removebolted)(unsigned long ea,

					     int psize, int ssize);

	void		(*flush_hash_range)(unsigned long number, int local);

	void		(*hugepage_invalidate)(struct mm_struct *mm,

	void		(*hugepage_invalidate)(unsigned long vsid,

					       unsigned long addr,

					       unsigned char *hpte_slot_array,

					       unsigned long addr, int psize);



					       int psize, int ssize);

	/* special for kexec, to be called in real mode, linear mapping is

	 * destroyed as well */

	void		(*hpte_clear_all)(void);

arch/powerpc/include/asm/opal.h

+11 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ struct opal_sg_list { 
#define OPAL_DUMP_INFO2				94

#define OPAL_PCI_EEH_FREEZE_SET			97

#define OPAL_HANDLE_HMI				98

#define OPAL_REGISTER_DUMP_REGION		101

#define OPAL_UNREGISTER_DUMP_REGION		102



#ifndef __ASSEMBLY__
@@ -920,6 +922,8 @@ int64_t opal_set_param(uint64_t token, uint32_t param_id, uint64_t buffer, 
		uint64_t length);

int64_t opal_sensor_read(uint32_t sensor_hndl, int token, __be32 *sensor_data);

int64_t opal_handle_hmi(void);

int64_t opal_register_dump_region(uint32_t id, uint64_t start, uint64_t end);

int64_t opal_unregister_dump_region(uint32_t id);



/* Internal functions */

extern int early_init_dt_scan_opal(unsigned long node, const char *uname,
@@ -974,6 +978,13 @@ struct opal_sg_list *opal_vmalloc_to_sg_list(void *vmalloc_addr, 
					     unsigned long vmalloc_size);

void opal_free_sg_list(struct opal_sg_list *sg);



/*

 * Dump region ID range usable by the OS

 */

#define OPAL_DUMP_REGION_HOST_START		0x80

#define OPAL_DUMP_REGION_LOG_BUF		0x80

#define OPAL_DUMP_REGION_HOST_END		0xFF



#endif /* __ASSEMBLY__ */



#endif /* __OPAL_H */

arch/powerpc/include/asm/pgtable-ppc64.h

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static inline char *get_hpte_slot_array(pmd_t *pmdp) 
}



extern void hpte_do_hugepage_flush(struct mm_struct *mm, unsigned long addr,

				   pmd_t *pmdp);

				   pmd_t *pmdp, unsigned long old_pmd);

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

extern pmd_t pfn_pmd(unsigned long pfn, pgprot_t pgprot);

extern pmd_t mk_pmd(struct page *page, pgprot_t pgprot);