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

Commit 9aabfa05 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.4@8c91412 (v4.4.75) into msm-4.4 



* refs/heads/tmp-8c91412c:
  Linux 4.4.75
  nvme: apply DELAY_BEFORE_CHK_RDY quirk at probe time too
  nvme/quirk: Add a delay before checking for adapter readiness
  net: phy: fix marvell phy status reading
  net: phy: Initialize mdio clock at probe function
  usb: gadget: f_fs: avoid out of bounds access on comp_desc
  powerpc/slb: Force a full SLB flush when we insert for a bad EA
  mtd: spi-nor: fix spansion quad enable
  of: Add check to of_scan_flat_dt() before accessing initial_boot_params
  rxrpc: Fix several cases where a padded len isn't checked in ticket decode
  USB: usbip: fix nonconforming hub descriptor
  drm/amdgpu: adjust default display clock
  drm/amdgpu/atom: fix ps allocation size for EnableDispPowerGating
  drm/radeon: add a quirk for Toshiba Satellite L20-183
  drm/radeon: add a PX quirk for another K53TK variant
  iscsi-target: Reject immediate data underflow larger than SCSI transfer length
  target: Fix kref->refcount underflow in transport_cmd_finish_abort
  time: Fix clock->read(clock) race around clocksource changes
  Input: i8042 - add Fujitsu Lifebook AH544 to notimeout list
  powerpc/kprobes: Pause function_graph tracing during jprobes handling
  signal: Only reschedule timers on signals timers have sent
  HID: Add quirk for Dell PIXART OEM mouse
  CIFS: Improve readdir verbosity
  KVM: PPC: Book3S HV: Preserve userspace HTM state properly
  lib/cmdline.c: fix get_options() overflow while parsing ranges
  autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL
  fs/exec.c: account for argv/envp pointers
  UPSTREAM: drivers/perf: arm-pmu: fix RCU usage on pmu resume from low-power
  UPSTREAM: drivers/perf: arm_pmu: implement CPU_PM notifier
  ANDROID: squashfs: Fix endianness issue
  ANDROID: squashfs: Fix signed division issue

Change-Id: Iabe0921dd7b9a582f5237235338ef0f730de7edb
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 0fc26d94 8c91412c

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 74

SUBLEVEL = 75

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/powerpc/kernel/kprobes.c

+11 −0
Original line number Diff line number Diff line
@@ -514,6 +514,15 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs) 
#endif

#endif



	/*

	 * jprobes use jprobe_return() which skips the normal return

	 * path of the function, and this messes up the accounting of the

	 * function graph tracer.

	 *

	 * Pause function graph tracing while performing the jprobe function.

	 */

	pause_graph_tracing();



	return 1;

}
@@ -536,6 +545,8 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) 
	 * saved regs...

	 */

	memcpy(regs, &kcb->jprobe_saved_regs, sizeof(struct pt_regs));

	/* It's OK to start function graph tracing again */

	unpause_graph_tracing();

	preempt_enable_no_resched();

	return 1;

}

arch/powerpc/kvm/book3s_hv.c

+21 −0
Original line number Diff line number Diff line
@@ -2693,6 +2693,27 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) 
		return -EINVAL;

	}



	/*

	 * Don't allow entry with a suspended transaction, because

	 * the guest entry/exit code will lose it.

	 * If the guest has TM enabled, save away their TM-related SPRs

	 * (they will get restored by the TM unavailable interrupt).

	 */

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	if (cpu_has_feature(CPU_FTR_TM) && current->thread.regs &&

	    (current->thread.regs->msr & MSR_TM)) {

		if (MSR_TM_ACTIVE(current->thread.regs->msr)) {

			run->exit_reason = KVM_EXIT_FAIL_ENTRY;

			run->fail_entry.hardware_entry_failure_reason = 0;

			return -EINVAL;

		}

		current->thread.tm_tfhar = mfspr(SPRN_TFHAR);

		current->thread.tm_tfiar = mfspr(SPRN_TFIAR);

		current->thread.tm_texasr = mfspr(SPRN_TEXASR);

		current->thread.regs->msr &= ~MSR_TM;

	}

#endif



	kvmppc_core_prepare_to_enter(vcpu);



	/* No need to go into the guest when all we'll do is come back out */

arch/powerpc/mm/slb_low.S

+10 −0
Original line number Diff line number Diff line
@@ -179,6 +179,16 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT) 
	b	slb_finish_load



8:	/* invalid EA */

	/*

	 * It's possible the bad EA is too large to fit in the SLB cache, which

	 * would mean we'd fail to invalidate it on context switch. So mark the

	 * SLB cache as full so we force a full flush. We also set cr7+eq to

	 * mark the address as a kernel address, so slb_finish_load() skips

	 * trying to insert it into the SLB cache.

	 */

	li	r9,SLB_CACHE_ENTRIES + 1

	sth	r9,PACASLBCACHEPTR(r13)

	crset	4*cr7+eq

	li	r10,0			/* BAD_VSID */

	li	r9,0			/* BAD_VSID */

	li	r11,SLB_VSID_USER	/* flags don't much matter */

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c

+4 −0
Original line number Diff line number Diff line
@@ -681,6 +681,10 @@ int amdgpu_atombios_get_clock_info(struct amdgpu_device *adev) 
			DRM_INFO("Changing default dispclk from %dMhz to 600Mhz\n",

				 adev->clock.default_dispclk / 100);

			adev->clock.default_dispclk = 60000;

		} else if (adev->clock.default_dispclk <= 60000) {

			DRM_INFO("Changing default dispclk from %dMhz to 625Mhz\n",

				 adev->clock.default_dispclk / 100);

			adev->clock.default_dispclk = 62500;

		}

		adev->clock.dp_extclk =

			le16_to_cpu(firmware_info->info_21.usUniphyDPModeExtClkFreq);