83 lines
2.8 KiB
Diff
83 lines
2.8 KiB
Diff
|
From 536b6081c0739bebbb33583370f62116d0cb42da Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Fri, 29 May 2020 05:54:01 -0400
|
||
|
|
Subject: [PATCH 19/42] s390x: ipl: Consolidate iplb validity check into one
|
||
|
|
function
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <20200529055420.16855-20-thuth@redhat.com>
|
||
|
|
Patchwork-id: 97038
|
||
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 19/38] s390x: ipl: Consolidate iplb validity check into one function
|
||
|
|
Bugzilla: 1828317
|
||
|
|
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
|
||
|
|
From: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
|
||
|
|
It's nicer to just call one function than calling a function for each
|
||
|
|
possible iplb type.
|
||
|
|
|
||
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
||
|
|
Message-Id: <20200310090950.61172-1-frankja@linux.ibm.com>
|
||
|
|
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
(cherry picked from commit 94c21436e5a89143f8b9cb4d089d1a2f3f4fd377)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/s390x/ipl.h | 18 +++++++++---------
|
||
|
|
target/s390x/diag.c | 2 +-
|
||
|
|
2 files changed, 10 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
|
||
|
|
index d4813105db..3e44abe1c6 100644
|
||
|
|
--- a/hw/s390x/ipl.h
|
||
|
|
+++ b/hw/s390x/ipl.h
|
||
|
|
@@ -173,16 +173,16 @@ static inline bool iplb_valid_len(IplParameterBlock *iplb)
|
||
|
|
return be32_to_cpu(iplb->len) <= sizeof(IplParameterBlock);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static inline bool iplb_valid_ccw(IplParameterBlock *iplb)
|
||
|
|
+static inline bool iplb_valid(IplParameterBlock *iplb)
|
||
|
|
{
|
||
|
|
- return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_CCW_LEN &&
|
||
|
|
- iplb->pbt == S390_IPL_TYPE_CCW;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-static inline bool iplb_valid_fcp(IplParameterBlock *iplb)
|
||
|
|
-{
|
||
|
|
- return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_FCP_LEN &&
|
||
|
|
- iplb->pbt == S390_IPL_TYPE_FCP;
|
||
|
|
+ switch (iplb->pbt) {
|
||
|
|
+ case S390_IPL_TYPE_FCP:
|
||
|
|
+ return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_FCP_LEN;
|
||
|
|
+ case S390_IPL_TYPE_CCW:
|
||
|
|
+ return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_CCW_LEN;
|
||
|
|
+ default:
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
#endif
|
||
|
|
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
|
||
|
|
index b5aec06d6b..54e5670b3f 100644
|
||
|
|
--- a/target/s390x/diag.c
|
||
|
|
+++ b/target/s390x/diag.c
|
||
|
|
@@ -117,7 +117,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
|
||
|
|
|
||
|
|
cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
|
||
|
|
|
||
|
|
- if (!iplb_valid_ccw(iplb) && !iplb_valid_fcp(iplb)) {
|
||
|
|
+ if (!iplb_valid(iplb)) {
|
||
|
|
env->regs[r1 + 1] = DIAG_308_RC_INVALID;
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|