[v3] s390x: Add support for virtio-blk-pci IPL device

[PATCH v3 06/14] include/hw/s390x: Move CLP definitions for easier BIOS access

Posted by jrossi@linux.ibm.com 1 week, 5 days ago

From: Jared Rossi <jrossi@linux.ibm.com>

Move the s390-pci-clp definitions into the "ipl" sub-directory, which is visible
to the s390-bios.  This allows the bios to reuse the architected definitions and
prevents code duplication.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
 hw/s390x/s390-pci-vfio.c                  | 2 +-
 include/hw/s390x/{ => ipl}/s390-pci-clp.h | 0
 include/hw/s390x/s390-pci-bus.h           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/hw/s390x/{ => ipl}/s390-pci-clp.h (100%)

diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
index 9e31029d7a..8ce44dbecc 100644
--- a/hw/s390x/s390-pci-vfio.c
+++ b/hw/s390x/s390-pci-vfio.c
@@ -17,7 +17,7 @@
 
 #include "trace.h"
 #include "hw/s390x/s390-pci-bus.h"
-#include "hw/s390x/s390-pci-clp.h"
+#include "hw/s390x/ipl/s390-pci-clp.h"
 #include "hw/s390x/s390-pci-vfio.h"
 #include "hw/vfio/pci.h"
 #include "hw/vfio/vfio-container-legacy.h"
diff --git a/include/hw/s390x/s390-pci-clp.h b/include/hw/s390x/ipl/s390-pci-clp.h
similarity index 100%
rename from include/hw/s390x/s390-pci-clp.h
rename to include/hw/s390x/ipl/s390-pci-clp.h
diff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h
index 04944d4fed..f643e13057 100644
--- a/include/hw/s390x/s390-pci-bus.h
+++ b/include/hw/s390x/s390-pci-bus.h
@@ -19,7 +19,7 @@
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/s390_flic.h"
 #include "hw/s390x/css.h"
-#include "hw/s390x/s390-pci-clp.h"
+#include "hw/s390x/ipl/s390-pci-clp.h"
 #include "qom/object.h"
 
 #define TYPE_S390_PCI_HOST_BRIDGE "s390-pcihost"
-- 
2.52.0

Re: [PATCH v3 06/14] include/hw/s390x: Move CLP definitions for easier BIOS access

Posted by Matthew Rosato 1 week, 3 days ago

On 1/27/26 11:15 AM, jrossi@linux.ibm.com wrote:
> From: Jared Rossi <jrossi@linux.ibm.com>
> 
> Move the s390-pci-clp definitions into the "ipl" sub-directory, which is visible
> to the s390-bios.  This allows the bios to reuse the architected definitions and
> prevents code duplication.
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>

Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>

Re: [PATCH v3 06/14] include/hw/s390x: Move CLP definitions for easier BIOS access

Posted by Eric Farman 1 week, 3 days ago

On Tue, 2026-01-27 at 11:15 -0500, jrossi@linux.ibm.com wrote:
> From: Jared Rossi <jrossi@linux.ibm.com>
> 
> Move the s390-pci-clp definitions into the "ipl" sub-directory, which is visible
> to the s390-bios.  This allows the bios to reuse the architected definitions and
> prevents code duplication.
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
> ---
>  hw/s390x/s390-pci-vfio.c                  | 2 +-
>  include/hw/s390x/{ => ipl}/s390-pci-clp.h | 0
>  include/hw/s390x/s390-pci-bus.h           | 2 +-
>  3 files changed, 2 insertions(+), 2 deletions(-)
>  rename include/hw/s390x/{ => ipl}/s390-pci-clp.h (100%)

Reviewed-by: Eric Farman <farman@linux.ibm.com>

Re: [PATCH v3 06/14] include/hw/s390x: Move CLP definitions for easier BIOS access

Posted by Eric Farman 1 week, 2 days ago

On Thu, 2026-01-29 at 16:46 -0500, Eric Farman wrote:
> On Tue, 2026-01-27 at 11:15 -0500, jrossi@linux.ibm.com wrote:
> > From: Jared Rossi <jrossi@linux.ibm.com>
> > 
> > Move the s390-pci-clp definitions into the "ipl" sub-directory, which is visible
> > to the s390-bios.  This allows the bios to reuse the architected definitions and
> > prevents code duplication.
> > 
> > Reviewed-by: Thomas Huth <thuth@redhat.com>
> > Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
> > ---
> >  hw/s390x/s390-pci-vfio.c                  | 2 +-
> >  include/hw/s390x/{ => ipl}/s390-pci-clp.h | 0
> >  include/hw/s390x/s390-pci-bus.h           | 2 +-
> >  3 files changed, 2 insertions(+), 2 deletions(-)
> >  rename include/hw/s390x/{ => ipl}/s390-pci-clp.h (100%)
> 
> Reviewed-by: Eric Farman <farman@linux.ibm.com>

Actually, small nit that popped into my head on the drive home... Could you update MAINTAINERS so
that we don't lose the PCI CLP header file from the S390 PCI group?

Re: [PATCH v3 06/14] include/hw/s390x: Move CLP definitions for easier BIOS access

Posted by Jared Rossi 1 week ago


On 1/29/26 8:50 PM, Eric Farman wrote:
> On Thu, 2026-01-29 at 16:46 -0500, Eric Farman wrote:
>> On Tue, 2026-01-27 at 11:15 -0500, jrossi@linux.ibm.com wrote:
>>> From: Jared Rossi <jrossi@linux.ibm.com>
>>>
>>> Move the s390-pci-clp definitions into the "ipl" sub-directory, which is visible
>>> to the s390-bios.  This allows the bios to reuse the architected definitions and
>>> prevents code duplication.
>>>
>>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>>> Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
>>> ---
>>>   hw/s390x/s390-pci-vfio.c                  | 2 +-
>>>   include/hw/s390x/{ => ipl}/s390-pci-clp.h | 0
>>>   include/hw/s390x/s390-pci-bus.h           | 2 +-
>>>   3 files changed, 2 insertions(+), 2 deletions(-)
>>>   rename include/hw/s390x/{ => ipl}/s390-pci-clp.h (100%)
>> Reviewed-by: Eric Farman <farman@linux.ibm.com>
> Actually, small nit that popped into my head on the drive home... Could you update MAINTAINERS so
> that we don't lose the PCI CLP header file from the S390 PCI group?

Sure thing, will do.

Thanks again for the reviews,
Jared Rossi