Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp7128825ybp; Wed, 16 Oct 2019 04:19:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqz61TcBnap+0orVSxr3FnVFyCoHMuvGFpWgQCXQMlaRx8nTk7VVuhvwnbyQf6qGIsznFrMu X-Received: by 2002:a05:6402:3054:: with SMTP id bu20mr37013877edb.97.1571224785263; Wed, 16 Oct 2019 04:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571224785; cv=none; d=google.com; s=arc-20160816; b=zzvSsr1RgiEI8Du6OKsjihBA8RdT0Zu5IRrmO/HbmggvOJQalDhgdzOX9rY7jCySm5 vRcIyDKx07t5cHLHzWF0chStCA5FSRC6D4IZWCecjkJzOIjKSx6EjI26cdVaAm38Ynfu 7pe+NhYQo4zFVszoi2ixVcqaNAiHE/BmihvOLJvM76D2maVSm/G6uQyHDhvipgRV2S9P crCL9FLz+5EYrxdzD4b8MYhjVYOKG2BstgzcrXWUQ5DBZu8AvEyI9agOI6hewSq+Phyk siWMsb5PqiZCjQX5Z+hT220Z9ozXMyZM/u7rkpLv8crFKhcmmKlg60p1Ec0accVOHf1y LNOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=SbsWdgJCecxr3SqN5ogXhSkMBzH2cstyBXCz6iwQ+04=; b=lg3de+k9zlz2uS8R0Elbi3bOH41Oj3N7OskPka8AWOruOX91GeuETHrbvg1qnc0GjM 36famixysAQO5aKBOjgmk48pRrRe9d6TTsl7/kRLSG8q8KVtQjLZrzP99582tTFQvcuk eT4y2AfFL9hXW9RJdtYx6XakpCiZzCN8ETsSkxxMuelH+yqa772WPiTT/VmAdOiGL4eH hReCKoVVmcCr9k0ZiAJUyzJrV9Y/2y26O0nUy7EQ2VtlmcJQHlvdirJBxps8A6HvjTZp Oq4yN+Q6U0tDIkWCtzuuLCFneX7zBHm46HYgIMAic0QrhUuvemJDDt/6MkW1IgEh15u0 1VkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j46si17879044eda.9.2019.10.16.04.19.22; Wed, 16 Oct 2019 04:19:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403794AbfJPDdo (ORCPT + 99 others); Tue, 15 Oct 2019 23:33:44 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:22945 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1730211AbfJPDdo (ORCPT ); Tue, 15 Oct 2019 23:33:44 -0400 X-UUID: 9b3a021651fe4c8b987019d54e8d0414-20191016 X-UUID: 9b3a021651fe4c8b987019d54e8d0414-20191016 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 940793888; Wed, 16 Oct 2019 11:33:41 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 16 Oct 2019 11:33:37 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 16 Oct 2019 11:33:36 +0800 From: Yong Wu To: Matthias Brugger , Joerg Roedel , Will Deacon CC: Evan Green , Robin Murphy , Tomasz Figa , , , , , , , , Nicolas Boichat , , , , Subject: [PATCH v4 2/7] iommu/mediatek: Add a new tlb_lock for tlb_flush Date: Wed, 16 Oct 2019 11:33:07 +0800 Message-ID: <1571196792-12382-3-git-send-email-yong.wu@mediatek.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1571196792-12382-1-git-send-email-yong.wu@mediatek.com> References: <1571196792-12382-1-git-send-email-yong.wu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit 4d689b619445 ("iommu/io-pgtable-arm-v7s: Convert to IOMMU API TLB sync") help move the tlb_sync of unmap from v7s into the iommu framework. It helps add a new function "mtk_iommu_iotlb_sync", But it lacked the lock, then it will cause the variable "tlb_flush_active" may be changed unexpectedly, we could see this warning log randomly: mtk-iommu 10205000.iommu: Partial TLB flush timed out, falling back to full flush The HW requires tlb_flush/tlb_sync in pairs strictly, this patch adds a new tlb_lock for tlb operations to fix this issue. Fixes: 4d689b619445 ("iommu/io-pgtable-arm-v7s: Convert to IOMMU API TLB sync") Signed-off-by: Yong Wu --- drivers/iommu/mtk_iommu.c | 23 ++++++++++++++++++++++- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 76b9388..c2f6c78 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -219,22 +219,37 @@ static void mtk_iommu_tlb_sync(void *cookie) static void mtk_iommu_tlb_flush_walk(unsigned long iova, size_t size, size_t granule, void *cookie) { + struct mtk_iommu_data *data = cookie; + unsigned long flags; + + spin_lock_irqsave(&data->tlb_lock, flags); mtk_iommu_tlb_add_flush_nosync(iova, size, granule, false, cookie); mtk_iommu_tlb_sync(cookie); + spin_unlock_irqrestore(&data->tlb_lock, flags); } static void mtk_iommu_tlb_flush_leaf(unsigned long iova, size_t size, size_t granule, void *cookie) { + struct mtk_iommu_data *data = cookie; + unsigned long flags; + + spin_lock_irqsave(&data->tlb_lock, flags); mtk_iommu_tlb_add_flush_nosync(iova, size, granule, true, cookie); mtk_iommu_tlb_sync(cookie); + spin_unlock_irqrestore(&data->tlb_lock, flags); } static void mtk_iommu_tlb_flush_page_nosync(struct iommu_iotlb_gather *gather, unsigned long iova, size_t granule, void *cookie) { + struct mtk_iommu_data *data = cookie; + unsigned long flags; + + spin_lock_irqsave(&data->tlb_lock, flags); mtk_iommu_tlb_add_flush_nosync(iova, granule, granule, true, cookie); + spin_unlock_irqrestore(&data->tlb_lock, flags); } static const struct iommu_flush_ops mtk_iommu_flush_ops = { @@ -453,7 +468,12 @@ static void mtk_iommu_flush_iotlb_all(struct iommu_domain *domain) static void mtk_iommu_iotlb_sync(struct iommu_domain *domain, struct iommu_iotlb_gather *gather) { - mtk_iommu_tlb_sync(mtk_iommu_get_m4u_data()); + struct mtk_iommu_data *data = mtk_iommu_get_m4u_data(); + unsigned long flags; + + spin_lock_irqsave(&data->tlb_lock, flags); + mtk_iommu_tlb_sync(data); + spin_unlock_irqrestore(&data->tlb_lock, flags); } static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain, @@ -733,6 +753,7 @@ static int mtk_iommu_probe(struct platform_device *pdev) if (ret) return ret; + spin_lock_init(&data->tlb_lock); list_add_tail(&data->list, &m4ulist); if (!iommu_present(&platform_bus_type)) diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h index fc0f16e..8cae22d 100644 --- a/drivers/iommu/mtk_iommu.h +++ b/drivers/iommu/mtk_iommu.h @@ -58,6 +58,7 @@ struct mtk_iommu_data { struct iommu_group *m4u_group; bool enable_4GB; bool tlb_flush_active; + spinlock_t tlb_lock; /* lock for tlb range flush */ struct iommu_device iommu; const struct mtk_iommu_plat_data *plat_data; -- 1.9.1