Commit c188e303 authored by Yi Min Zhao's avatar Yi Min Zhao Committed by Cornelia Huck
Browse files

s390x/pci: unify FH_ macros 



Present code uses some macros to structure PCI Function Handle. But
their names don't have a uniform format. Let's use FH_MASK_ as the
unified prefix.

While we're at it, differentiate the SHM bits: use different bits for
vfio and emulated devices.

Signed-off-by: default avatarYi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 67aad508

hw/s390x/s390-pci-bus.c

+3 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static uint32_t s390_pci_get_pfid(PCIDevice *pdev) 


static uint32_t s390_pci_get_pfh(PCIDevice *pdev)

{

    return PCI_SLOT(pdev->devfn) | FH_VIRT;

    return PCI_SLOT(pdev->devfn) | FH_SHM_VFIO;

}



S390PCIBusDevice *s390_pci_find_dev_by_idx(uint32_t idx)
@@ -345,7 +345,7 @@ static IOMMUTLBEntry s390_translate_iommu(MemoryRegion *iommu, hwaddr addr, 
    };



    if (!pbdev->configured || !pbdev->pdev ||

        !(pbdev->fh & FH_ENABLED) || !pbdev->iommu_enabled) {

        !(pbdev->fh & FH_MASK_ENABLE) || !pbdev->iommu_enabled) {

        return ret;

    }
@@ -456,7 +456,7 @@ static void s390_msi_ctrl_write(void *opaque, hwaddr addr, uint64_t data, 
        return;

    }



    if (!(pbdev->fh & FH_ENABLED)) {

    if (!(pbdev->fh & FH_MASK_ENABLE)) {

        return;

    }

hw/s390x/s390-pci-bus.h

+6 −3
Original line number Diff line number Diff line
@@ -21,9 +21,12 @@ 
#include "hw/s390x/css.h"



#define TYPE_S390_PCI_HOST_BRIDGE "s390-pcihost"

#define FH_VIRT 0x00ff0000

#define ENABLE_BIT_OFFSET 31

#define FH_ENABLED (1 << ENABLE_BIT_OFFSET)

#define FH_MASK_ENABLE   0x80000000

#define FH_MASK_INSTANCE 0x7f000000

#define FH_MASK_SHM      0x00ff0000

#define FH_MASK_INDEX    0x0000001f

#define FH_SHM_VFIO      0x00010000

#define FH_SHM_EMUL      0x00020000

#define S390_PCIPT_ADAPTER 2



#define S390_PCI_HOST_BRIDGE(obj) \

hw/s390x/s390-pci-inst.c

+9 −9
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int list_pci(ClpReqRspListPci *rrb, uint8_t *cc) 
    stl_p(&rrb->response.fmt, 0);

    stq_p(&rrb->response.reserved1, 0);

    stq_p(&rrb->response.reserved2, 0);

    stl_p(&rrb->response.mdd, FH_VIRT);

    stl_p(&rrb->response.mdd, FH_MASK_SHM);

    stw_p(&rrb->response.max_fn, PCI_MAX_FUNCTIONS);

    rrb->response.entry_size = sizeof(ClpFhListEntry);

    finish = 0;
@@ -212,12 +212,12 @@ int clp_service_call(S390CPU *cpu, uint8_t r2) 


        switch (reqsetpci->oc) {

        case CLP_SET_ENABLE_PCI_FN:

            pbdev->fh = pbdev->fh | FH_ENABLED;

            pbdev->fh |= FH_MASK_ENABLE;

            stl_p(&ressetpci->fh, pbdev->fh);

            stw_p(&ressetpci->hdr.rsp, CLP_RC_OK);

            break;

        case CLP_SET_DISABLE_PCI_FN:

            pbdev->fh = pbdev->fh & ~FH_ENABLED;

            pbdev->fh &= ~FH_MASK_ENABLE;

            pbdev->error_state = false;

            pbdev->lgstg_blocked = false;

            stl_p(&ressetpci->fh, pbdev->fh);
@@ -318,7 +318,7 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) 
    offset = env->regs[r2 + 1];



    pbdev = s390_pci_find_dev_by_fh(fh);

    if (!pbdev || !(pbdev->fh & FH_ENABLED)) {

    if (!pbdev || !(pbdev->fh & FH_MASK_ENABLE)) {

        DPRINTF("pcilg no pci dev\n");

        setcc(cpu, ZPCI_PCI_LS_INVAL_HANDLE);

        return 0;
@@ -435,7 +435,7 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) 
    offset = env->regs[r2 + 1];



    pbdev = s390_pci_find_dev_by_fh(fh);

    if (!pbdev || !(pbdev->fh & FH_ENABLED)) {

    if (!pbdev || !(pbdev->fh & FH_MASK_ENABLE)) {

        DPRINTF("pcistg no pci dev\n");

        setcc(cpu, ZPCI_PCI_LS_INVAL_HANDLE);

        return 0;
@@ -526,7 +526,7 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) 
    end = start + env->regs[r2 + 1];



    pbdev = s390_pci_find_dev_by_fh(fh);

    if (!pbdev || !(pbdev->fh & FH_ENABLED)) {

    if (!pbdev || !(pbdev->fh & FH_MASK_ENABLE)) {

        DPRINTF("rpcit no pci dev\n");

        setcc(cpu, ZPCI_PCI_LS_INVAL_HANDLE);

        goto out;
@@ -590,7 +590,7 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr, 
    }



    pbdev = s390_pci_find_dev_by_fh(fh);

    if (!pbdev || !(pbdev->fh & FH_ENABLED)) {

    if (!pbdev || !(pbdev->fh & FH_MASK_ENABLE)) {

        DPRINTF("pcistb no pci dev fh 0x%x\n", fh);

        setcc(cpu, ZPCI_PCI_LS_INVAL_HANDLE);

        return 0;
@@ -743,7 +743,7 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar) 
    }



    pbdev = s390_pci_find_dev_by_fh(fh);

    if (!pbdev || !(pbdev->fh & FH_ENABLED)) {

    if (!pbdev || !(pbdev->fh & FH_MASK_ENABLE)) {

        DPRINTF("mpcifc no pci dev fh 0x%x\n", fh);

        setcc(cpu, ZPCI_PCI_LS_INVAL_HANDLE);

        return 0;
@@ -873,7 +873,7 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar) 
           ((uint32_t)pbdev->sum << 7) | pbdev->routes.adapter.summary_offset;

    stl_p(&fib.data, data);



    if (pbdev->fh & FH_ENABLED) {

    if (pbdev->fh & FH_MASK_ENABLE) {

        fib.fc |= 0x80;

    }