From patchwork Tue May 8 16:55:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 910346 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Tu1LpY9W"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40gQch1L0Tz9s27 for ; Wed, 9 May 2018 02:56:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932716AbeEHQ4f (ORCPT ); Tue, 8 May 2018 12:56:35 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:41925 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932606AbeEHQ4e (ORCPT ); Tue, 8 May 2018 12:56:34 -0400 Received: by mail-pg0-f66.google.com with SMTP id m21-v6so21433473pgv.8; Tue, 08 May 2018 09:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=SZp7My34OZM9rX4SuNDmQLm6ykpD2xgBZylRzveQqi4=; b=Tu1LpY9W0B2oBQInwySf6HhtfBokznoqH0YxA3FwANBIjyb5U2/vzbD3mvMBo9pv3L JJ5XZVqW5Zo5DOuZ9C8zSkG1uXIlkklkWUrcyjF7YcmuSpiqxBzx1T8SMpRgs6xkoCve Rd/Cw0msvRlHcUbzm1HBQpk66t387Y+HRpKE/MhzPKbcPPoGA1yxerrHGIO6TF2+YUMb qbZSnxs4zjPQ6HFYHTWMww0BpQmdkJXatgNzmS6axp4G1X/RROnf5YltP8XLJrRDYVBO Uq5kyRgGN93nNqcKQF0Etp29Mjg8Vptc2bJVCF5NBWXxfA/bYOvMLBPK2EGI/2Ck8tT3 eTBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SZp7My34OZM9rX4SuNDmQLm6ykpD2xgBZylRzveQqi4=; b=D72tAQhnWb+KDpI7qXD5xgV/hU1u7AnxgAKpGzFY276LcmP76HS4jswyXTXHvvIPPG PTC2vYE97Y3jynWybO6hQr1neeuteXvpRhxdvjNTDkr/TSWx3w7jxaMm/q1c+vVzcIAg 9QAkSFrbt+EO5purA0bYgJ58t1pWuNiudKSzBFIPCaFiSO7ImBxV02c5aNYDD28MkgPn ZN2e0h5f4tT79Giaq9ib9k7j3zkv2xDbXJsI0EqhZ9iUQ7VTn8J1x6kJq/6E2mArsqFY JfwPLTfPtLRtCQkd02MD3Kr/eAxhgKy75iTo6XJpOPnsNWmrW8UojmnsTBd+8g/GMqim hWLQ== X-Gm-Message-State: ALQs6tB5XkRClPDMReFBALB+mzYt/Ki3AIoeFbVZWpKubM5Ow/oyeOoU XM9Iqud89tawQaYjWUzPhy8= X-Google-Smtp-Source: AB8JxZoLcNb1pneSVulpgxmP8t6FPMKcOiO7cZAGP+eX/1DFcx0tBU+YAxqvprLCBKHzVuPHBLCiHw== X-Received: by 2002:a63:87c6:: with SMTP id i189-v6mr32459909pge.2.1525798593924; Tue, 08 May 2018 09:56:33 -0700 (PDT) Received: from localhost.localdomain ([109.252.91.130]) by smtp.gmail.com with ESMTPSA id v15sm31688195pfa.107.2018.05.08.09.56.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 09:56:33 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1] memory: tegra: Register SMMU after MC driver became ready Date: Tue, 8 May 2018 19:55:30 +0300 Message-Id: <20180508165530.12746-1-digetx@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Memory Controller driver invokes SMMU driver registration and MC's registers mapping is shared with SMMU. This mapping goes away if MC driver probing fails after SMMU registration. Signed-off-by: Dmitry Osipenko --- drivers/memory/tegra/mc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index 49dd7ad1459f..22ec959db7d3 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -692,15 +692,6 @@ static int tegra_mc_probe(struct platform_device *pdev) return err; } - if (IS_ENABLED(CONFIG_TEGRA_IOMMU_SMMU)) { - mc->smmu = tegra_smmu_probe(&pdev->dev, mc->soc->smmu, mc); - if (IS_ERR(mc->smmu)) { - dev_err(&pdev->dev, "failed to probe SMMU: %ld\n", - PTR_ERR(mc->smmu)); - return PTR_ERR(mc->smmu); - } - } - err = tegra_mc_reset_setup(mc); if (err < 0) { dev_err(&pdev->dev, "failed to register reset controller: %d\n", @@ -726,6 +717,15 @@ static int tegra_mc_probe(struct platform_device *pdev) return err; } + if (IS_ENABLED(CONFIG_TEGRA_IOMMU_SMMU)) { + mc->smmu = tegra_smmu_probe(&pdev->dev, mc->soc->smmu, mc); + if (IS_ERR(mc->smmu)) { + dev_err(&pdev->dev, "failed to probe SMMU: %ld\n", + PTR_ERR(mc->smmu)); + return PTR_ERR(mc->smmu); + } + } + return 0; }