Commit e3e047e0 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents a2a82c74 102b97d6

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 43

SUBLEVEL = 44

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/imx7d-sdb.dts

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
		enable-active-high;

	};



	reg_usb_otg2_vbus: regulator-usb-otg1-vbus {

	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb_otg2_vbus";

		regulator-min-microvolt = <5000000>;

arch/s390/crypto/crc32be-vx.S

+4 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */



#include <linux/linkage.h>

#include <asm/nospec-insn.h>

#include <asm/vx-insn.h>



/* Vector register range containing CRC-32 constants */
@@ -67,6 +68,8 @@ 


.previous



	GEN_BR_THUNK %r14



.text

/*

 * The CRC-32 function(s) use these calling conventions:
@@ -203,6 +206,6 @@ ENTRY(crc32_be_vgfm_16) 


.Ldone:

	VLGVF	%r2,%v2,3

	br	%r14

	BR_EX	%r14



.previous

arch/s390/crypto/crc32le-vx.S

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */



#include <linux/linkage.h>

#include <asm/nospec-insn.h>

#include <asm/vx-insn.h>



/* Vector register range containing CRC-32 constants */
@@ -76,6 +77,7 @@ 


.previous



	GEN_BR_THUNK %r14



.text
@@ -264,6 +266,6 @@ crc32_le_vgfm_generic: 


.Ldone:

	VLGVF	%r2,%v2,2

	br	%r14

	BR_EX	%r14



.previous

arch/s390/include/asm/alternative-asm.h

0 → 100644
+108 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_S390_ALTERNATIVE_ASM_H

#define _ASM_S390_ALTERNATIVE_ASM_H



#ifdef __ASSEMBLY__



/*

 * Check the length of an instruction sequence. The length may not be larger

 * than 254 bytes and it has to be divisible by 2.

 */

.macro alt_len_check start,end

	.if ( \end - \start ) > 254

	.error "cpu alternatives does not support instructions blocks > 254 bytes\n"

	.endif

	.if ( \end - \start ) % 2

	.error "cpu alternatives instructions length is odd\n"

	.endif

.endm



/*

 * Issue one struct alt_instr descriptor entry (need to put it into

 * the section .altinstructions, see below). This entry contains

 * enough information for the alternatives patching code to patch an

 * instruction. See apply_alternatives().

 */

.macro alt_entry orig_start, orig_end, alt_start, alt_end, feature

	.long	\orig_start - .

	.long	\alt_start - .

	.word	\feature

	.byte	\orig_end - \orig_start

	.byte	\alt_end - \alt_start

.endm



/*

 * Fill up @bytes with nops. The macro emits 6-byte nop instructions

 * for the bulk of the area, possibly followed by a 4-byte and/or

 * a 2-byte nop if the size of the area is not divisible by 6.

 */

.macro alt_pad_fill bytes

	.fill	( \bytes ) / 6, 6, 0xc0040000

	.fill	( \bytes ) % 6 / 4, 4, 0x47000000

	.fill	( \bytes ) % 6 % 4 / 2, 2, 0x0700

.endm



/*

 * Fill up @bytes with nops. If the number of bytes is larger

 * than 6, emit a jg instruction to branch over all nops, then

 * fill an area of size (@bytes - 6) with nop instructions.

 */

.macro alt_pad bytes

	.if ( \bytes > 0 )

	.if ( \bytes > 6 )

	jg	. + \bytes

	alt_pad_fill \bytes - 6

	.else

	alt_pad_fill \bytes

	.endif

	.endif

.endm



/*

 * Define an alternative between two instructions. If @feature is

 * present, early code in apply_alternatives() replaces @oldinstr with

 * @newinstr. ".skip" directive takes care of proper instruction padding

 * in case @newinstr is longer than @oldinstr.

 */

.macro ALTERNATIVE oldinstr, newinstr, feature

	.pushsection .altinstr_replacement,"ax"

770:	\newinstr

771:	.popsection

772:	\oldinstr

773:	alt_len_check 770b, 771b

	alt_len_check 772b, 773b

	alt_pad ( ( 771b - 770b ) - ( 773b - 772b ) )

774:	.pushsection .altinstructions,"a"

	alt_entry 772b, 774b, 770b, 771b, \feature

	.popsection

.endm



/*

 * Define an alternative between two instructions. If @feature is

 * present, early code in apply_alternatives() replaces @oldinstr with

 * @newinstr. ".skip" directive takes care of proper instruction padding

 * in case @newinstr is longer than @oldinstr.

 */

.macro ALTERNATIVE_2 oldinstr, newinstr1, feature1, newinstr2, feature2

	.pushsection .altinstr_replacement,"ax"

770:	\newinstr1

771:	\newinstr2

772:	.popsection

773:	\oldinstr

774:	alt_len_check 770b, 771b

	alt_len_check 771b, 772b

	alt_len_check 773b, 774b

	.if ( 771b - 770b > 772b - 771b )

	alt_pad ( ( 771b - 770b ) - ( 774b - 773b ) )

	.else

	alt_pad ( ( 772b - 771b ) - ( 774b - 773b ) )

	.endif

775:	.pushsection .altinstructions,"a"

	alt_entry 773b, 775b, 770b, 771b,\feature1

	alt_entry 773b, 775b, 771b, 772b,\feature2

	.popsection

.endm



#endif	/*  __ASSEMBLY__  */



#endif /* _ASM_S390_ALTERNATIVE_ASM_H */