Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-06-07 12:44:54 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-06-14 17:58:24 +0200
commit19adec4ff44a3614b59430e6791c0e1867970dc5 (patch)
treeefbb515d342c0f387591f46373ddf0aadfadd49e
parentf20c7e2144e847f881c1f0d7bb440cd2909693ab (diff)
s390/sclp: detect DIRQ facility (jsc#SLE-5789 FATE#327042
bsc#1134730 LTC#173388).
-rw-r--r--patches.arch/s390-sclp-detect-dirq-facility47
-rw-r--r--series.conf1
2 files changed, 48 insertions, 0 deletions
diff --git a/patches.arch/s390-sclp-detect-dirq-facility b/patches.arch/s390-sclp-detect-dirq-facility
new file mode 100644
index 0000000000..1d546e5c87
--- /dev/null
+++ b/patches.arch/s390-sclp-detect-dirq-facility
@@ -0,0 +1,47 @@
+From: Sebastian Ott <sebott@linux.ibm.com>
+Date: Tue, 12 Feb 2019 12:37:50 +0100
+Subject: s390/sclp: detect DIRQ facility
+Git-commit: 0a9fddfaa8ea0f66564329ce89390c8dd38b2df0
+Patch-mainline: v5.2-rc1
+References: jsc#SLE-5789 FATE#327042 bsc#1134730 LTC#173388
+
+Detect the adapter CPU directed interruption facility.
+
+Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ arch/s390/include/asm/sclp.h | 1 +
+ drivers/s390/char/sclp_early.c | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- a/arch/s390/include/asm/sclp.h
++++ b/arch/s390/include/asm/sclp.h
+@@ -77,6 +77,7 @@ struct sclp_info {
+ unsigned char has_skey : 1;
+ unsigned char has_kss : 1;
+ unsigned char has_diag318 : 1;
++ unsigned char has_dirq : 1;
+ unsigned int ibc;
+ unsigned int mtid;
+ unsigned int mtid_cp;
+--- a/drivers/s390/char/sclp_early.c
++++ b/drivers/s390/char/sclp_early.c
+@@ -55,7 +55,8 @@ struct read_info_sccb {
+ u32 hmfai; /* 124-127 */
+ u8 _pad_128[134 - 128]; /* 128-133 */
+ u8 byte_134; /* 134 */
+- u8 _pad_135[4096 - 135]; /* 135-4095 */
++ u8 cpudirq; /* 135 */
++ u8 _pad_136[4096 - 136]; /* 136-4095 */
+ } __packed __aligned(PAGE_SIZE);
+
+ static struct sclp_ipl_info sclp_ipl_info;
+@@ -154,6 +155,7 @@ static void __init sclp_early_facilities
+ sclp.mtid_prev = (sccb->fac42 & 0x80) ? (sccb->fac66 & 31) : 0;
+
+ sclp.hmfai = sccb->hmfai;
++ sclp.has_dirq = !!(sccb->cpudirq & 0x80);
+ }
+
+ /*
diff --git a/series.conf b/series.conf
index eca230bb4f..53dc91a9fd 100644
--- a/series.conf
+++ b/series.conf
@@ -46255,6 +46255,7 @@
patches.arch/s390-pci-mark-command-line-parser-data-_initdata
patches.arch/s390-pci-remove-unused-define
patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c
+ patches.arch/s390-sclp-detect-dirq-facility
patches.fixes/ACPI-button-reinitialize-button-state-upon-resume.patch
patches.fixes/ACPI-property-restore-_DSD-data-subnodes-GUID-commen.patch
patches.fixes/ACPI-property-fix-handling-of-data_nodes-in-acpi_get.patch