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

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

Merge 5.4.221 into android11-5.4-lts 



Changes in 5.4.221
	xfs: open code insert range extent split helper
	xfs: rework insert range into an atomic operation
	xfs: rework collapse range into an atomic operation
	xfs: add a function to deal with corrupt buffers post-verifiers
	xfs: xfs_buf_corruption_error should take __this_address
	xfs: fix buffer corruption reporting when xfs_dir3_free_header_check fails
	xfs: check owner of dir3 data blocks
	xfs: check owner of dir3 blocks
	xfs: Use scnprintf() for avoiding potential buffer overflow
	xfs: remove the xfs_disk_dquot_t and xfs_dquot_t
	xfs: remove the xfs_dq_logitem_t typedef
	xfs: remove the xfs_qoff_logitem_t typedef
	xfs: Replace function declaration by actual definition
	xfs: factor out quotaoff intent AIL removal and memory free
	xfs: fix unmount hang and memory leak on shutdown during quotaoff
	xfs: preserve default grace interval during quotacheck
	xfs: Lower CIL flush limit for large logs
	xfs: Throttle commits on delayed background CIL push
	xfs: factor common AIL item deletion code
	xfs: tail updates only need to occur when LSN changes
	xfs: don't write a corrupt unmount record to force summary counter recalc
	xfs: trylock underlying buffer on dquot flush
	xfs: factor out a new xfs_log_force_inode helper
	xfs: reflink should force the log out if mounted with wsync
	xfs: move inode flush to the sync workqueue
	xfs: fix use-after-free on CIL context on shutdown
	ocfs2: clear dinode links count in case of error
	ocfs2: fix BUG when iput after ocfs2_mknod fails
	x86/microcode/AMD: Apply the patch early on every logical thread
	hwmon/coretemp: Handle large core ID value
	ata: ahci-imx: Fix MODULE_ALIAS
	ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS
	KVM: arm64: vgic: Fix exit condition in scan_its_table()
	media: venus: dec: Handle the case where find_format fails
	arm64: errata: Remove AES hwcap for COMPAT tasks
	r8152: add PID for the Lenovo OneLink+ Dock
	btrfs: fix processing of delayed data refs during backref walking
	btrfs: fix processing of delayed tree block refs during backref walking
	ACPI: extlog: Handle multiple records
	tipc: Fix recognition of trial period
	tipc: fix an information leak in tipc_topsrv_kern_subscr
	HID: magicmouse: Do not set BTN_MOUSE on double report
	net/atm: fix proc_mpc_write incorrect return value
	net: phy: dp83867: Extend RX strap quirk for SGMII mode
	net: sched: cake: fix null pointer access issue when cake_init() fails
	net: hns: fix possible memory leak in hnae_ae_register()
	iommu/vt-d: Clean up si_domain in the init_dmars() error path
	arm64: topology: move store_cpu_topology() to shared code
	riscv: topology: fix default topology reporting
	ACPI: video: Force backlight native for more TongFang devices
	Makefile.debug: re-enable debug info for .S files
	hv_netvsc: Fix race between VF offering and VF association message from host
	mm: /proc/pid/smaps_rollup: fix no vma's null-deref
	Linux 5.4.221

Change-Id: I6f01d64978900d3bf878c86075beb1969e810825
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents f134fec5 b70bfeb9

Documentation/arm64/silicon-errata.rst

+4 −0
Original line number Original line Diff line number Diff line
@@ -70,8 +70,12 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A57      | #834220         | ARM64_ERRATUM_834220        |

| ARM            | Cortex-A57      | #834220         | ARM64_ERRATUM_834220        |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A57      | #1742098        | ARM64_ERRATUM_1742098       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A72      | #853709         | N/A                         |

| ARM            | Cortex-A72      | #853709         | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A72      | #1655431        | ARM64_ERRATUM_1742098       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A73      | #858921         | ARM64_ERRATUM_858921        |

| ARM            | Cortex-A73      | #858921         | ARM64_ERRATUM_858921        |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A55      | #1024718        | ARM64_ERRATUM_1024718       |

| ARM            | Cortex-A55      | #1024718        | ARM64_ERRATUM_1024718       |

Makefile

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

# SPDX-License-Identifier: GPL-2.0

VERSION = 5

VERSION = 5

PATCHLEVEL = 4

PATCHLEVEL = 4

SUBLEVEL = 220

SUBLEVEL = 221

EXTRAVERSION =

EXTRAVERSION =

NAME = Kleptomaniac Octopus

NAME = Kleptomaniac Octopus
@@ -825,7 +825,9 @@ DEBUG_CFLAGS += -gsplit-dwarf 
else

else

DEBUG_CFLAGS	+= -g

DEBUG_CFLAGS	+= -g

endif

endif

ifneq ($(LLVM_IAS),1)

ifeq ($(LLVM_IAS),1)

KBUILD_AFLAGS	+= -g

else

KBUILD_AFLAGS	+= -Wa,-gdwarf-2

KBUILD_AFLAGS	+= -Wa,-gdwarf-2

endif

endif

endif

endif

arch/arm64/Kconfig

+16 −0
Original line number Original line Diff line number Diff line
@@ -577,6 +577,22 @@ config ARM64_ERRATUM_1542419 




	  If unsure, say Y.

	  If unsure, say Y.





config ARM64_ERRATUM_1742098

	bool "Cortex-A57/A72: 1742098: ELR recorded incorrectly on interrupt taken between cryptographic instructions in a sequence"

	depends on COMPAT

	default y

	help

	  This option removes the AES hwcap for aarch32 user-space to

	  workaround erratum 1742098 on Cortex-A57 and Cortex-A72.



	  Affected parts may corrupt the AES state if an interrupt is

	  taken between a pair of AES instructions. These instructions

	  are only present if the cryptography extensions are present.

	  All software should have a fallback implementation for CPUs

	  that don't implement the cryptography extensions.



	  If unsure, say Y.



config CAVIUM_ERRATUM_22375

config CAVIUM_ERRATUM_22375

	bool "Cavium erratum 22375, 24313"

	bool "Cavium erratum 22375, 24313"

	default y

	default y

arch/arm64/include/asm/cpucaps.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -57,8 +57,9 @@ 
#define ARM64_WORKAROUND_1542419		47

#define ARM64_WORKAROUND_1542419		47

#define ARM64_HAS_AMU_EXTN			48

#define ARM64_HAS_AMU_EXTN			48

#define ARM64_SPECTRE_BHB			49

#define ARM64_SPECTRE_BHB			49

#define ARM64_WORKAROUND_1742098		50





/* kabi: reserve 50 - 62 for future cpu capabilities */

/* kabi: reserve 51 - 62 for future cpu capabilities */

#define ARM64_NCAPS				62

#define ARM64_NCAPS				62





#endif /* __ASM_CPUCAPS_H */
 
#endif /* __ASM_CPUCAPS_H */

arch/arm64/kernel/cpu_errata.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -817,6 +817,14 @@ static const struct arm64_cpu_capabilities erratum_843419_list[] = { 
};

};

#endif

#endif





#ifdef CONFIG_ARM64_ERRATUM_1742098

static struct midr_range broken_aarch32_aes[] = {

	MIDR_RANGE(MIDR_CORTEX_A57, 0, 1, 0xf, 0xf),

	MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),

	{},

};

#endif



const struct arm64_cpu_capabilities arm64_errata[] = {

const struct arm64_cpu_capabilities arm64_errata[] = {

#ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE

#ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE

	{

	{
@@ -997,6 +1005,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = { 
		.matches = has_neoverse_n1_erratum_1542419,

		.matches = has_neoverse_n1_erratum_1542419,

		.cpu_enable = cpu_enable_trap_ctr_access,

		.cpu_enable = cpu_enable_trap_ctr_access,

	},

	},

#endif

#ifdef CONFIG_ARM64_ERRATUM_1742098

	{

		.desc = "ARM erratum 1742098",

		.capability = ARM64_WORKAROUND_1742098,

		CAP_MIDR_RANGE_LIST(broken_aarch32_aes),

		.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,

	},

#endif

#endif

	{

	{

	}

	}