62547e
From 55294fc4a955491f1fd947e4d98bd6df832c88ba Mon Sep 17 00:00:00 2001
62547e
From: Matthew Rosato <mjrosato@linux.ibm.com>
62547e
Date: Fri, 3 Dec 2021 09:27:03 -0500
62547e
Subject: [PATCH 01/42] s390x/pci: use a reserved ID for the default PCI group
62547e
MIME-Version: 1.0
62547e
Content-Type: text/plain; charset=UTF-8
62547e
Content-Transfer-Encoding: 8bit
62547e
62547e
RH-Author: Cédric Le Goater <clg@redhat.com>
62547e
RH-MergeRequest: 226: s390: Enhanced Interpretation for PCI Functions and Secure Execution guest dump
62547e
RH-Bugzilla: 1664378 2043909
62547e
RH-Acked-by: Thomas Huth <thuth@redhat.com>
62547e
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
62547e
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
62547e
RH-Commit: [1/41] ad3ed38dec95acf0da04d7669fe772d798d039fc
62547e
62547e
The current default PCI group being used can technically collide with a
62547e
real group ID passed from a hostdev.  Let's instead use a group ID that
62547e
comes from a special pool (0xF0-0xFF) that is architected to be reserved
62547e
for simulated devices.
62547e
62547e
Fixes: 28dc86a072 ("s390x/pci: use a PCI Group structure")
62547e
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
62547e
Reviewed-by: Eric Farman <farman@linux.ibm.com>
62547e
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
62547e
Message-Id: <20211203142706.427279-2-mjrosato@linux.ibm.com>
62547e
Signed-off-by: Thomas Huth <thuth@redhat.com>
62547e
(cherry picked from commit b2892a2b9d45d25b909108ca633d19f9d8d673f5)
62547e
Signed-off-by: Cédric Le Goater <clg@redhat.com>
62547e
---
62547e
 include/hw/s390x/s390-pci-bus.h | 2 +-
62547e
 1 file changed, 1 insertion(+), 1 deletion(-)
62547e
62547e
diff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h
62547e
index aa891c178d..2727e7bdef 100644
62547e
--- a/include/hw/s390x/s390-pci-bus.h
62547e
+++ b/include/hw/s390x/s390-pci-bus.h
62547e
@@ -313,7 +313,7 @@ typedef struct ZpciFmb {
62547e
 } ZpciFmb;
62547e
 QEMU_BUILD_BUG_MSG(offsetof(ZpciFmb, fmt0) != 48, "padding in ZpciFmb");
62547e
 
62547e
-#define ZPCI_DEFAULT_FN_GRP 0x20
62547e
+#define ZPCI_DEFAULT_FN_GRP 0xFF
62547e
 typedef struct S390PCIGroup {
62547e
     ClpRspQueryPciGrp zpci_group;
62547e
     int id;
62547e
-- 
62547e
2.37.3
62547e