Commit 1f1c153e authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull powerpc updates from Michael Ellerman:
 "Livepatch support for 32-bit is probably the standout new feature,
  otherwise mostly just lots of bits and pieces all over the board.

  There's a series of commits cleaning up function descriptor handling,
  which touches a few other arches as well as LKDTM. It has acks from
  Arnd, Kees and Helge.

  Summary:

   - Enforce kernel RO, and implement STRICT_MODULE_RWX for 603.

   - Add support for livepatch to 32-bit.

   - Implement CONFIG_DYNAMIC_FTRACE_WITH_ARGS.

   - Merge vdso64 and vdso32 into a single directory.

   - Fix build errors with newer binutils.

   - Add support for UADDR64 relocations, which are emitted by some
     toolchains. This allows powerpc to build with the latest lld.

   - Fix (another) potential userspace r13 corruption in transactional
     memory handling.

   - Cleanups of function descriptor handling & related fixes to LKDTM.

  Thanks to Abdul Haleem, Alexey Kardashevskiy, Anders Roxell, Aneesh
  Kumar K.V, Anton Blanchard, Arnd Bergmann, Athira Rajeev, Bhaskar
  Chowdhury, Cédric Le Goater, Chen Jingwen, Christophe JAILLET,
  Christophe Leroy, Corentin Labbe, Daniel Axtens, Daniel Henrique
  Barboza, David Dai, Fabiano Rosas, Ganesh Goudar, Guo Zhengkui, Hangyu
  Hua, Haren Myneni, Hari Bathini, Igor Zhbanov, Jakob Koschel, Jason
  Wang, Jeremy Kerr, Joachim Wiberg, Jordan Niethe, Julia Lawall, Kajol
  Jain, Kees Cook, Laurent Dufour, Madhavan Srinivasan, Mamatha Inamdar,
  Maxime Bizon, Maxim Kiselev, Maxim Kochetkov, Michal Suchanek,
  Nageswara R Sastry, Nathan Lynch, Naveen N. Rao, Nicholas Piggin,
  Nour-eddine Taleb, Paul Menzel, Ping Fang, Pratik R. Sampat, Randy
  Dunlap, Ritesh Harjani, Rohan McLure, Russell Currey, Sachin Sant,
  Segher Boessenkool, Shivaprasad G Bhat, Sourabh Jain, Thierry Reding,
  Tobias Waldekranz, Tyrel Datwyler, Vaibhav Jain, Vladimir Oltean,
  Wedson Almeida Filho, and YueHaibing"

* tag 'powerpc-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (179 commits)
  powerpc/pseries: Fix use after free in remove_phb_dynamic()
  powerpc/time: improve decrementer clockevent processing
  powerpc/time: Fix KVM host re-arming a timer beyond decrementer range
  powerpc/tm: Fix more userspace r13 corruption
  powerpc/xive: fix return value of __setup handler
  powerpc/64: Add UADDR64 relocation support
  powerpc: 8xx: fix a return value error in mpc8xx_pic_init
  powerpc/ps3: remove unneeded semicolons
  powerpc/64: Force inlining of prevent_user_access() and set_kuap()
  powerpc/bitops: Force inlining of fls()
  powerpc: declare unmodified attribute_group usages const
  powerpc/spufs: Fix build warning when CONFIG_PROC_FS=n
  powerpc/secvar: fix refcount leak in format_show()
  powerpc/64e: Tie PPC_BOOK3E_64 to PPC_FSL_BOOK3E
  powerpc: Move C prototypes out of asm-prototypes.h
  powerpc/kexec: Declare kexec_paca static
  powerpc/smp: Declare current_set static
  powerpc: Cleanup asm-prototypes.c
  powerpc/ftrace: Use STK_GOT in ftrace_mprofile.S
  powerpc/ftrace: Regroup PPC64 specific operations in ftrace_mprofile.S
  ...
parents 9a8b3d5f fe2640bd
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -61,3 +61,15 @@ Description:
		* "CchRHCnt" : Cache Read Hit Count
		* "CchWHCnt" : Cache Write Hit Count
		* "FastWCnt" : Fast Write Count

What:		/sys/bus/nd/devices/nmemX/papr/health_bitmap_inject
Date:		Jan, 2022
KernelVersion:	v5.17
Contact:	linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, nvdimm@lists.linux.dev,
Description:
		(RO) Reports the health bitmap inject bitmap that is applied to
		bitmap received from PowerVM via the H_SCM_HEALTH. This is used
		to forcibly set specific bits returned from Hcall. These is then
		used to simulate various health or shutdown states for an nvdimm
		and are set by user-space tools like ndctl by issuing a PAPR DSM.
+29 −0
Original line number Diff line number Diff line
What:		/sys/firmware/papr/energy_scale_info
Date:		February 2022
Contact:	Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>
Description:	Directory hosting a set of platform attributes like
		energy/frequency on Linux running as a PAPR guest.

		Each file in a directory contains a platform
		attribute hierarchy pertaining to performance/
		energy-savings mode and processor frequency.

What:		/sys/firmware/papr/energy_scale_info/<id>
Date:		February 2022
Contact:	Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>
Description:	Energy, frequency attributes directory for POWERVM servers

What:		/sys/firmware/papr/energy_scale_info/<id>/desc
Date:		February 2022
Contact:	Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>
Description:	String description of the energy attribute of <id>

What:		/sys/firmware/papr/energy_scale_info/<id>/value
Date:		February 2022
Contact:	Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>
Description:	Numeric value of the energy attribute of <id>

What:		/sys/firmware/papr/energy_scale_info/<id>/value_desc
Date:		February 2022
Contact:	Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>
Description:	String value of the energy attribute of <id>
+3 −0
Original line number Diff line number Diff line
@@ -202,6 +202,9 @@ config HAVE_FUNCTION_ERROR_INJECTION
config HAVE_NMI
	bool

config HAVE_FUNCTION_DESCRIPTORS
	bool

config TRACE_IRQFLAGS_SUPPORT
	bool

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ config IA64
	select HAVE_SETUP_PER_CPU_AREA
	select TTY
	select HAVE_ARCH_TRACEHOOK
	select HAVE_FUNCTION_DESCRIPTORS
	select HAVE_VIRT_CPU_ACCOUNTING
	select HUGETLB_PAGE_SIZE_VARIABLE if HUGETLB_PAGE
	select VIRT_TO_BUS
+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ struct got_entry {
 * Layout of the Function Descriptor
 */
struct fdesc {
	uint64_t ip;
	uint64_t addr;
	uint64_t gp;
};

Loading