From patchwork Wed Feb 7 01:18:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 197691 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1930247dyb; Tue, 6 Feb 2024 17:18:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmEDQa93SXbCUY7guvZCB6odq4BJhf2scH0EKX+kjlgOJgYIBIZB1nDIaIcCTdZnSL0M2A X-Received: by 2002:a05:6214:c65:b0:68c:92b4:bbf1 with SMTP id t5-20020a0562140c6500b0068c92b4bbf1mr4409994qvj.43.1707268728416; Tue, 06 Feb 2024 17:18:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707268728; cv=pass; d=google.com; s=arc-20160816; b=K5QNhmMPAFSiPBvFBZP4lhMb3LgOrr0oHDwiVqA+ituyhIrozjxJiY3z0yqF/ishdI U8ui8f5EoI7AOmJoPI3leqK1zAFoQxJINggndLqgq8PqY0CC0hQwyAYIByFGDV2KorLB YsoA7CRDhwdCeN0QKyKmQuGQsFUfC9pTlbRQou8+l45hDcGYkdeTxqjD4nW8N4VHT/tO j+740nx72slzMZgjDij6SPXwWXV4jmvlQfGSGyELd15GpsAJLKO2DV7if2/4UgOX9RBL 2jZwLVUHQb18GW/XRKDGFvHPdAL/03x79Neh8p/a1WrcmRO/wszgA+YAuk0G4UBxG/o+ 4jeQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:in-reply-to:date :dkim-signature; bh=nuaW4jYZxVUVmSijc5joqXItCJVV2wzRbkaJo6WoHUs=; fh=TqsYG8aHyBH14Zr+2L88X8pf7zmpGhBTBs1FsRoLiZo=; b=q1RPE3im30SRO/yJ5VRU2zBZO0nWUeAp8Xkj0LywxQho3sccSNeb2bT4kbVf1fNbHt ryONT3VjqD5SDnfMSKFiZrGPmJpznMyp0NTWgrj0rItgaDytlrvsPv9M1TJlrQDjmGq5 IKT7l5S8xghF+i1I7/d0eOd+ClU88cYx7zyiUq6h5JFFmg4vAEZEo8Kmnvh0BsyOdl97 yUR+hnu7r4NqAupOmDxhHMH2elkWYa5JQA/zfwxO3X5bVOZjnMsgL+5aqmd0OSQeXQRW zyw0AHjImXzGfuFabV0CtF+c6D0wNA/oVAh6taW6llz44Hsv3W1Mm+iFhs6cNLMZSlMf 4CWg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=WJK4VpMx; arc=pass (i=1 spf=pass spfdomain=flex--saravanak.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-55788-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55788-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=2; AJvYcCUHUGr7sZgyM+V0J7/rEscjipyWUDFj3I7ML15HgcfEp67/YfaUBXj+1RyF+y78CBGfXe6Y1viQh2igjinqlJF6OIT3kw== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id gs4-20020a056214226400b0068c46ab03c4si159426qvb.598.2024.02.06.17.18.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 17:18:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55788-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=WJK4VpMx; arc=pass (i=1 spf=pass spfdomain=flex--saravanak.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-55788-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55788-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2B1131C24511 for ; Wed, 7 Feb 2024 01:18:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1A743DF69; Wed, 7 Feb 2024 01:18:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WJK4VpMx" Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4545A9460 for ; Wed, 7 Feb 2024 01:18:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707268695; cv=none; b=ssuq6T5oNSDjgU9gCPqWf9Wx2oiTFC554pBnil4mMonUrJ5sSU6fW6hIxHE2DenbnPzZMyCNRatYYqVcPLocfhm9nFN89A68A592NYVp70XB4LsIjnMhC8D6qWYksj6vUz3Jjq+YVxS4cMS0sq2r5OpOQEgfyAr3QlDGfzaubyM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707268695; c=relaxed/simple; bh=/sB8l6KWYH6DGCMNn36V9/w/rBzTre/Ew1T/Fov0yTA=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=EiaWZvF+HFjUxMecxdBsnsryfZnvu98sCG5DwMF2Oh6rxA8YuDAqmf3ww1e02CdGXp9EFaLke8WaUcIlswNuk9hdThfS823c+NmCGePWIkE7JJo/ST/Pll/64b6LJ+9Cj0Wcwy3rL/oRppZxVBsRR898YQYdSe6bSi77NLdcLfo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WJK4VpMx; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--saravanak.bounces.google.com Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc6ade10cb8so313389276.0 for ; Tue, 06 Feb 2024 17:18:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707268693; x=1707873493; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nuaW4jYZxVUVmSijc5joqXItCJVV2wzRbkaJo6WoHUs=; b=WJK4VpMxU4QTcyBxl96JWvvQu4iGzy7oe9i0fqN8z80g7jni06UaAYhxEK4F/bK0Rh oUB16eYgKY+PoanKIZxEsAsi/1WErAXefawXyPBDgmy8PLiEcginrXZtCv9PaeOIrP24 fpW8MOPu1UKXXksZNPyEnNedyeroPT+iJADCnIuuEpO5ly8CngPdsGUJJcSgrhnccLrX iyOtB3LVc/LrA+UFtEpctQO++UVqRTy3SQjmDmzkBLh8ibzZ78FJMZNSYcKNsM11gL4J bgxTOZHEYE9eTtqZhORpUhxa4ByA70fySxIhQxNo5xcYJq90binsOAlGVllpyrEnjhw4 Gibg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707268693; x=1707873493; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nuaW4jYZxVUVmSijc5joqXItCJVV2wzRbkaJo6WoHUs=; b=w1PFRYINyv0AHYcJMlQOPM+wZN58HzO4Yz8SiZ5PrfKQ/aA/pE6DTVd04lSY8RFddA LiWS0wUKM4o1+dJFb5dc+uCisJP8O03Y2xnT9fdQcj5jMeG3+ohjos/ly2nYaOXkf3Pc UMthx8IWu1/Kb1JDOzwc6YIpPdiTHEouyco0f0gOX6/0fYLxFh/qum2zsX+x2SwzZin9 qVWjmFFfpZ/pzgrjALc1C8t19/k93cpYutb9E0KWjxivArttoFYAXUCOK5Kqg0/soDpA 2biCTkOn9qGvZvCSHSFaY3AkK01iWkjTlQJSxmCfydRXxk8BhXoRNUjDTymhr4IBkrbw XN3Q== X-Gm-Message-State: AOJu0YwYCiZS6s5Tbb/OX7sgR/sVWl/oD+/C8k6FjRQm7k5Kc292XsOx c21nPaXTdCkhZ0hinR1YNa1N+YnAcm56admWiHNN2v9xu50iTFG/3d7d6xGmqKqaRWnsU1Jgsa0 1bUWOMQMZOj9lxw== X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:dc84:66b8:120:935a]) (user=saravanak job=sendgmr) by 2002:a25:ce0a:0:b0:dc7:31a4:23f6 with SMTP id x10-20020a25ce0a000000b00dc731a423f6mr73359ybe.2.1707268693254; Tue, 06 Feb 2024 17:18:13 -0800 (PST) Date: Tue, 6 Feb 2024 17:18:00 -0800 In-Reply-To: <20240207011803.2637531-1-saravanak@google.com> Message-Id: <20240207011803.2637531-2-saravanak@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240207011803.2637531-1-saravanak@google.com> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog Subject: [PATCH v2 1/3] of: property: Improve finding the consumer of a remote-endpoint property From: Saravana Kannan To: Rob Herring , Frank Rowand , Greg Kroah-Hartman , Saravana Kannan Cc: Xu Yang , kernel-team@android.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790201014104978549 X-GMAIL-MSGID: 1790201014104978549 We have a more accurate function to find the right consumer of a remote-endpoint property instead of searching for a parent with compatible string property. So, use that instead. While at it, make the code to find the consumer a bit more flexible and based on the property being parsed. Fixes: f7514a663016 ("of: property: fw_devlink: Add support for remote-endpoint") Signed-off-by: Saravana Kannan --- drivers/of/property.c | 47 +++++++++---------------------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/drivers/of/property.c b/drivers/of/property.c index 641a40cf5cf3..da70aaa62ca3 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1063,36 +1063,6 @@ of_fwnode_device_get_match_data(const struct fwnode_handle *fwnode, return of_device_get_match_data(dev); } -static struct device_node *of_get_compat_node(struct device_node *np) -{ - of_node_get(np); - - while (np) { - if (!of_device_is_available(np)) { - of_node_put(np); - np = NULL; - } - - if (of_property_present(np, "compatible")) - break; - - np = of_get_next_parent(np); - } - - return np; -} - -static struct device_node *of_get_compat_node_parent(struct device_node *np) -{ - struct device_node *parent, *node; - - parent = of_get_parent(np); - node = of_get_compat_node(parent); - of_node_put(parent); - - return node; -} - static void of_link_to_phandle(struct device_node *con_np, struct device_node *sup_np) { @@ -1222,10 +1192,10 @@ static struct device_node *parse_##fname(struct device_node *np, \ * parse_prop.prop_name: Name of property holding a phandle value * parse_prop.index: For properties holding a list of phandles, this is the * index into the list + * @get_con_dev: If the consumer node containing the property is never converted + * to a struct device, implement this ops so fw_devlink can use it + * to find the true consumer. * @optional: Describes whether a supplier is mandatory or not - * @node_not_dev: The consumer node containing the property is never converted - * to a struct device. Instead, parse ancestor nodes for the - * compatible property to find a node corresponding to a device. * * Returns: * parse_prop() return values are @@ -1236,8 +1206,8 @@ static struct device_node *parse_##fname(struct device_node *np, \ struct supplier_bindings { struct device_node *(*parse_prop)(struct device_node *np, const char *prop_name, int index); + struct device_node *(*get_con_dev)(struct device_node *np); bool optional; - bool node_not_dev; }; DEFINE_SIMPLE_PROP(clocks, "clocks", "#clock-cells") @@ -1352,7 +1322,10 @@ static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_pinctrl6, }, { .parse_prop = parse_pinctrl7, }, { .parse_prop = parse_pinctrl8, }, - { .parse_prop = parse_remote_endpoint, .node_not_dev = true, }, + { + .parse_prop = parse_remote_endpoint, + .get_con_dev = of_graph_get_port_parent, + }, { .parse_prop = parse_pwms, }, { .parse_prop = parse_resets, }, { .parse_prop = parse_leds, }, @@ -1403,8 +1376,8 @@ static int of_link_property(struct device_node *con_np, const char *prop_name) while ((phandle = s->parse_prop(con_np, prop_name, i))) { struct device_node *con_dev_np; - con_dev_np = s->node_not_dev - ? of_get_compat_node_parent(con_np) + con_dev_np = s->get_con_dev + ? s->get_con_dev(con_np) : of_node_get(con_np); matched = true; i++;