hw/arm/smmu-common: Replace smmu_iommu_mr with smmu_find_sdev
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:
parent
6c84daac58
commit
69970205ed
@ -620,20 +620,16 @@ static const PCIIOMMUOps smmu_ops = {
|
||||
.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;
|
||||
SMMUPciBus *smmu_bus;
|
||||
SMMUDevice *smmu;
|
||||
|
||||
bus_n = PCI_BUS_NUM(sid);
|
||||
smmu_bus = smmu_find_smmu_pcibus(s, bus_n);
|
||||
if (smmu_bus) {
|
||||
devfn = SMMU_PCI_DEVFN(sid);
|
||||
smmu = smmu_bus->pbdev[devfn];
|
||||
if (smmu) {
|
||||
return &smmu->iommu;
|
||||
}
|
||||
return smmu_bus->pbdev[devfn];
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
@ -1218,20 +1218,18 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)
|
||||
case SMMU_CMD_CFGI_STE:
|
||||
{
|
||||
uint32_t sid = CMD_SID(&cmd);
|
||||
IOMMUMemoryRegion *mr = smmu_iommu_mr(bs, sid);
|
||||
SMMUDevice *sdev;
|
||||
SMMUDevice *sdev = smmu_find_sdev(bs, sid);
|
||||
|
||||
if (CMD_SSEC(&cmd)) {
|
||||
cmd_error = SMMU_CERROR_ILL;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!mr) {
|
||||
if (!sdev) {
|
||||
break;
|
||||
}
|
||||
|
||||
trace_smmuv3_cmdq_cfgi_ste(sid);
|
||||
sdev = container_of(mr, SMMUDevice, iommu);
|
||||
smmuv3_flush_config(sdev);
|
||||
|
||||
break;
|
||||
@ -1260,20 +1258,18 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)
|
||||
case SMMU_CMD_CFGI_CD_ALL:
|
||||
{
|
||||
uint32_t sid = CMD_SID(&cmd);
|
||||
IOMMUMemoryRegion *mr = smmu_iommu_mr(bs, sid);
|
||||
SMMUDevice *sdev;
|
||||
SMMUDevice *sdev = smmu_find_sdev(bs, sid);
|
||||
|
||||
if (CMD_SSEC(&cmd)) {
|
||||
cmd_error = SMMU_CERROR_ILL;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!mr) {
|
||||
if (!sdev) {
|
||||
break;
|
||||
}
|
||||
|
||||
trace_smmuv3_cmdq_cfgi_cd(sid);
|
||||
sdev = container_of(mr, SMMUDevice, iommu);
|
||||
smmuv3_flush_config(sdev);
|
||||
break;
|
||||
}
|
||||
|
@ -182,8 +182,8 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,
|
||||
*/
|
||||
SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova);
|
||||
|
||||
/* Return the iommu mr associated to @sid, or NULL if none */
|
||||
IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid);
|
||||
/* Return the SMMUDevice associated to @sid, or NULL if none */
|
||||
SMMUDevice *smmu_find_sdev(SMMUState *s, uint32_t sid);
|
||||
|
||||
#define SMMU_IOTLB_MAX_SIZE 256
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user