mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/smmu-common: Replace smmu_iommu_mr with smmu_find_sdev

Browse Source 
The caller of smmu_iommu_mr wants to get sdev for smmuv3_flush_config().

Do it directly instead of bridging with an iommu mr pointer.

Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
Message-id: 20240619002218.926674-1-nicolinc@nvidia.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Nicolin Chen 2024-06-18 17:22:18 -07:00 committed by Peter Maydell
parent 6c84daac58
commit 69970205ed
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/arm/smmu-common.c
View File

@ -620,20 +620,16 @@ static const PCIIOMMUOps smmu_ops = {
.get_address_space = smmu_find_add_as, .get_address_space = smmu_find_add_as,
}; };
IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid) SMMUDevice *smmu_find_sdev(SMMUState *s, uint32_t sid)
{ {
uint8_t bus_n, devfn; uint8_t bus_n, devfn;
SMMUPciBus *smmu_bus; SMMUPciBus *smmu_bus;
SMMUDevice *smmu;
bus_n = PCI_BUS_NUM(sid); bus_n = PCI_BUS_NUM(sid);
smmu_bus = smmu_find_smmu_pcibus(s, bus_n); smmu_bus = smmu_find_smmu_pcibus(s, bus_n);
if (smmu_bus) { if (smmu_bus) {
devfn = SMMU_PCI_DEVFN(sid); devfn = SMMU_PCI_DEVFN(sid);
smmu = smmu_bus->pbdev[devfn]; return smmu_bus->pbdev[devfn];
if (smmu) {
return &smmu->iommu;
}
} }
return NULL; return NULL;
} }

12
hw/arm/smmuv3.c
View File

@ -1218,20 +1218,18 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)
case SMMU_CMD_CFGI_STE: case SMMU_CMD_CFGI_STE:
{ {
uint32_t sid = CMD_SID(&cmd); uint32_t sid = CMD_SID(&cmd);
IOMMUMemoryRegion *mr = smmu_iommu_mr(bs, sid); SMMUDevice *sdev = smmu_find_sdev(bs, sid);
SMMUDevice *sdev;
if (CMD_SSEC(&cmd)) { if (CMD_SSEC(&cmd)) {
cmd_error = SMMU_CERROR_ILL; cmd_error = SMMU_CERROR_ILL;
break; break;
} }
if (!mr) { if (!sdev) {
break; break;
} }
trace_smmuv3_cmdq_cfgi_ste(sid); trace_smmuv3_cmdq_cfgi_ste(sid);
sdev = container_of(mr, SMMUDevice, iommu);
smmuv3_flush_config(sdev); smmuv3_flush_config(sdev);
break; break;
@ -1260,20 +1258,18 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)
case SMMU_CMD_CFGI_CD_ALL: case SMMU_CMD_CFGI_CD_ALL:
{ {
uint32_t sid = CMD_SID(&cmd); uint32_t sid = CMD_SID(&cmd);
IOMMUMemoryRegion *mr = smmu_iommu_mr(bs, sid); SMMUDevice *sdev = smmu_find_sdev(bs, sid);
SMMUDevice *sdev;
if (CMD_SSEC(&cmd)) { if (CMD_SSEC(&cmd)) {
cmd_error = SMMU_CERROR_ILL; cmd_error = SMMU_CERROR_ILL;
break; break;
} }
if (!mr) { if (!sdev) {
break; break;
} }
trace_smmuv3_cmdq_cfgi_cd(sid); trace_smmuv3_cmdq_cfgi_cd(sid);
sdev = container_of(mr, SMMUDevice, iommu);
smmuv3_flush_config(sdev); smmuv3_flush_config(sdev);
break; break;
} }

4
include/hw/arm/smmu-common.h
View File

@ -182,8 +182,8 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,
*/ */
SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova); SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova);
/* Return the iommu mr associated to @sid, or NULL if none */ /* Return the SMMUDevice associated to @sid, or NULL if none */
IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid); SMMUDevice *smmu_find_sdev(SMMUState *s, uint32_t sid);
#define SMMU_IOTLB_MAX_SIZE 256 #define SMMU_IOTLB_MAX_SIZE 256