| Message ID | 20160601154610.22899-1-john@metanate.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Joerg, Am Mittwoch, 1. Juni 2016, 16:46:10 schrieb John Keeping: > rk_iommu_command() takes a struct rk_iommu and iterates over the slave > MMUs, so this is doubly wrong in that we're passing in the wrong pointer > and talking to MMUs that we shouldn't be. > > Fixes: cd6438c5f844 ("iommu/rockchip: Reconstruct to support multi slaves") > Cc: stable@vger.kernel.org > Signed-off-by: John Keeping <john@metanate.com> > Tested-by: Heiko Stuebner <heiko@sntech.de> > Reviewed-by: Heiko Stuebner <heiko@sntech.de> this definitly looks like material for 4.7-rc fixes to me. Could you take a look and maybe include it? Thanks Heiko > --- > The original was sent just before the merge window [0]. The only > changes are to the commit message: > > * add Cc: stable > * add Heiko's {Tested,Reviewed}-by > > [0] http://article.gmane.org/gmane.linux.kernel.iommu/13556 > > drivers/iommu/rockchip-iommu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c > index c7d6156ff536..25b4627cb57f 100644 > --- a/drivers/iommu/rockchip-iommu.c > +++ b/drivers/iommu/rockchip-iommu.c > @@ -815,7 +815,7 @@ static int rk_iommu_attach_device(struct iommu_domain > *domain, dte_addr = virt_to_phys(rk_domain->dt); > for (i = 0; i < iommu->num_mmu; i++) { > rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, dte_addr); > - rk_iommu_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE); > + rk_iommu_base_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE); > rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, RK_MMU_IRQ_MASK); > }
On Wed, Jun 08, 2016 at 05:32:10PM +0200, Heiko Stübner wrote: > this definitly looks like material for 4.7-rc fixes to me. Could you take a look > and maybe include it? Applied to my fixes branch, thanks.
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index c7d6156ff536..25b4627cb57f 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -815,7 +815,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, dte_addr = virt_to_phys(rk_domain->dt); for (i = 0; i < iommu->num_mmu; i++) { rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, dte_addr); - rk_iommu_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE); + rk_iommu_base_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE); rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, RK_MMU_IRQ_MASK); }
rk_iommu_command() takes a struct rk_iommu and iterates over the slave MMUs, so this is doubly wrong in that we're passing in the wrong pointer and talking to MMUs that we shouldn't be. Fixes: cd6438c5f844 ("iommu/rockchip: Reconstruct to support multi slaves") Cc: stable@vger.kernel.org Signed-off-by: John Keeping <john@metanate.com> Tested-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Heiko Stuebner <heiko@sntech.de> --- The original was sent just before the merge window [0]. The only changes are to the commit message: * add Cc: stable * add Heiko's {Tested,Reviewed}-by [0] http://article.gmane.org/gmane.linux.kernel.iommu/13556 drivers/iommu/rockchip-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)