From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E976BC433E1 for ; Wed, 15 Jul 2020 21:06:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB1B520657 for ; Wed, 15 Jul 2020 21:06:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="a4D47Njb"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LWNEV195" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB1B520657 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=e3NwRfjj5KyRocp8dVaTAxngLg6s15uirDED3HvaAJI=; b=a4D47NjbVnJaHS5dbg0BcwXie r0/a8/XdfffLezp7Xnq3clTVspqMKw6dafbma5NYDASc48YBOLAEWzrr2SA16fEaKIxcn7XIj2WpC XSb5XkWJxhA8LYdWBBs3Ii+ImptWYFosA6vUeXM6j8UfRWHZi1ys4rM99q52jjQFAzG7QKl9Ucvj0 gFINnqdI1YQV0ziUPnE6rms3u1GaYq5KAtx18edAo0VWg5Flzi0tLU8lKKZrIbpVk30u9+S3K9qYQ q2kty0P9buxdKlmPVM8IGUfaPr63qy6liqX9K0usaI+XKLiZIdJm4HVts7znA49LLrjs805z3ddUt anWPcu4IQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvoac-00040M-5j; Wed, 15 Jul 2020 21:05:18 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvoaY-0003zG-LD; Wed, 15 Jul 2020 21:05:15 +0000 Received: by mail-wr1-x444.google.com with SMTP id z13so4375261wrw.5; Wed, 15 Jul 2020 14:05:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=pMuDrbc0LtOTxt86qt0VfuSZy3PKDlBe9oPpUULHnpQ=; b=LWNEV195GUHtZQQKtrKgYeYw564ys5wqPuzKby6I+EG2vKRI64TxxMI0m6hUiCxPQB mQIFx1x72NUgFFT5VNMUf4aEO6BU7UpLk8mO8/RThHUeIloAPOY8DoKeEYpE4e99ggn9 /Ada4uJ6xsISkD+ZGasdyCHRTD6aKwbrCC9oNopCdrHMwZLd7hNaHMbgeZYJAgFf/bgq jlkD9/RKP1RkLSFK9NEJxFy1s4d8n+fmrn393DosB3MoexbZttOqRcZVvOgUauBXdWDB lp8ZmOXU27x4lvy6FsvFyuAlYOq9e83KLHViurD7r8dxd/2FnROG3HzYREUX6FA9aamV 5XaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=pMuDrbc0LtOTxt86qt0VfuSZy3PKDlBe9oPpUULHnpQ=; b=gh2H5jSZGP6OtKhrTnFB4iL3Z1GkEvavLQO4TjUmLlcF7KDMIvnfsI+qzKc3GHm2fw vCOb9DDdMdJBNCJqYCviHU4wASh+GBo6FaWPkHsxRe5iPQpCv6pKnsNxIT6h0eDG4slL gmo4Qp7VE8ethwmiyR/3yx57IZNKbCmaGU8bsBwvqDC2BsyekXZxjnS6yA/kWUpJAgfV QSeBG4PhHCgOl2B+l7RLTTFEbZc3bQ7l9pbq/x58ZV5uyuplzg373L8HOAQYR2DK7VaJ F6aAHdWIk+uuN4qOxKL/xjWsW76fQ0JmhUfsIKNDPYuSE54p4m7ZNJS1Xnfcoz/xb9g3 Cd6g== X-Gm-Message-State: AOAM533AfkX6JcQZasmknwve/zbUM6r1rFlXNIAXwLBjHqMfk5U9MTYG B23ZvHjy9LTi6OcNDUO51NA= X-Google-Smtp-Source: ABdhPJyMkIbuf0cWEq7Qews8ZNKgYCbSzRPQ6rJMKaHtnSYodbLUH8RRzfvvdkzlbxuBV2cr+ofKfQ== X-Received: by 2002:a5d:458a:: with SMTP id p10mr1424074wrq.184.1594847111602; Wed, 15 Jul 2020 14:05:11 -0700 (PDT) Received: from ziggy.stardust ([213.195.120.199]) by smtp.gmail.com with ESMTPSA id y77sm5515281wmd.36.2020.07.15.14.05.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Jul 2020 14:05:10 -0700 (PDT) Subject: Re: [PATCH 4/4] iommu/mediatek: check 4GB mode by reading infracfg To: Miles Chen , Joerg Roedel , Rob Herring References: <20200702093721.6063-1-miles.chen@mediatek.com> <20200702093721.6063-4-miles.chen@mediatek.com> From: Matthias Brugger Message-ID: <84333997-735c-4a91-6d47-1dcb5c4a6078@gmail.com> Date: Wed, 15 Jul 2020 23:05:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200702093721.6063-4-miles.chen@mediatek.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200715_170514_754941_0A96CD23 X-CRM114-Status: GOOD ( 26.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, wsd_upstream@mediatek.com, David Hildenbrand , linux-kernel@vger.kernel.org, Mike Rapoport , Chao Hao , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Yong Wu , Yingjoe Chen , Christoph Hellwig , linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 02/07/2020 11:37, Miles Chen wrote: > In previous disscusion [1] and [2], we found that it is risky to > use max_pfn or totalram_pages to tell if 4GB mode is enabled. > > Check 4GB mode by reading infracfg register, remove the usage > of the unexported symbol max_pfn. > > [1] https://lkml.org/lkml/2020/6/3/733 > [2] https://lkml.org/lkml/2020/6/4/136 > > Cc: Mike Rapoport > Cc: David Hildenbrand > Cc: Yong Wu > Cc: Yingjoe Chen > Cc: Christoph Hellwig > Signed-off-by: Miles Chen > --- > drivers/iommu/mtk_iommu.c | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 2be96f1cdbd2..09be57bd8d74 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -3,7 +3,6 @@ > * Copyright (c) 2015-2016 MediaTek Inc. > * Author: Yong Wu > */ > -#include > #include > #include > #include > @@ -15,11 +14,13 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > #include > +#include > #include > #include > #include > @@ -91,6 +92,9 @@ > #define F_MMU_INT_ID_LARB_ID(a) (((a) >> 7) & 0x7) > #define F_MMU_INT_ID_PORT_ID(a) (((a) >> 2) & 0x1f) > > +#define REG_INFRA_MISC 0xf00 > +#define F_DDR_4GB_SUPPORT_EN BIT(13) > + As this is used for infracfg, I think it would be good to add it to include/linux/soc/mediatek/infracfg.h and include that file here. > #define MTK_PROTECT_PA_ALIGN 128 > > /* > @@ -599,8 +603,10 @@ static int mtk_iommu_probe(struct platform_device *pdev) > struct resource *res; > resource_size_t ioaddr; > struct component_match *match = NULL; > + struct regmap *infracfg_regmap; Maybe call it just infracfg. > void *protect; > int i, larb_nr, ret; > + u32 val; > > data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > if (!data) > @@ -614,10 +620,18 @@ static int mtk_iommu_probe(struct platform_device *pdev) > return -ENOMEM; > data->protect_base = ALIGN(virt_to_phys(protect), MTK_PROTECT_PA_ALIGN); > > - /* Whether the current dram is over 4GB */ > - data->enable_4GB = !!(max_pfn > (BIT_ULL(32) >> PAGE_SHIFT)); > - if (!data->plat_data->has_4gb_mode) > + if (data->plat_data->has_4gb_mode) { > + infracfg_regmap = syscon_regmap_lookup_by_phandle(dev->of_node, > + "mediatek,infracfg"); > + if (IS_ERR(infracfg_regmap)) > + return PTR_ERR(infracfg_regmap); Do we need to error out, or could we be conservative and set endable_4GB = false? > + ret = regmap_read(infracfg_regmap, REG_INFRA_MISC, &val); > + if (ret) > + return ret; > + data->enable_4GB = !!(val & F_DDR_4GB_SUPPORT_EN); > + } else { > data->enable_4GB = false; Move that before the if() and update enable_4GB only in case of has_4gb_mode. > + } > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > data->base = devm_ioremap_resource(dev, res); > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel