From patchwork Thu Jun 4 19:40:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 480854 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6E2691400B7 for ; Fri, 5 Jun 2015 05:40:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752433AbbFDTkb (ORCPT ); Thu, 4 Jun 2015 15:40:31 -0400 Received: from utopia.booyaka.com ([74.50.51.50]:42766 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752074AbbFDTkb (ORCPT ); Thu, 4 Jun 2015 15:40:31 -0400 Received: (qmail 6808 invoked by uid 1019); 4 Jun 2015 19:40:30 -0000 Date: Thu, 4 Jun 2015 19:40:30 +0000 (UTC) From: Paul Walmsley To: linux-tegra@vger.kernel.org cc: treding@nvidia.com, pwalmsley@nvidia.com, davidu@nvidia.com Subject: [PATCH] memory: tegra: mc: add the Tegra210-specific client ID bitmask Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org The MC subsystem in Tegra210 uses a longer bitmask for the MC_ERR_STATUS.CLIENT bitfield. Define that in the SoC-specific data for Tegra210 so the MC code can use it. Note that this patch does not apply to mainline in its current form. This patch is against linux-next 20150602, plus the "memory: tegra: mc: add support for a variable-size client ID bitfield" patch that I just sent to the linux-tegra mailing lists, plus Thierry's Tegra210 MC patches. Thierry's patches can currently be found in commit c8bb81c3b132c9b3c1859cde3d7005ad8ab13862 ("CHROMIUM: memory: tegra: Add Tegra210 support") of the chromeos-3.18 branch of https://chromium.googlesource.com/chromiumos/third_party/kernel (but which is undoubtedly headed upstream). This patch is based on work by David Ung . Signed-off-by: Paul Walmsley Cc: Paul Walmsley Cc: Thierry Reding Cc: David Ung --- Have done a quick build test on this internally, but not much else. I expect Thierry to add this to his T210 MC set before posting it for upstream consumption. drivers/memory/tegra/tegra210.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/memory/tegra/tegra210.c b/drivers/memory/tegra/tegra210.c index 5561a338d36b..40f5bffa1f8b 100644 --- a/drivers/memory/tegra/tegra210.c +++ b/drivers/memory/tegra/tegra210.c @@ -1087,5 +1087,6 @@ const struct tegra_mc_soc tegra210_mc_soc = { .num_clients = ARRAY_SIZE(tegra210_mc_clients), .num_address_bits = 34, .atom_size = 64, + .client_id_mask = T210_MC_ERR_STATUS_CLIENT_MASK, .smmu = &tegra210_smmu_soc, };