From patchwork Thu May 27 22:32:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 448877 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp922866jac; Thu, 27 May 2021 15:32:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaRs1FjDaN7OoWb3yBNfMHOfQncoWJRbMt1LKRtvAEj4Ufs+hc/b/xTBLratGcRZ8CJPTc X-Received: by 2002:a5e:8519:: with SMTP id i25mr4638296ioj.199.1622154747083; Thu, 27 May 2021 15:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622154747; cv=none; d=google.com; s=arc-20160816; b=EiyABAStvnRRBqO0zGiV2JCtFgDd1zIU/7sd2eH3+RDKFjRM6jP9IGL9CWG27Q4LFA OU/DCTUg7m5B6klwqWCaben0/UuKKRjvfWIdXCWpjUNquWvSwPrNPw3ZqvMYq1WycZkO G7VeMslE/2fnGBtRt8IpSstgyNEmSt/+J0SVKms3s8uwJwVWouovIdm00lOqaIofmcQk sw1a5xlCZyUYvtv6ZPm16KZ9uCOB+15UTgp/nvkGmhS+d9qc8Bgxdip1K30QG7LhPhIX N9EyxvPP6ZGKAciBvMnXmxIY9MXlsJDQkxSkiH8ybfIoDazlz3SvQXdsegwkscBOJPDl ovMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Sza0E/+uMB5EM/AhsG1a1nI/szLc6wK8lbW1ACNSEJo=; b=ma2hOTvrmqgkWj4E0oOa3DmqkqF9B/WyA87JAIyZCBHcSX6F6PkF0eOWTZ4nM9mBTt ysyKX/eu1suPc7HmL+BMiPSyyLY5mhCxYTgkivsh8aPTjRhcjspNiYaNMD7h/1ssqALT XK/omSLc6vXvMWqzzj5ttZBgrqNXfePaosc7JC+3z8JfZrRBpOulcguE7/FIo/Lm5dt5 tk2WlLOIm34dDqnn66sqBnR8DHWCEA/8JU0gaVv8/BvU6i+DtTBCcUEgK/zSxBGK3mKG si/9j2W2NI1W6q3IyV4rlfjwtMqusF19nILDd1/gKjWxRbBobFKSKXtcwC8p4aiwMZAi vK0w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j18si3885284jaq.76.2021.05.27.15.32.26; Thu, 27 May 2021 15:32:27 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233824AbhE0Wdz (ORCPT + 7 others); Thu, 27 May 2021 18:33:55 -0400 Received: from mail-oi1-f182.google.com ([209.85.167.182]:42896 "EHLO mail-oi1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233203AbhE0Wdy (ORCPT ); Thu, 27 May 2021 18:33:54 -0400 Received: by mail-oi1-f182.google.com with SMTP id c196so2340724oib.9; Thu, 27 May 2021 15:32:19 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=Sza0E/+uMB5EM/AhsG1a1nI/szLc6wK8lbW1ACNSEJo=; b=Sl7Br8nWqTrjpGclCN59/AsXepyfGH3jgGf1wp5HH81hcOrIZJmEwp+ghy818cQ0YA KlKj4mhpdCvkQwWFPWP4qTvI7uWnsw4U0zWX8P7uA+Lv4PyuJ9hcFdKBCcPJjKG2ToGI QrNKZ9gdUohDoO4iL4pd4JBPc8GBczhIeMCir+zSIMAWOlBmRwo3bklXxKAl7yekfkrP NsQUz4sdoMdztydCGj0bIyB9r7oQ/UxvIcy0FSKNhlujgNrf7i/Y1+oRBh53zgymVVFX LYBgubXIG0RyX9Z5/a6l02vYp5ruRCSWADdYol8H397H6BbnBgJ5982JshaJMdz6bC6/ kUjQ== X-Gm-Message-State: AOAM531T9cisJU2KFS3REUfAA2kNVjjokagvJuUs478Ywo3Cj0n72khT 53m/zlo7jZNpXlZnV04NryRFDa0aoA== X-Received: by 2002:aca:4b16:: with SMTP id y22mr3874459oia.125.1622154739243; Thu, 27 May 2021 15:32:19 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id q14sm766288ota.31.2021.05.27.15.32.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 15:32:18 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, Frank Rowand Cc: linux-kernel@vger.kernel.org, Christoph Hellwig Subject: [PATCH] of: Drop reserved mem dependency on DMA_DECLARE_COHERENT and DMA_CMA Date: Thu, 27 May 2021 17:32:17 -0500 Message-Id: <20210527223217.1572631-1-robh@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Reserved memory regions can be used for more than just DMA regions, so only enabling on DMA_DECLARE_COHERENT (via HAS_DMA) or DMA_CMA is wrong. This effectively doesn't matter except for the few cases arches select NO_DMA. At least, these users of RESERVEDMEM_OF_DECLARE depend on reserved memory support: arch/riscv/mm/init.c:RESERVEDMEM_OF_DECLARE(elfcorehdr, "linux,elfcorehdr", elfcore_hdr_setup); drivers/memory/tegra/tegra210-emc-table.c:RESERVEDMEM_OF_DECLARE(tegra210_emc_table, "nvidia,tegra210-emc-table", drivers/soc/fsl/qbman/bman_ccsr.c:RESERVEDMEM_OF_DECLARE(bman_fbpr, "fsl,bman-fbpr", bman_fbpr); drivers/soc/fsl/qbman/qman_ccsr.c:RESERVEDMEM_OF_DECLARE(qman_fqd, "fsl,qman-fqd", qman_fqd); drivers/soc/fsl/qbman/qman_ccsr.c:RESERVEDMEM_OF_DECLARE(qman_pfdr, "fsl,qman-pfdr", qman_pfdr); Let's simplify things and enable OF_RESERVED_MEM when OF_EARLY_FLATTREE is enabled. Cc: Christoph Hellwig Signed-off-by: Rob Herring --- This is needed to prevent build break on UML with this patch: https://lore.kernel.org/lkml/20210527193841.1284169-1-robh@kernel.org/ drivers/of/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.27.0 diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 18450437d5d5..3dfeae8912df 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -75,9 +75,7 @@ config OF_NET def_bool y config OF_RESERVED_MEM - bool - depends on OF_EARLY_FLATTREE - default y if DMA_DECLARE_COHERENT || DMA_CMA + def_bool OF_EARLY_FLATTREE config OF_RESOLVE bool