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

Commit a4230bea authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.109 into android-4.9 



Changes in 4.9.109
	x86/fpu: Hard-disable lazy FPU mode
	bonding: correctly update link status during mii-commit phase
	bonding: fix active-backup transition
	bonding: require speed/duplex only for 802.3ad, alb and tlb
	nvme-pci: initialize queue memory before interrupts
	af_key: Always verify length of provided sadb_key
	x86/crypto, x86/fpu: Remove X86_FEATURE_EAGER_FPU #ifdef from the crc32c code
	nvmet: Move serial number from controller to subsystem
	nvmet: don't report 0-bytes in serial number
	nvmet: don't overwrite identify sn/fr with 0-bytes
	gpio: No NULL owner
	KVM: x86: introduce linear_{read,write}_system
	KVM: x86: pass kvm_vcpu to kvm_read_guest_virt and kvm_write_guest_virt_system
	staging: android: ion: Switch to pr_warn_once in ion_buffer_destroy
	usbip: vhci_sysfs: fix potential Spectre v1
	usb-storage: Add support for FL_ALWAYS_SYNC flag in the UAS driver
	usb-storage: Add compatibility quirk flags for G-Technologies G-Drive
	usb: gadget: udc: renesas_usb3: disable the controller's irqs for reconnecting
	serial: sh-sci: Stop using printk format %pCr
	tty/serial: atmel: use port->name as name in request_irq()
	serial: samsung: fix maxburst parameter for DMA transactions
	serial: 8250: omap: Fix idling of clocks for unused uarts
	vmw_balloon: fixing double free when batching mode is off
	tty: pl011: Avoid spuriously stuck-off interrupts
	kvm: x86: use correct privilege level for sgdt/sidt/fxsave/fxrstor access
	Input: goodix - add new ACPI id for GPD Win 2 touch screen
	Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID
	crypto: vmx - Remove overly verbose printk from AES init routines
	crypto: omap-sham - fix memleak
	perf: sync up x86/.../cpufeatures.h
	Linux 4.9.109

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b7d377b4 8e52b94e

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 108

SUBLEVEL = 109

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/crypto/crc32c-intel_glue.c

+0 −5
Original line number Diff line number Diff line
@@ -58,16 +58,11 @@ 
asmlinkage unsigned int crc_pcl(const u8 *buffer, int len,

				unsigned int crc_init);

static int crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_EAGERFPU;

#if defined(X86_FEATURE_EAGER_FPU)

#define set_pcl_breakeven_point()					\

do {									\

	if (!use_eager_fpu())						\

		crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU;	\

} while (0)

#else

#define set_pcl_breakeven_point()					\

	(crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU)

#endif

#endif /* CONFIG_X86_64 */



static u32 crc32c_intel_le_hw_byte(u32 crc, unsigned char const *data, size_t length)

arch/x86/include/asm/cpufeatures.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ 
#define X86_FEATURE_EXTD_APICID	( 3*32+26) /* has extended APICID (8 bits) */

#define X86_FEATURE_AMD_DCM     ( 3*32+27) /* multi-node processor */

#define X86_FEATURE_APERFMPERF	( 3*32+28) /* APERFMPERF */

#define X86_FEATURE_EAGER_FPU	( 3*32+29) /* "eagerfpu" Non lazy FPU restore */

/* free, was #define X86_FEATURE_EAGER_FPU	( 3*32+29) * "eagerfpu" Non lazy FPU restore */

#define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30) /* TSC doesn't stop in S3 state */



/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */

arch/x86/include/asm/fpu/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ extern u64 fpu__get_supported_xfeatures_mask(void); 
 */

static __always_inline __pure bool use_eager_fpu(void)

{

	return static_cpu_has(X86_FEATURE_EAGER_FPU);

	return true;

}



static __always_inline __pure bool use_xsaveopt(void)

arch/x86/include/asm/kvm_emulate.h

+4 −2
Original line number Diff line number Diff line
@@ -105,11 +105,12 @@ struct x86_emulate_ops { 
	 *  @addr:  [IN ] Linear address from which to read.

	 *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.

	 *  @bytes: [IN ] Number of bytes to read from memory.

	 *  @system:[IN ] Whether the access is forced to be at CPL0.

	 */

	int (*read_std)(struct x86_emulate_ctxt *ctxt,

			unsigned long addr, void *val,

			unsigned int bytes,

			struct x86_exception *fault);

			struct x86_exception *fault, bool system);



	/*

	 * read_phys: Read bytes of standard (non-emulated/special) memory.
@@ -127,10 +128,11 @@ struct x86_emulate_ops { 
	 *  @addr:  [IN ] Linear address to which to write.

	 *  @val:   [OUT] Value write to memory, zero-extended to 'u_long'.

	 *  @bytes: [IN ] Number of bytes to write to memory.

	 *  @system:[IN ] Whether the access is forced to be at CPL0.

	 */

	int (*write_std)(struct x86_emulate_ctxt *ctxt,

			 unsigned long addr, void *val, unsigned int bytes,

			 struct x86_exception *fault);

			 struct x86_exception *fault, bool system);

	/*

	 * fetch: Read bytes of standard (non-emulated/special) memory.

	 *        Used for instruction fetch.