diff options
| author | Aurora pro automerger <aurora-pro-automerger@google.com> | 2022-06-14 13:50:26 -0700 |
|---|---|---|
| committer | John Scheible <johnscheible@google.com> | 2022-06-15 19:51:41 +0000 |
| commit | 399265ce726dfc7e5b02352fbf17683a4ee15950 (patch) | |
| tree | 701de08e23d0f3104a3c216a4912140d652f05c6 /gxp-dma-iommu.c | |
| parent | b16f2fa6d4a747b68c8eab8fefb4dd94537d5426 (diff) | |
| download | gs201-399265ce726dfc7e5b02352fbf17683a4ee15950.tar.gz | |
[Copybara Auto Merge] Merge branch 'gs201-release' into 'android13-gs-pixel-5.10-tm-d1'android-13.0.0_r0.45android-13.0.0_r0.32android-13.0.0_r0.31android-gs-pantah-5.10-android13-d1
Revert "gxp: authenticate firmware after requesting it"
Bug: 235447772
gxp: Add option to disable DSP FW auth
Bug: 235135800
gxp: Fix hangs and OOB writes when auth fails
Bug: 234947988
gxp: Adjust the per-core FW size from 16MB to 1MB
Bug: 228277106
gxp: Add enable_debug_dump argument for insmod
Bug: 234529356
gxp: Dynamically allocate memory for debug dump buffer
Bug: 234529355
gxp: Trigger debug dump only when firmware is up and running
Bug: 233660431
Bug: 233607168
gxp: remove support for unsigned firmware
Bug: 220246540
gxp: authenticate firmware after requesting it
Bug: 232715929
gxp: Expose additional DVFS states in power APIs
Bug: 233929549
GitOrigin-RevId: 99f54518439e715bff19b7b45b9cafe635febb77
Change-Id: Iee1b3c93aad333db2d051017e3509279ceb35f38
Diffstat (limited to 'gxp-dma-iommu.c')
| -rw-r--r-- | gxp-dma-iommu.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/gxp-dma-iommu.c b/gxp-dma-iommu.c index 3e0fc6c..9f388c0 100644 --- a/gxp-dma-iommu.c +++ b/gxp-dma-iommu.c @@ -250,7 +250,6 @@ void gxp_dma_init_default_resources(struct gxp_dev *gxp) gxp->fwbufs[core].daddr = GXP_IOVA_FIRMWARE(core); } gxp->regs.daddr = GXP_IOVA_AURORA_TOP; - gxp->coredumpbuf.daddr = GXP_IOVA_CORE_DUMP; gxp->fwdatabuf.daddr = GXP_IOVA_FW_DATA; } @@ -309,11 +308,6 @@ int gxp_dma_map_core_resources(struct gxp_dev *gxp, IOMMU_READ | IOMMU_WRITE); if (ret) goto err; - ret = iommu_map(vd->core_domains[virt_core], gxp->coredumpbuf.daddr, - gxp->coredumpbuf.paddr, gxp->coredumpbuf.size, - IOMMU_READ | IOMMU_WRITE); - if (ret) - goto err; ret = iommu_map(vd->core_domains[virt_core], gxp->fwdatabuf.daddr, gxp->fwdatabuf.paddr, gxp->fwdatabuf.size, IOMMU_READ | IOMMU_WRITE); @@ -355,8 +349,6 @@ void gxp_dma_unmap_core_resources(struct gxp_dev *gxp, } iommu_unmap(vd->core_domains[virt_core], gxp->fwdatabuf.daddr, gxp->fwdatabuf.size); - iommu_unmap(vd->core_domains[virt_core], gxp->coredumpbuf.daddr, - gxp->coredumpbuf.size); /* * TODO(b/202213606): A core should only have access to the FW * of other cores if they're in the same VD, and have the FW |