public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
* linux-next: manual merge of the s390 tree with the mm tree
@ 2024-10-28  0:16 Stephen Rothwell
  2024-11-20  1:19 ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2024-10-28  0:16 UTC (permalink / raw)
  To: Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
	Andrew Morton
  Cc: Linux Kernel Mailing List, Linux Next Mailing List,
	Mike Rapoport (Microsoft)

[-- Attachment #1: Type: text/plain, Size: 2346 bytes --]

Hi all,

Today's linux-next merge of the s390 tree got conflicts in:

  arch/s390/include/asm/set_memory.h
  arch/s390/mm/pageattr.c

between commit:

  4c5768ef0fd7 ("arch: introduce set_direct_map_valid_noflush()")

from the mm-unstable branch of the mm tree and commit:

  2835f8bf5530 ("s390/pageattr: Implement missing kernel_page_present()")

from the s390 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/s390/include/asm/set_memory.h
index 240bcfbdcdce,cb4cc0f59012..000000000000
--- a/arch/s390/include/asm/set_memory.h
+++ b/arch/s390/include/asm/set_memory.h
@@@ -62,6 -62,6 +62,7 @@@ __SET_MEMORY_FUNC(set_memory_4k, SET_ME
  
  int set_direct_map_invalid_noflush(struct page *page);
  int set_direct_map_default_noflush(struct page *page);
 +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid);
+ bool kernel_page_present(struct page *page);
  
  #endif
diff --cc arch/s390/mm/pageattr.c
index 4c7ee74aa130,aec9eb16b6f7..000000000000
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@@ -406,17 -406,21 +406,33 @@@ int set_direct_map_default_noflush(stru
  	return __set_memory((unsigned long)page_to_virt(page), 1, SET_MEMORY_DEF);
  }
  
 +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid)
 +{
 +	unsigned long flags;
 +
 +	if (valid)
 +		flags = SET_MEMORY_DEF;
 +	else
 +		flags = SET_MEMORY_INV;
 +
 +	return __set_memory((unsigned long)page_to_virt(page), nr, flags);
 +}
++
+ bool kernel_page_present(struct page *page)
+ {
+ 	unsigned long addr;
+ 	unsigned int cc;
+ 
+ 	addr = (unsigned long)page_address(page);
+ 	asm volatile(
+ 		"	lra	%[addr],0(%[addr])\n"
+ 		"	ipm	%[cc]\n"
+ 		: [cc] "=d" (cc), [addr] "+a" (addr)
+ 		:
+ 		: "cc");
+ 	return (cc >> 28) == 0;
+ }
+ 
  #if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KFENCE)
  
  static void ipte_range(pte_t *pte, unsigned long address, int nr)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the s390 tree with the mm tree
@ 2025-03-12  1:07 Stephen Rothwell
  2025-03-30 23:24 ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2025-03-12  1:07 UTC (permalink / raw)
  To: Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
	Andrew Morton
  Cc: Anshuman Khandual, Linux Kernel Mailing List,
	Linux Next Mailing List, Niklas Schnelle, Ryan Roberts

[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]

Hi all,

Today's linux-next merge of the s390 tree got a conflict in:

  arch/s390/include/asm/io.h

between commit:

  08a7874a8e6f ("mm/ioremap: pass pgprot_t to ioremap_prot() instead of unsigned long")

from the mm-unstable branch of the mm tree and commit:

  c94bff63e493 ("s390: Remove ioremap_wt() and pgprot_writethrough()")

from the s390 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/s390/include/asm/io.h
index 82f1043a4fc3,251e0372ccbd..000000000000
--- a/arch/s390/include/asm/io.h
+++ b/arch/s390/include/asm/io.h
@@@ -33,9 -33,7 +33,7 @@@ void unxlate_dev_mem_ptr(phys_addr_t ph
  #define _PAGE_IOREMAP pgprot_val(PAGE_KERNEL)
  
  #define ioremap_wc(addr, size)  \
 -	ioremap_prot((addr), (size), pgprot_val(pgprot_writecombine(PAGE_KERNEL)))
 +	ioremap_prot((addr), (size), pgprot_writecombine(PAGE_KERNEL))
- #define ioremap_wt(addr, size)  \
- 	ioremap_prot((addr), (size), pgprot_writethrough(PAGE_KERNEL))
  
  static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
  {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the s390 tree with the mm tree
@ 2023-07-30 23:37 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2023-07-30 23:37 UTC (permalink / raw)
  To: Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
	Andrew Morton
  Cc: Anastasia Eskova, Costa Shulyupin, Eric DeVolder,
	Linux Kernel Mailing List, Linux Next Mailing List, Sven Schnelle

[-- Attachment #1: Type: text/plain, Size: 3370 bytes --]

Hi all,

Today's linux-next merge of the s390 tree got a conflict in:

  arch/s390/Kconfig

between commits:

  e86a64d19d20 ("s390/kexec: refactor for kernel/Kconfig.kexec")
  54d5daef8143 ("kexec: rename ARCH_HAS_KEXEC_PURGATORY")

from the mm tree and commits:

  8cf57d7217c3 ("s390: add support for user-defined certificates")
  37002bc6b603 ("docs: move s390 under arch")
  b90a64caf844 ("s390/cert_store: select CRYPTO_LIB_SHA256")

from the s390 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/s390/Kconfig
index 42c98931de2c,18bf754e1fad..000000000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -246,28 -245,6 +247,28 @@@ config PGTABLE_LEVEL
  
  source "kernel/livepatch/Kconfig"
  
 +config ARCH_DEFAULT_KEXEC
 +	def_bool y
 +
 +config ARCH_SUPPORTS_KEXEC
 +	def_bool y
 +
 +config ARCH_SUPPORTS_KEXEC_FILE
 +	def_bool CRYPTO && CRYPTO_SHA256 && CRYPTO_SHA256_S390
 +
 +config ARCH_SUPPORTS_KEXEC_SIG
 +	def_bool MODULE_SIG_FORMAT
 +
 +config ARCH_SUPPORTS_KEXEC_PURGATORY
 +	def_bool KEXEC_FILE
 +
 +config ARCH_SUPPORTS_CRASH_DUMP
 +	def_bool y
 +	help
- 	  Refer to <file:Documentation/s390/zfcpdump.rst> for more details on this.
++	  Refer to <file:Documentation/arch/s390/zfcpdump.rst> for more details on this.
 +	  This option also enables s390 zfcpdump.
- 	  See also <file:Documentation/s390/zfcpdump.rst>
++	  See also <file:Documentation/arch/s390/zfcpdump.rst>
 +
  menu "Processor type and features"
  
  config HAVE_MARCH_Z10_FEATURES
@@@ -506,6 -483,47 +507,17 @@@ config SCHED_TOPOLOG
  
  source "kernel/Kconfig.hz"
  
 -config KEXEC
 -	def_bool y
 -	select KEXEC_CORE
 -
 -config KEXEC_FILE
 -	bool "kexec file based system call"
 -	select KEXEC_CORE
 -	depends on CRYPTO
 -	depends on CRYPTO_SHA256
 -	depends on CRYPTO_SHA256_S390
 -	help
 -	  Enable the kexec file based system call. In contrast to the normal
 -	  kexec system call this system call takes file descriptors for the
 -	  kernel and initramfs as arguments.
 -
 -config ARCH_HAS_KEXEC_PURGATORY
 -	def_bool y
 -	depends on KEXEC_FILE
 -
 -config KEXEC_SIG
 -	bool "Verify kernel signature during kexec_file_load() syscall"
 -	depends on KEXEC_FILE && MODULE_SIG_FORMAT
 -	help
 -	  This option makes kernel signature verification mandatory for
 -	  the kexec_file_load() syscall.
 -
 -	  In addition to that option, you need to enable signature
 -	  verification for the corresponding kernel image type being
 -	  loaded in order for this to work.
 -
+ config CERT_STORE
+ 	bool "Get user certificates via DIAG320"
+ 	depends on KEYS
+ 	select CRYPTO_LIB_SHA256
+ 	help
+ 	  Enable this option if you want to access user-provided secure boot
+ 	  certificates via DIAG 0x320.
+ 
+ 	  These certificates will be made available via the keyring named
+ 	  'cert_store'.
+ 
  config KERNEL_NOBP
  	def_bool n
  	prompt "Enable modified branch prediction for the kernel by default"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the s390 tree with the mm tree
@ 2023-07-24 23:40 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2023-07-24 23:40 UTC (permalink / raw)
  To: Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
	Andrew Morton
  Cc: Anastasia Eskova, Costa Shulyupin, Eric DeVolder,
	Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 3219 bytes --]

Hi all,

Today's linux-next merge of the s390 tree got a conflict in:

  arch/s390/Kconfig

between commit:

  b2d2d291f588 ("s390/kexec: refactor for kernel/Kconfig.kexec")

from the mm tree and commits:

  8cf57d7217c3 ("s390: add support for user-defined certificates")
  37002bc6b603 ("docs: move s390 under arch")

from the s390 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/s390/Kconfig
index 736548e4163e,d9d50a7a2016..000000000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -246,28 -245,6 +247,28 @@@ config PGTABLE_LEVEL
  
  source "kernel/livepatch/Kconfig"
  
 +config ARCH_DEFAULT_KEXEC
 +	def_bool y
 +
 +config ARCH_SUPPORTS_KEXEC
 +	def_bool y
 +
 +config ARCH_SUPPORTS_KEXEC_FILE
 +	def_bool CRYPTO && CRYPTO_SHA256 && CRYPTO_SHA256_S390
 +
 +config ARCH_SUPPORTS_KEXEC_SIG
 +	def_bool MODULE_SIG_FORMAT
 +
 +config ARCH_SUPPORTS_KEXEC_PURGATORY
 +	def_bool KEXEC_FILE
 +
 +config ARCH_SUPPORTS_CRASH_DUMP
 +	def_bool y
 +	help
- 	  Refer to <file:Documentation/s390/zfcpdump.rst> for more details on this.
++	  Refer to <file:Documentation/arch/s390/zfcpdump.rst> for more details on this.
 +	  This option also enables s390 zfcpdump.
- 	  See also <file:Documentation/s390/zfcpdump.rst>
++	  See also <file:Documentation/arch/s390/zfcpdump.rst>
 +
  menu "Processor type and features"
  
  config HAVE_MARCH_Z10_FEATURES
@@@ -506,6 -483,46 +507,16 @@@ config SCHED_TOPOLOG
  
  source "kernel/Kconfig.hz"
  
 -config KEXEC
 -	def_bool y
 -	select KEXEC_CORE
 -
 -config KEXEC_FILE
 -	bool "kexec file based system call"
 -	select KEXEC_CORE
 -	depends on CRYPTO
 -	depends on CRYPTO_SHA256
 -	depends on CRYPTO_SHA256_S390
 -	help
 -	  Enable the kexec file based system call. In contrast to the normal
 -	  kexec system call this system call takes file descriptors for the
 -	  kernel and initramfs as arguments.
 -
 -config ARCH_HAS_KEXEC_PURGATORY
 -	def_bool y
 -	depends on KEXEC_FILE
 -
 -config KEXEC_SIG
 -	bool "Verify kernel signature during kexec_file_load() syscall"
 -	depends on KEXEC_FILE && MODULE_SIG_FORMAT
 -	help
 -	  This option makes kernel signature verification mandatory for
 -	  the kexec_file_load() syscall.
 -
 -	  In addition to that option, you need to enable signature
 -	  verification for the corresponding kernel image type being
 -	  loaded in order for this to work.
 -
+ config CERT_STORE
+ 	bool "Get user certificates via DIAG320"
+ 	depends on KEYS
+ 	help
+ 	  Enable this option if you want to access user-provided secure boot
+ 	  certificates via DIAG 0x320.
+ 
+ 	  These certificates will be made available via the keyring named
+ 	  'cert_store'.
+ 
  config KERNEL_NOBP
  	def_bool n
  	prompt "Enable modified branch prediction for the kernel by default"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-03-30 23:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-28  0:16 linux-next: manual merge of the s390 tree with the mm tree Stephen Rothwell
2024-11-20  1:19 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2025-03-12  1:07 Stephen Rothwell
2025-03-30 23:24 ` Stephen Rothwell
2023-07-30 23:37 Stephen Rothwell
2023-07-24 23:40 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox