From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932603AbcFHPc2 (ORCPT ); Wed, 8 Jun 2016 11:32:28 -0400 Received: from gloria.sntech.de ([95.129.55.99]:57233 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932204AbcFHPc0 (ORCPT ); Wed, 8 Jun 2016 11:32:26 -0400 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: Joerg Roedel Cc: John Keeping , iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [RESEND PATCH] iommu/rockchip: fix zap cache during device attach Date: Wed, 08 Jun 2016 17:32:10 +0200 Message-ID: <7766050.fLosifENnk@diego> User-Agent: KMail/4.14.10 (Linux/4.4.0-1-amd64; KDE/4.14.14; x86_64; ; ) In-Reply-To: <20160601154610.22899-1-john@metanate.com> References: <20160601154610.22899-1-john@metanate.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Tested-by: Heiko Stuebner > Reviewed-by: Heiko Stuebner 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); > }