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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 B1ABAC43215 for ; Wed, 20 Nov 2019 10:30:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B6782243E for ; Wed, 20 Nov 2019 10:30:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="aLedtDwB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728562AbfKTKai (ORCPT ); Wed, 20 Nov 2019 05:30:38 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:54971 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726001AbfKTKai (ORCPT ); Wed, 20 Nov 2019 05:30:38 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 47HzVK1tJ2z9sPL; Wed, 20 Nov 2019 21:30:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1574245836; bh=NoZPjg+0nioBWvif4gw1spRKoX1kFqqPPof1Rda5KVs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=aLedtDwBTRHLQE3y5ARLngDZMOd0WLJxz56poFpD5/TLbHjLLMPY+g+/dnvleNZ1A 7h8lHBaEoVK5BuzEdb8LYbVma1lry1OivSstDcZFDBbZul9eOwM0dA9N/QpRX7T/4u hOW5bb+0IdgBat24zL5Kn9QMuNuuMX3swigIWYmqNbRv/2tevyK0k6I5Il6ozSK5br 5t+ExnZxNVFvl+jeYCvtoCYOaC0AW3HZ/oetU9BtOifc7VpDEBqQVYCfQTAKcRdfFk I7281Q60xL/IDK4jdt7pZVMY3Brx0w6eqjliMF7kmPGMlcUyjtrmQWNBPfzlvPsBxE b04DPEpalr6Yw== From: Michael Ellerman To: Dan Williams , linux-nvdimm@lists.01.org Cc: Benjamin Herrenschmidt , Paul Mackerras , Oliver O'Halloran , "Aneesh Kumar K.V" , peterz@infradead.org, vishal.l.verma@intel.com, dave.hansen@linux.intel.com, hch@lst.de, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-acpi@vger.kernel.org Subject: Re: [PATCH v2 16/18] powerpc/papr_scm: Switch to numa_map_to_online_node() In-Reply-To: <157401276263.43284.12616818803654229788.stgit@dwillia2-desk3.amr.corp.intel.com> References: <157401267421.43284.2135775608523385279.stgit@dwillia2-desk3.amr.corp.intel.com> <157401276263.43284.12616818803654229788.stgit@dwillia2-desk3.amr.corp.intel.com> Date: Wed, 20 Nov 2019 21:30:31 +1100 Message-ID: <87lfsac01k.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dan Williams writes: > Now that the core exports numa_map_to_online_node() switch to that > instead of the locally coded duplicate. > > Cc: Benjamin Herrenschmidt > Cc: Paul Mackerras > Cc: Michael Ellerman Acked-by: Michael Ellerman cheers > Cc: "Oliver O'Halloran" > Reported-by: "Aneesh Kumar K.V" > Signed-off-by: Dan Williams > --- > arch/powerpc/platforms/pseries/papr_scm.c | 21 +-------------------- > 1 file changed, 1 insertion(+), 20 deletions(-) > > diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c > index 33aa59e666e5..ef81515f3b6a 100644 > --- a/arch/powerpc/platforms/pseries/papr_scm.c > +++ b/arch/powerpc/platforms/pseries/papr_scm.c > @@ -284,25 +284,6 @@ int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, > return 0; > } > > -static inline int papr_scm_node(int node) > -{ > - int min_dist = INT_MAX, dist; > - int nid, min_node; > - > - if ((node == NUMA_NO_NODE) || node_online(node)) > - return node; > - > - min_node = first_online_node; > - for_each_online_node(nid) { > - dist = node_distance(node, nid); > - if (dist < min_dist) { > - min_dist = dist; > - min_node = nid; > - } > - } > - return min_node; > -} > - > static int papr_scm_nvdimm_init(struct papr_scm_priv *p) > { > struct device *dev = &p->pdev->dev; > @@ -347,7 +328,7 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) > > memset(&ndr_desc, 0, sizeof(ndr_desc)); > target_nid = dev_to_node(&p->pdev->dev); > - online_nid = papr_scm_node(target_nid); > + online_nid = numa_map_to_online_node(target_nid); > ndr_desc.numa_node = online_nid; > ndr_desc.target_node = target_nid; > ndr_desc.res = &p->res;