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

s390x/pci: export pci_dereg_ioat and pci_dereg_irqs 



dereg_irqs and dereg_ioat are needed by external functions. Let's
rename and export both of them in s390-pci-inst.h.

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 71583888

hw/s390x/s390-pci-inst.c

+5 −5
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ out: 
    return ret;

}



static int dereg_irqs(S390PCIBusDevice *pbdev)

int pci_dereg_irqs(S390PCIBusDevice *pbdev)

{

    release_indicator(&pbdev->routes.adapter, pbdev->summary_ind);

    release_indicator(&pbdev->routes.adapter, pbdev->indicator);
@@ -710,7 +710,7 @@ static int reg_ioat(CPUS390XState *env, S390PCIBusDevice *pbdev, ZpciFib fib) 
    return 0;

}



static void dereg_ioat(S390PCIBusDevice *pbdev)

void pci_dereg_ioat(S390PCIBusDevice *pbdev)

{

    s390_pci_iommu_disable(pbdev);

    pbdev->pba = 0;
@@ -758,7 +758,7 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar) 
        }

        break;

    case ZPCI_MOD_FC_DEREG_INT:

        dereg_irqs(pbdev);

        pci_dereg_irqs(pbdev);

        break;

    case ZPCI_MOD_FC_REG_IOAT:

        if (reg_ioat(env, pbdev, fib)) {
@@ -766,10 +766,10 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar) 
        }

        break;

    case ZPCI_MOD_FC_DEREG_IOAT:

        dereg_ioat(pbdev);

        pci_dereg_ioat(pbdev);

        break;

    case ZPCI_MOD_FC_REREG_IOAT:

        dereg_ioat(pbdev);

        pci_dereg_ioat(pbdev);

        if (reg_ioat(env, pbdev, fib)) {

            cc = ZPCI_PCI_LS_ERR;

        }

hw/s390x/s390-pci-inst.h

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#ifndef HW_S390_PCI_INST_H

#define HW_S390_PCI_INST_H



#include "s390-pci-bus.h"

#include <sysemu/dma.h>



/* CLP common request & response block size */
@@ -277,6 +278,8 @@ typedef struct ZpciFib { 
    uint32_t gd;

} QEMU_PACKED ZpciFib;



int pci_dereg_irqs(S390PCIBusDevice *pbdev);

void pci_dereg_ioat(S390PCIBusDevice *pbdev);

int clp_service_call(S390CPU *cpu, uint8_t r2);

int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2);

int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2);