From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755358AbbI2F2O (ORCPT ); Tue, 29 Sep 2015 01:28:14 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:34225 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751369AbbI2F2H (ORCPT ); Tue, 29 Sep 2015 01:28:07 -0400 From: Tomasz Figa To: iommu@lists.linux-foundation.org Cc: Vince Hsu , Tomasz Figa , Joerg Roedel , Hiroshi Doyu , Stephen Warren , Thierry Reding , Alexandre Courbot , Russell King , Paul Walmsley , Mikko Perttunen , Tomeu Vizoso , Will Deacon , Alex Williamson , Arnd Bergmann , Antonios Motakis , Nicolas Iooss , Olav Haugan , linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [RFC PATCH 2/3] memory: tegra: add TLB cache line size Date: Tue, 29 Sep 2015 14:25:25 +0900 Message-Id: <1443504379-31841-3-git-send-email-tfiga@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1443504379-31841-1-git-send-email-tfiga@chromium.org> References: <1443504379-31841-1-git-send-email-tfiga@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vince Hsu This patch adds SMMU line size to Tegra SoC data struct to enable SMMU driver to use this knowledge in code added by further patch. Also add the missing TLB line number for Tegra124. Signed-off-by: Vince Hsu [tfiga@chromium.org: Rebased, revised commit message.] Signed-off-by: Tomasz Figa --- drivers/memory/tegra/tegra114.c | 1 + drivers/memory/tegra/tegra124.c | 3 +++ drivers/memory/tegra/tegra210.c | 1 + drivers/memory/tegra/tegra30.c | 1 + include/soc/tegra/mc.h | 1 + 5 files changed, 7 insertions(+) diff --git a/drivers/memory/tegra/tegra114.c b/drivers/memory/tegra/tegra114.c index ba8fff3..173d2dd 100644 --- a/drivers/memory/tegra/tegra114.c +++ b/drivers/memory/tegra/tegra114.c @@ -920,6 +920,7 @@ static const struct tegra_smmu_soc tegra114_smmu_soc = { .supports_round_robin_arbitration = false, .supports_request_limit = false, .num_tlb_lines = 32, + .tlb_line_size = 16, .num_asids = 4, }; diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c index 21e7255..ff12487 100644 --- a/drivers/memory/tegra/tegra124.c +++ b/drivers/memory/tegra/tegra124.c @@ -1007,6 +1007,8 @@ static const struct tegra_smmu_soc tegra124_smmu_soc = { .num_swgroups = ARRAY_SIZE(tegra124_swgroups), .supports_round_robin_arbitration = true, .supports_request_limit = true, + .num_tlb_lines = 32, + .tlb_line_size = 32, .num_asids = 128, }; @@ -1031,6 +1033,7 @@ static const struct tegra_smmu_soc tegra132_smmu_soc = { .supports_round_robin_arbitration = true, .supports_request_limit = true, .num_tlb_lines = 32, + .tlb_line_size = 32, .num_asids = 128, }; diff --git a/drivers/memory/tegra/tegra210.c b/drivers/memory/tegra/tegra210.c index 5e144ab..bf6a9c1 100644 --- a/drivers/memory/tegra/tegra210.c +++ b/drivers/memory/tegra/tegra210.c @@ -1067,6 +1067,7 @@ static const struct tegra_smmu_soc tegra210_smmu_soc = { .supports_round_robin_arbitration = true, .supports_request_limit = true, .num_tlb_lines = 32, + .tlb_line_size = 32, .num_asids = 128, }; diff --git a/drivers/memory/tegra/tegra30.c b/drivers/memory/tegra/tegra30.c index b447378..08951db 100644 --- a/drivers/memory/tegra/tegra30.c +++ b/drivers/memory/tegra/tegra30.c @@ -942,6 +942,7 @@ static const struct tegra_smmu_soc tegra30_smmu_soc = { .supports_round_robin_arbitration = false, .supports_request_limit = false, .num_tlb_lines = 16, + .tlb_line_size = 16, .num_asids = 4, }; diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h index 44202ff..a6dbb35 100644 --- a/include/soc/tegra/mc.h +++ b/include/soc/tegra/mc.h @@ -62,6 +62,7 @@ struct tegra_smmu_soc { bool supports_request_limit; unsigned int num_tlb_lines; + unsigned int tlb_line_size; unsigned int num_asids; }; -- 2.6.0.rc2.230.g3dd15c0