From patchwork Tue Jul 25 21:44:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 108716 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp92455obm; Tue, 25 Jul 2017 14:46:15 -0700 (PDT) X-Received: by 10.84.128.46 with SMTP id 43mr23463624pla.113.1501019145186; Tue, 25 Jul 2017 14:45:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501019145; cv=none; d=google.com; s=arc-20160816; b=h2tvH7qtkICXDFuoW19Jsq/SBcwkyv1GEwgxA+g5xRtwN0m6qQi35kXlbqBdZdC6vG BBbgrv1CBguIg1SVCMLVzMwXur0V2jvJSj1cX/QX6TpMLAXatiLjnuStpjxKt4oC6rgE dkuTI8zuRz2K3sNAJ6pBgyvtRrZjBwyb/lqyqp5S5gHlduJ0dv6ud3AFkBB9zIOXE1Go RKZD9z8NO6P4n5bCFxNf+div1t8V/QhKgEAKSel+sdT2GPub6QDMtz4MG7DW7Q0RDqWg STD7x/neaYkHCkh7idjzn7d4su5rWmNwS6m5gYzu5OUu0UkYtLkltvNv2/KPZN45nV7o 35KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=1KzvnSGPYvbqL2EEh/Uc/rZaxNxoRokk/OdZxBkHQss=; b=KIWrKQsvNbzfTbFrNuY24jRvPEqH/XUYXOc81xI453GPfobNqANTIW+Na+iZE6XGzK SCrWCKUikQgmVDDUw/1veGPGr9ed9xvZ+WtP+w9nK2KEfLrJuGeBxoQYrcPAvt2eKsed FVw4RnX0ufsbTfRQdcOPd/PlJvvbteQS65a0EabCcWHV+zQ0h5oMuZCiCJ1rYS9mxHqh rxB4PVUrB0Xnpz9x2GLRUBnGcTLoezed1zmgO6+VIsiZmP+71FlL1IvXZaAPK8yJr04c a53NEUdPLM8VAN3eZVEZCBSMAzNloNoBt4RtVshJ7chJTc+yiU+E8m6aKSLxACUAdR6T 9L7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z12si3603619pgo.33.2017.07.25.14.45.42; Tue, 25 Jul 2017 14:45:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751821AbdGYVpj (ORCPT + 26 others); Tue, 25 Jul 2017 17:45:39 -0400 Received: from mail-yw0-f193.google.com ([209.85.161.193]:36189 "EHLO mail-yw0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501AbdGYVoi (ORCPT ); Tue, 25 Jul 2017 17:44:38 -0400 Received: by mail-yw0-f193.google.com with SMTP id i6so4374551ywb.3; Tue, 25 Jul 2017 14:44:38 -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:in-reply-to :references; bh=1KzvnSGPYvbqL2EEh/Uc/rZaxNxoRokk/OdZxBkHQss=; b=tgXBn+Rlwqfn/JqL2+OQBMZBcueriYrvVcJGMp4DKWQ0euQyPwIWqaNUKSoEwIqWxh ufrTyetZSyouQ5I4BR1U2ZsweGyJPV1PLOEVwdoPULbBB326opGNZtMcfzfn1uoTI3kR biFd87tuCnfT7ln9NKaMMl1ernlJf0b8yu7tkqvEZrFRuAyKvgS94Jcq8j/ka9UIaD7+ 7DIPKOUDHCaFRxi23HTe7BpO62m7wdnwZTu4xoASSxH8n5khQcHLYmTeJWfxTrZoxDIz cAROSvVEv1YeOtF94GdoNnzrk9apMS/OhIrukSG6B8M9gAdgM0g1w5kAN4i6zCGD0OGG rrAw== X-Gm-Message-State: AIVw113oaj76QxHcOZTjuZiwW3s/jDq/v8QoW7DyUFrAJ+32YdMwtrD2 eYXQIfRvmpJHWSQ2LEY= X-Received: by 10.129.79.210 with SMTP id d201mr17023736ywb.467.1501019077677; Tue, 25 Jul 2017 14:44:37 -0700 (PDT) Received: from localhost.localdomain (24-223-123-72.static.usa-companies.net. [24.223.123.72]) by smtp.googlemail.com with ESMTPSA id 204sm2386383ywx.35.2017.07.25.14.44.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 14:44:37 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, Frank Rowand , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH 2/4] powerpc: pseries: remove dlpar_attach_node dependency on full path Date: Tue, 25 Jul 2017 16:44:25 -0500 Message-Id: <20170725214427.25768-3-robh@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170725214427.25768-1-robh@kernel.org> References: <20170725214427.25768-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation to stop storing the full node path in full_name, remove the dependency on full_name from dlpar_attach_node(). Callers of dlpar_attach_node() already have the parent device_node, so just pass the parent node into dlpar_attach_node instead of the path. This avoids doing a lookup of the parent node by the path. Signed-off-by: Rob Herring Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/platforms/pseries/dlpar.c | 6 ++---- arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- arch/powerpc/platforms/pseries/mobility.c | 2 +- arch/powerpc/platforms/pseries/pseries.h | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) -- 2.11.0 diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index 80b84c9c8509..783f36364690 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c @@ -254,13 +254,11 @@ struct device_node *dlpar_configure_connector(__be32 drc_index, return first_dn; } -int dlpar_attach_node(struct device_node *dn) +int dlpar_attach_node(struct device_node *dn, struct device_node *parent) { int rc; - dn->parent = pseries_of_derive_parent(dn->full_name); - if (IS_ERR(dn->parent)) - return PTR_ERR(dn->parent); + dn->parent = parent; rc = of_attach_node(dn); if (rc) { diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index 0a93093fbcef..b357f1ae0b0a 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -463,7 +463,7 @@ static ssize_t dlpar_cpu_add(u32 drc_index) return -EINVAL; } - rc = dlpar_attach_node(dn); + rc = dlpar_attach_node(dn, parent); if (rc) { saved_rc = rc; pr_warn("Failed to attach node %s, rc: %d, drc index: %x\n", diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c index 2da4851eff99..210ce632d63e 100644 --- a/arch/powerpc/platforms/pseries/mobility.c +++ b/arch/powerpc/platforms/pseries/mobility.c @@ -229,7 +229,7 @@ static int add_dt_node(__be32 parent_phandle, __be32 drc_index) if (!dn) return -ENOENT; - rc = dlpar_attach_node(dn); + rc = dlpar_attach_node(dn, parent_dn); if (rc) dlpar_free_cc_nodes(dn); diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index 1361a9db534b..4470a3194311 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h @@ -46,7 +46,7 @@ extern void dlpar_free_cc_nodes(struct device_node *); extern void dlpar_free_cc_property(struct property *); extern struct device_node *dlpar_configure_connector(__be32, struct device_node *); -extern int dlpar_attach_node(struct device_node *); +extern int dlpar_attach_node(struct device_node *, struct device_node *); extern int dlpar_detach_node(struct device_node *); extern int dlpar_acquire_drc(u32 drc_index); extern int dlpar_release_drc(u32 drc_index);