| Message ID | 20211203123221.420101-5-mjrosato@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x/pci: some small fixes | expand |
On 12/3/21 13:32, Matthew Rosato wrote: > The DTSM is a mask that specifies which I/O Address Translation designation > types are supported. Today QEMU only supports DT=1. > > Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com> > --- > hw/s390x/s390-pci-bus.c | 1 + > hw/s390x/s390-pci-inst.c | 1 + > hw/s390x/s390-pci-vfio.c | 1 + > include/hw/s390x/s390-pci-bus.h | 1 + > include/hw/s390x/s390-pci-clp.h | 3 ++- > 5 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 1b51a72838..01b58ebc70 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -782,6 +782,7 @@ static void s390_pci_init_default_group(void) > resgrp->i = 128; > resgrp->maxstbl = 128; > resgrp->version = 0; > + resgrp->dtsm = ZPCI_DTSM; > } > > static void set_pbdev_info(S390PCIBusDevice *pbdev) > diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c > index 07bab85ce5..f3feba5d74 100644 > --- a/hw/s390x/s390-pci-inst.c > +++ b/hw/s390x/s390-pci-inst.c > @@ -329,6 +329,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra) > stw_p(&resgrp->i, group->zpci_group.i); > stw_p(&resgrp->maxstbl, group->zpci_group.maxstbl); > resgrp->version = group->zpci_group.version; > + resgrp->version = group->zpci_group.dtsm; ;) cut and past error ...snip...
On 12/3/21 7:48 AM, Pierre Morel wrote: > > > On 12/3/21 13:32, Matthew Rosato wrote: >> The DTSM is a mask that specifies which I/O Address Translation >> designation >> types are supported. Today QEMU only supports DT=1. >> >> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com> >> --- >> hw/s390x/s390-pci-bus.c | 1 + >> hw/s390x/s390-pci-inst.c | 1 + >> hw/s390x/s390-pci-vfio.c | 1 + >> include/hw/s390x/s390-pci-bus.h | 1 + >> include/hw/s390x/s390-pci-clp.h | 3 ++- >> 5 files changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c >> index 1b51a72838..01b58ebc70 100644 >> --- a/hw/s390x/s390-pci-bus.c >> +++ b/hw/s390x/s390-pci-bus.c >> @@ -782,6 +782,7 @@ static void s390_pci_init_default_group(void) >> resgrp->i = 128; >> resgrp->maxstbl = 128; >> resgrp->version = 0; >> + resgrp->dtsm = ZPCI_DTSM; >> } >> static void set_pbdev_info(S390PCIBusDevice *pbdev) >> diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c >> index 07bab85ce5..f3feba5d74 100644 >> --- a/hw/s390x/s390-pci-inst.c >> +++ b/hw/s390x/s390-pci-inst.c >> @@ -329,6 +329,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, >> uintptr_t ra) >> stw_p(&resgrp->i, group->zpci_group.i); >> stw_p(&resgrp->maxstbl, group->zpci_group.maxstbl); >> resgrp->version = group->zpci_group.version; >> + resgrp->version = group->zpci_group.dtsm; > > ;) cut and past error > > ...snip... > ... And this is why I should not write code first thing in the morning! Thanks, will send a v3 in a bit.
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 1b51a72838..01b58ebc70 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -782,6 +782,7 @@ static void s390_pci_init_default_group(void) resgrp->i = 128; resgrp->maxstbl = 128; resgrp->version = 0; + resgrp->dtsm = ZPCI_DTSM; } static void set_pbdev_info(S390PCIBusDevice *pbdev) diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 07bab85ce5..f3feba5d74 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -329,6 +329,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra) stw_p(&resgrp->i, group->zpci_group.i); stw_p(&resgrp->maxstbl, group->zpci_group.maxstbl); resgrp->version = group->zpci_group.version; + resgrp->version = group->zpci_group.dtsm; stw_p(&resgrp->hdr.rsp, CLP_RC_OK); break; } diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index 2a153fa8c9..6f80a47e29 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -160,6 +160,7 @@ static void s390_pci_read_group(S390PCIBusDevice *pbdev, resgrp->i = cap->noi; resgrp->maxstbl = cap->maxstbl; resgrp->version = cap->version; + resgrp->dtsm = ZPCI_DTSM; } } diff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h index 2727e7bdef..da3cde2bb4 100644 --- a/include/hw/s390x/s390-pci-bus.h +++ b/include/hw/s390x/s390-pci-bus.h @@ -37,6 +37,7 @@ #define ZPCI_MAX_UID 0xffff #define UID_UNDEFINED 0 #define UID_CHECKING_ENABLED 0x01 +#define ZPCI_DTSM 0x40 OBJECT_DECLARE_SIMPLE_TYPE(S390pciState, S390_PCI_HOST_BRIDGE) OBJECT_DECLARE_SIMPLE_TYPE(S390PCIBus, S390_PCI_BUS) diff --git a/include/hw/s390x/s390-pci-clp.h b/include/hw/s390x/s390-pci-clp.h index 96b8e3f133..cc8c8662b8 100644 --- a/include/hw/s390x/s390-pci-clp.h +++ b/include/hw/s390x/s390-pci-clp.h @@ -163,7 +163,8 @@ typedef struct ClpRspQueryPciGrp { uint8_t fr; uint16_t maxstbl; uint16_t mui; - uint64_t reserved3; + uint8_t dtsm; + uint8_t reserved3[7]; uint64_t dasm; /* dma address space mask */ uint64_t msia; /* MSI address */ uint64_t reserved4;
The DTSM is a mask that specifies which I/O Address Translation designation types are supported. Today QEMU only supports DT=1. Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com> --- hw/s390x/s390-pci-bus.c | 1 + hw/s390x/s390-pci-inst.c | 1 + hw/s390x/s390-pci-vfio.c | 1 + include/hw/s390x/s390-pci-bus.h | 1 + include/hw/s390x/s390-pci-clp.h | 3 ++- 5 files changed, 6 insertions(+), 1 deletion(-)