提交 e141dbad 编写于 作者: Y Yi Min Zhao 提交者: Cornelia Huck

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: NYi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: NPierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: NCornelia Huck <cornelia.huck@de.ibm.com>
上级 71583888
...@@ -662,7 +662,7 @@ out: ...@@ -662,7 +662,7 @@ out:
return ret; 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->summary_ind);
release_indicator(&pbdev->routes.adapter, pbdev->indicator); release_indicator(&pbdev->routes.adapter, pbdev->indicator);
...@@ -710,7 +710,7 @@ static int reg_ioat(CPUS390XState *env, S390PCIBusDevice *pbdev, ZpciFib fib) ...@@ -710,7 +710,7 @@ static int reg_ioat(CPUS390XState *env, S390PCIBusDevice *pbdev, ZpciFib fib)
return 0; return 0;
} }
static void dereg_ioat(S390PCIBusDevice *pbdev) void pci_dereg_ioat(S390PCIBusDevice *pbdev)
{ {
s390_pci_iommu_disable(pbdev); s390_pci_iommu_disable(pbdev);
pbdev->pba = 0; pbdev->pba = 0;
...@@ -758,7 +758,7 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar) ...@@ -758,7 +758,7 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar)
} }
break; break;
case ZPCI_MOD_FC_DEREG_INT: case ZPCI_MOD_FC_DEREG_INT:
dereg_irqs(pbdev); pci_dereg_irqs(pbdev);
break; break;
case ZPCI_MOD_FC_REG_IOAT: case ZPCI_MOD_FC_REG_IOAT:
if (reg_ioat(env, pbdev, fib)) { 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) ...@@ -766,10 +766,10 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar)
} }
break; break;
case ZPCI_MOD_FC_DEREG_IOAT: case ZPCI_MOD_FC_DEREG_IOAT:
dereg_ioat(pbdev); pci_dereg_ioat(pbdev);
break; break;
case ZPCI_MOD_FC_REREG_IOAT: case ZPCI_MOD_FC_REREG_IOAT:
dereg_ioat(pbdev); pci_dereg_ioat(pbdev);
if (reg_ioat(env, pbdev, fib)) { if (reg_ioat(env, pbdev, fib)) {
cc = ZPCI_PCI_LS_ERR; cc = ZPCI_PCI_LS_ERR;
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#ifndef HW_S390_PCI_INST_H #ifndef HW_S390_PCI_INST_H
#define HW_S390_PCI_INST_H #define HW_S390_PCI_INST_H
#include "s390-pci-bus.h"
#include <sysemu/dma.h> #include <sysemu/dma.h>
/* CLP common request & response block size */ /* CLP common request & response block size */
...@@ -277,6 +278,8 @@ typedef struct ZpciFib { ...@@ -277,6 +278,8 @@ typedef struct ZpciFib {
uint32_t gd; uint32_t gd;
} QEMU_PACKED ZpciFib; } 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 clp_service_call(S390CPU *cpu, uint8_t r2);
int pcilg_service_call(S390CPU *cpu, uint8_t r1, 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); int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册