Commit b4df2e35 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.12-8' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Hopefully the last two powerpc fixes for 4.12.

  The CXL one is larger than I'd usually send at rc7, but it fixes new
  code this cycle, so better to have it working for the release. It was
  actually sent a few weeks back but got blocked in testing behind
  another fix that was causing issues.

  We are still tracking one crash in v4.12-rc7, but only one person has
  reproduced it and the commit identified by bisect doesn't touch any of
  the relevant code, so I think it's 50/50 whether that commit is
  actually the problem or it's some code layout / toolchain issue.

  Two fixes for code we merged this cycle:

   - cxl: Fixes for Coherent Accelerator Interface Architecture 2.0

   - Avoid miscompilation w/GCC 4.6.3 on 32-bit - don't inline
     copy_to/from_user()

  Thanks to Al Viro, Larry Finger, Christophe Lombard"

* tag 'powerpc-4.12-8' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/32: Avoid miscompilation w/GCC 4.6.3 - don't inline copy_to/from_user()
  cxl: Fixes for Coherent Accelerator Interface Architecture 2.0
parents 27ab862a d6bd8194

arch/powerpc/include/asm/uaccess.h

+1 −7
Original line number Diff line number Diff line
@@ -267,13 +267,7 @@ do { \ 
extern unsigned long __copy_tofrom_user(void __user *to,

		const void __user *from, unsigned long size);



#ifndef __powerpc64__



#define INLINE_COPY_FROM_USER

#define INLINE_COPY_TO_USER



#else /* __powerpc64__ */



#ifdef __powerpc64__

static inline unsigned long

raw_copy_in_user(void __user *to, const void __user *from, unsigned long n)

{

drivers/misc/cxl/context.c

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int cxl_context_init(struct cxl_context *ctx, struct cxl_afu *afu, bool master) 
	mutex_init(&ctx->mapping_lock);

	ctx->mapping = NULL;



	if (cxl_is_psl8(afu)) {

	if (cxl_is_power8()) {

		spin_lock_init(&ctx->sste_lock);



		/*
@@ -189,7 +189,7 @@ int cxl_context_iomap(struct cxl_context *ctx, struct vm_area_struct *vma) 
		if (start + len > ctx->afu->adapter->ps_size)

			return -EINVAL;



		if (cxl_is_psl9(ctx->afu)) {

		if (cxl_is_power9()) {

			/*

			 * Make sure there is a valid problem state

			 * area space for this AFU.
@@ -324,7 +324,7 @@ static void reclaim_ctx(struct rcu_head *rcu) 
{

	struct cxl_context *ctx = container_of(rcu, struct cxl_context, rcu);



	if (cxl_is_psl8(ctx->afu))

	if (cxl_is_power8())

		free_page((u64)ctx->sstp);

	if (ctx->ff_page)

		__free_page(ctx->ff_page);

drivers/misc/cxl/cxl.h

+5 −13
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ static const cxl_p2n_reg_t CXL_PSL_WED_An = {0x0A0}; 
#define CXL_PSL9_DSISR_An_PF_RGP  0x0000000000000090ULL  /* PTE not found (Radix Guest (parent)) 0b10010000 */

#define CXL_PSL9_DSISR_An_PF_HRH  0x0000000000000094ULL  /* PTE not found (HPT/Radix Host)       0b10010100 */

#define CXL_PSL9_DSISR_An_PF_STEG 0x000000000000009CULL  /* PTE not found (STEG VA)              0b10011100 */

#define CXL_PSL9_DSISR_An_URTCH   0x00000000000000B4ULL  /* Unsupported Radix Tree Configuration 0b10110100 */



/****** CXL_PSL_TFC_An ******************************************************/

#define CXL_PSL_TFC_An_A  (1ull << (63-28)) /* Acknowledge non-translation fault */
@@ -844,24 +845,15 @@ static inline bool cxl_is_power8(void) 


static inline bool cxl_is_power9(void)

{

	/* intermediate solution */

	if (!cxl_is_power8() &&

	   (cpu_has_feature(CPU_FTRS_POWER9) ||

	    cpu_has_feature(CPU_FTR_POWER9_DD1)))

	if (pvr_version_is(PVR_POWER9))

		return true;

	return false;

}



static inline bool cxl_is_psl8(struct cxl_afu *afu)

static inline bool cxl_is_power9_dd1(void)

{

	if (afu->adapter->caia_major == 1)

		return true;

	return false;

}



static inline bool cxl_is_psl9(struct cxl_afu *afu)

{

	if (afu->adapter->caia_major == 2)

	if ((pvr_version_is(PVR_POWER9)) &&

	    cpu_has_feature(CPU_FTR_POWER9_DD1))

		return true;

	return false;

}

drivers/misc/cxl/fault.c

+15 −8
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static struct mm_struct *get_mem_context(struct cxl_context *ctx) 


static bool cxl_is_segment_miss(struct cxl_context *ctx, u64 dsisr)

{

	if ((cxl_is_psl8(ctx->afu)) && (dsisr & CXL_PSL_DSISR_An_DS))

	if ((cxl_is_power8() && (dsisr & CXL_PSL_DSISR_An_DS)))

		return true;



	return false;
@@ -195,15 +195,22 @@ static bool cxl_is_segment_miss(struct cxl_context *ctx, u64 dsisr) 


static bool cxl_is_page_fault(struct cxl_context *ctx, u64 dsisr)

{

	if ((cxl_is_psl8(ctx->afu)) && (dsisr & CXL_PSL_DSISR_An_DM))

	u64 crs; /* Translation Checkout Response Status */



	if ((cxl_is_power8()) && (dsisr & CXL_PSL_DSISR_An_DM))

		return true;



	if ((cxl_is_psl9(ctx->afu)) &&

	   ((dsisr & CXL_PSL9_DSISR_An_CO_MASK) &

		(CXL_PSL9_DSISR_An_PF_SLR | CXL_PSL9_DSISR_An_PF_RGC |

		 CXL_PSL9_DSISR_An_PF_RGP | CXL_PSL9_DSISR_An_PF_HRH |

		 CXL_PSL9_DSISR_An_PF_STEG)))

	if (cxl_is_power9()) {

		crs = (dsisr & CXL_PSL9_DSISR_An_CO_MASK);

		if ((crs == CXL_PSL9_DSISR_An_PF_SLR) ||

		    (crs == CXL_PSL9_DSISR_An_PF_RGC) ||

		    (crs == CXL_PSL9_DSISR_An_PF_RGP) ||

		    (crs == CXL_PSL9_DSISR_An_PF_HRH) ||

		    (crs == CXL_PSL9_DSISR_An_PF_STEG) ||

		    (crs == CXL_PSL9_DSISR_An_URTCH)) {

			return true;

		}

	}



	return false;

}

drivers/misc/cxl/main.c

+13 −4
Original line number Diff line number Diff line
@@ -329,8 +329,15 @@ static int __init init_cxl(void) 


	cxl_debugfs_init();



	if ((rc = register_cxl_calls(&cxl_calls)))

	/*

	 * we don't register the callback on P9. slb callack is only

	 * used for the PSL8 MMU and CX4.

	 */

	if (cxl_is_power8()) {

		rc = register_cxl_calls(&cxl_calls);

		if (rc)

			goto err;

	}



	if (cpu_has_feature(CPU_FTR_HVMODE)) {

		cxl_ops = &cxl_native_ops;
@@ -347,6 +354,7 @@ static int __init init_cxl(void) 


	return 0;

err1:

	if (cxl_is_power8())

		unregister_cxl_calls(&cxl_calls);

err:

	cxl_debugfs_exit();
@@ -366,6 +374,7 @@ static void exit_cxl(void) 


	cxl_debugfs_exit();

	cxl_file_exit();

	if (cxl_is_power8())

		unregister_cxl_calls(&cxl_calls);

	idr_destroy(&cxl_adapter_idr);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE