From patchwork Fri Sep 6 04:38:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 11134489 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5FC041599 for ; Fri, 6 Sep 2019 04:38:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23BD02075C for ; Fri, 6 Sep 2019 04:38:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QIK4oEIB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726538AbfIFEiO (ORCPT ); Fri, 6 Sep 2019 00:38:14 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:34994 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725946AbfIFEiO (ORCPT ); Fri, 6 Sep 2019 00:38:14 -0400 Received: by mail-pf1-f194.google.com with SMTP id 205so3489785pfw.2; Thu, 05 Sep 2019 21:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jZKnGqLDQwKrXSOR9GNKM2tYt37NPx57FAQG+heyEM0=; b=QIK4oEIBUttNE5pHNZ5XdUzmbcZrNjYFnVgXvtKfYQTDErlRWSEcmiiNOCQGjMwSX6 3tplZJhcKxRAFfu7Vkr81c+yd9FNfyDnZorW4TRiiKLIMLQwxJVvBY3eFKXaSubIfS/G jUVez4mZIeRM7J5BMuSHAeJMoMioLWbpWG7yu8IQN3WwDLOxBXH+IPWPUazeDXqP5cOd gKSyEc6NKY9QUOAX57g80WXTe/IJfa/Dck+AoVq3yNvMezikNpDKTqrchsu10WAnKPWt ZNiZZ9xV8K+lAJj5j890RLQqKgM2BAd7npBlQieMuErqkLu53i5jgO6vp8KcHxka94BC 81Hw== 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=jZKnGqLDQwKrXSOR9GNKM2tYt37NPx57FAQG+heyEM0=; b=XcnfgTwdLRD+K+5nFMx8+AuIw5ukXdMvLot4uewiq0Uyi37uf4cqrGIf/NqACvmpzu 2RY+2w6VkvTIltLcCCH5oxC/myROiNRvOUKsj/1u12RUB9g1RFcu7tqbe2YL805IzsD4 KkYPBA1Vl+AFGryGvyv/I6ZifS93tw+QmkIBytCN4iv8VQ3ZfeVWJqdIVLDUcrRdG81s kvdhZWmuOylnsrSmB4B7PQJnenD1LNXxaI4p3sXGXdfiSl/xe6/DUf1g6xZjIXoCL4Rb JqsttZi3ZcOlvou5HOPCsqMSW6AtJeZ8FZ5nUWeqZpf2tu+fScGHviTVKEgu3rCuCp9z pbSg== X-Gm-Message-State: APjAAAW7ckqia+HO1rl96yiyB4NwK8sBkFF95XBsEAe9/rjL5HrbYTn3 wmwRjq2gWazU6q5RzPjJ1dI= X-Google-Smtp-Source: APXvYqx406FYzLzcDysuKJiyofMDC+GWUBusne67Wx8A2MTIG+2XkgTOS+lx+cJ1xGjqzeMo+sVv+g== X-Received: by 2002:a62:1ad3:: with SMTP id a202mr8176761pfa.75.1567744692878; Thu, 05 Sep 2019 21:38:12 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:202:201:3adc:b08c:7acc:b325]) by smtp.gmail.com with ESMTPSA id y15sm6085378pfp.111.2019.09.05.21.38.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2019 21:38:12 -0700 (PDT) From: Dmitry Torokhov To: "Rafael J. Wysocki" , Heikki Krogerus Cc: Andy Shevchenko , Linus Walleij , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 1/3] software node: implement reference properties Date: Thu, 5 Sep 2019 21:38:07 -0700 Message-Id: <20190906043809.18990-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org It is possible to store references to software nodes in the same fashion as other static properties, so that users do not need to define separate structures: const struct software_node gpio_bank_b_node = { .name = "B", }; const struct property_entry simone_key_enter_props[] __initconst = { PROPERTY_ENTRY_U32("linux,code", KEY_ENTER), PROPERTY_ENTRY_STRING("label", "enter"), PROPERTY_ENTRY_REF("gpios", &gpio_bank_b_node, 123, GPIO_ACTIVE_LOW), { } }; Signed-off-by: Dmitry Torokhov --- drivers/base/swnode.c | 34 +++++++++++++++++++------ include/linux/property.h | 54 +++++++++++++++++++++++++++++----------- 2 files changed, 65 insertions(+), 23 deletions(-) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index e7b3aa3bd55a..01325705b8e4 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -568,21 +568,39 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, { struct swnode *swnode = to_swnode(fwnode); const struct software_node_reference *ref; + const struct software_node_ref_args *ref_args; const struct property_entry *prop; struct fwnode_handle *refnode; int i; - if (!swnode || !swnode->node->references) + if (!swnode) return -ENOENT; - for (ref = swnode->node->references; ref->name; ref++) - if (!strcmp(ref->name, propname)) - break; + prop = property_entry_get(swnode->node->properties, propname); + if (prop) { + if (prop->type != DEV_PROP_REF) + return -EINVAL; - if (!ref->name || index > (ref->nrefs - 1)) - return -ENOENT; + if (index * sizeof(*ref_args) >= prop->length) + return -ENOENT; + + ref_args = prop->is_array ? + &prop->pointer.ref[index] : &prop->value.ref; + } else { + if (!swnode->node->references) + return -ENOENT; + + for (ref = swnode->node->references; ref->name; ref++) + if (!strcmp(ref->name, propname)) + break; + + if (!ref->name || index > (ref->nrefs - 1)) + return -ENOENT; + + ref_args = &ref->refs[index]; + } - refnode = software_node_fwnode(ref->refs[index].node); + refnode = software_node_fwnode(ref_args->node); if (!refnode) return -ENOENT; @@ -601,7 +619,7 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, args->nargs = nargs; for (i = 0; i < nargs; i++) - args->args[i] = ref->refs[index].args[i]; + args->args[i] = ref_args->args[i]; return 0; } diff --git a/include/linux/property.h b/include/linux/property.h index 5a910ad79591..b25440344743 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -22,7 +22,8 @@ enum dev_prop_type { DEV_PROP_U32, DEV_PROP_U64, DEV_PROP_STRING, - DEV_PROP_MAX, + DEV_PROP_REF, + DEV_PROP_MAX }; enum dev_dma_attr { @@ -219,6 +220,20 @@ static inline int fwnode_property_count_u64(const struct fwnode_handle *fwnode, return fwnode_property_read_u64_array(fwnode, propname, NULL, 0); } +struct software_node; + +/** + * struct software_node_ref_args - Reference property with additional arguments + * @node: Reference to a software node + * @nargs: Number of elements in @args array + * @args: Integer arguments + */ +struct software_node_ref_args { + const struct software_node *node; + unsigned int nargs; + u64 args[NR_FWNODE_REFERENCE_ARGS]; +}; + /** * struct property_entry - "Built-in" device property representation. * @name: Name of the property. @@ -240,6 +255,7 @@ struct property_entry { const u32 *u32_data; const u64 *u64_data; const char * const *str; + const struct software_node_ref_args *ref; } pointer; union { u8 u8_data; @@ -247,6 +263,7 @@ struct property_entry { u32 u32_data; u64 u64_data; const char *str; + struct software_node_ref_args ref; } value; }; }; @@ -284,6 +301,16 @@ struct property_entry { { .pointer = { .str = _val_ } }, \ } +#define PROPERTY_ENTRY_REF_ARRAY(_name_, _val_) \ +(struct property_entry) { \ + .name = _name_, \ + .length = ARRAY_SIZE(_val_) * \ + sizeof(struct software_node_ref_args), \ + .is_array = true, \ + .type = DEV_PROP_REF, \ + .pointer.ref = _val_, \ +} + #define PROPERTY_ENTRY_INTEGER(_name_, _type_, _Type_, _val_) \ (struct property_entry) { \ .name = _name_, \ @@ -314,6 +341,17 @@ struct property_entry { .name = _name_, \ } +#define PROPERTY_ENTRY_REF(_name_, _ref_, ...) \ +(struct property_entry) { \ + .name = _name_, \ + .length = sizeof(struct software_node_ref_args), \ + .type = DEV_PROP_REF, \ + .value.ref.node = _ref_, \ + .value.ref.nargs = \ + ARRAY_SIZE(((u64[]){ 0, ##__VA_ARGS__ })) - 1, \ + .value.ref.args = { __VA_ARGS__ }, \ +} + struct property_entry * property_entries_dup(const struct property_entry *properties); @@ -377,20 +415,6 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, /* -------------------------------------------------------------------------- */ /* Software fwnode support - when HW description is incomplete or missing */ -struct software_node; - -/** - * struct software_node_ref_args - Reference with additional arguments - * @node: Reference to a software node - * @nargs: Number of elements in @args array - * @args: Integer arguments - */ -struct software_node_ref_args { - const struct software_node *node; - unsigned int nargs; - u64 args[NR_FWNODE_REFERENCE_ARGS]; -}; - /** * struct software_node_reference - Named software node reference property * @name: Name of the property From patchwork Fri Sep 6 04:38:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 11134493 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 927231599 for ; Fri, 6 Sep 2019 04:38:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 603322075C for ; Fri, 6 Sep 2019 04:38:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="prCHOm9/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727971AbfIFEiO (ORCPT ); Fri, 6 Sep 2019 00:38:14 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:34994 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726007AbfIFEiO (ORCPT ); Fri, 6 Sep 2019 00:38:14 -0400 Received: by mail-pf1-f193.google.com with SMTP id 205so3489804pfw.2; Thu, 05 Sep 2019 21:38:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rocKisRtaIo/HOtqERrBvsycAn2143YAZdtTrg16FdY=; b=prCHOm9/jV5cSbG34An0s5U9aRNFRwaRW6fH3dZPvrKBKmq0ypCYCTmSbAfxs/zopY 5A8PN/994hPRLwnbVjarCVIf1QlHxlSsEquHn3uovIgs3vZhE/Utue6X/EKflGewaBNG zffhP3vXlnwGeT+ATgqI3i84NcafEVU9eedFQzVDAUQ+DMnEhn4Jj8PWGnr1TLKdDXl7 j2xiBi4TU6ehOEEHCSs/uH4HzEoQ/C+ubSouzjv5riRECDJDvCWea1Itaf1DIWJQvUWx SBxvBS7mce744XR6FptXbvVjdwnYhvJGCRk9qNCFkcevZ/VrhLTwDdOpLzH2ia3bWPlb Cmvg== 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:mime-version:content-transfer-encoding; bh=rocKisRtaIo/HOtqERrBvsycAn2143YAZdtTrg16FdY=; b=nqP6RGkOKBIgLYjpcd5v8x74cKF3cWukq4Nv3H9wk64YUQoHWzlArQxx50r980v9fE ccRqq4yrgroSH7Yrci3qGaL2jrrRipQ57g7hrpMGhkyx+Trd/XRr6p9e38/XjeTbHRNg iZgw17tlD2Z1IecBTO+kle1pch9WYqDQP5KJTz7iICgoCSQA6kVQK60Fe4EmaFAuQRhD UV8DuXYBVd8eqXqWNCNMZhz2of+HFTF3wg02LJEN45FJWVPWNclpxCiLMpmsMr5tgEEt bvLv6CG4wOc+LT4xWv2xttTVEUWN0MyVbTnmFr4K1BvA3LNzQZIAgQUysI4qR58aYmUz 4yqg== X-Gm-Message-State: APjAAAUyPJ46yp4KSj8BhJ+8vy4xGsFChjjU6vd6+tNuHk18MRYVbm8i 6qVuD4SXL+DrpvZVFetVwUQ= X-Google-Smtp-Source: APXvYqzy1JBgf6aWTKYYE51HITlrq7ScLKpndcFL+JknByCLokgHyIeWzq6oz5smpbvRaJR3TK584w== X-Received: by 2002:a17:90a:bc08:: with SMTP id w8mr5195521pjr.80.1567744693563; Thu, 05 Sep 2019 21:38:13 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:202:201:3adc:b08c:7acc:b325]) by smtp.gmail.com with ESMTPSA id y15sm6085378pfp.111.2019.09.05.21.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2019 21:38:13 -0700 (PDT) From: Dmitry Torokhov To: "Rafael J. Wysocki" , Heikki Krogerus Cc: Andy Shevchenko , Linus Walleij , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 2/3] platform/x86: intel_cht_int33fe: use inline reference properties Date: Thu, 5 Sep 2019 21:38:08 -0700 Message-Id: <20190906043809.18990-2-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190906043809.18990-1-dmitry.torokhov@gmail.com> References: <20190906043809.18990-1-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Now that static device properties allow defining reference properties together with all other types of properties, instead of managing them separately, let's adjust the driver. Signed-off-by: Dmitry Torokhov --- Heikki, I do not have this hardware, so if you could try this out it would be really great. drivers/platform/x86/intel_cht_int33fe.c | 46 ++++++++++++------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index 4fbdff48a4b5..91f3c8840fd8 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c @@ -50,28 +50,8 @@ struct cht_int33fe_data { static const struct software_node nodes[]; -static const struct software_node_ref_args pi3usb30532_ref = { - &nodes[INT33FE_NODE_PI3USB30532] -}; - -static const struct software_node_ref_args dp_ref = { - &nodes[INT33FE_NODE_DISPLAYPORT] -}; - static struct software_node_ref_args mux_ref; -static const struct software_node_reference usb_connector_refs[] = { - { "orientation-switch", 1, &pi3usb30532_ref}, - { "mode-switch", 1, &pi3usb30532_ref}, - { "displayport", 1, &dp_ref}, - { } -}; - -static const struct software_node_reference fusb302_refs[] = { - { "usb-role-switch", 1, &mux_ref}, - { } -}; - /* * Grrr I severly dislike buggy BIOS-es. At least one BIOS enumerates * the max17047 both through the INT33FE ACPI device (it is right there @@ -107,7 +87,13 @@ static const struct property_entry max17047_props[] = { { } }; -static const struct property_entry fusb302_props[] = { +/* Not const because we need to update "usb-role-switch" property. */ +static struct property_entry fusb302_props[] = { + /* + * usb-role-switch property must be first as we rely on fixed + * position to adjust it once we know the real node. + */ + PROPERTY_ENTRY_REF("usb-role-switch", NULL), PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"), { } }; @@ -131,16 +117,22 @@ static const struct property_entry usb_connector_props[] = { PROPERTY_ENTRY_U32_ARRAY("source-pdos", src_pdo), PROPERTY_ENTRY_U32_ARRAY("sink-pdos", snk_pdo), PROPERTY_ENTRY_U32("op-sink-microwatt", 2500000), + PROPERTY_ENTRY_REF("orientation-switch", + &nodes[INT33FE_NODE_PI3USB30532]), + PROPERTY_ENTRY_REF("mode-switch", + &nodes[INT33FE_NODE_PI3USB30532]), + PROPERTY_ENTRY_REF("displayport", + &nodes[INT33FE_NODE_DISPLAYPORT]), { } }; static const struct software_node nodes[] = { - { "fusb302", NULL, fusb302_props, fusb302_refs }, + { "fusb302", NULL, fusb302_props }, { "max17047", NULL, max17047_props }, { "pi3usb30532" }, { "displayport" }, { "usb-role-switch" }, - { "connector", &nodes[0], usb_connector_props, usb_connector_refs }, + { "connector", &nodes[0], usb_connector_props }, { } }; @@ -174,7 +166,13 @@ static int cht_int33fe_setup_mux(struct cht_int33fe_data *data) data->mux = fwnode_handle_get(dev->fwnode); put_device(dev); - mux_ref.node = to_software_node(data->mux); + + /* + * Update "usb-role-switch" property with real node. Note that we + * rely on software_node_register_nodes() to use the original + * instance of properties instead of copying them. + */ + fusb302_props[0].value.ref.node = to_software_node(data->mux); return 0; } From patchwork Fri Sep 6 04:38:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 11134491 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6449576 for ; Fri, 6 Sep 2019 04:38:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29E372075C for ; Fri, 6 Sep 2019 04:38:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Fyx3Ol/l" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728269AbfIFEiQ (ORCPT ); Fri, 6 Sep 2019 00:38:16 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:38295 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728133AbfIFEiP (ORCPT ); Fri, 6 Sep 2019 00:38:15 -0400 Received: by mail-pf1-f193.google.com with SMTP id h195so3486046pfe.5; Thu, 05 Sep 2019 21:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HTbki7gvp1q8jXhcyUyr4Dd730rxRGHBVjVqDJdKMPo=; b=Fyx3Ol/lhTm3U3oa6ABBfjOw1Gk4b52t9Nt57eizzIquWlZVGBY+gr0axcdof2sLTG gu7GnLyn9ls/lvwtha8/unQHv1+yC8qEVOG6FuiP2vOwWpg4lkqdefRyI+ZjN4tOKurj b54btbhW7XuuABXguA5pxs2kBKz9sqR706KfBAQ8q6F6/sWhL0777H+byMFfM0WAdF9S kjZGs00Zh+elV8UOLXUp/+F/uWIx3mzpnnX3ORM5aftAUlnWZvFRzYJ09jRcPDOsEwQt PhCQtz5HJvpgxFXysQk7tSUgFDoa+qwrqsi0EQCyfrk4+sYD+Fkud5SWlD5neZSGcSUF 7nhQ== 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:mime-version:content-transfer-encoding; bh=HTbki7gvp1q8jXhcyUyr4Dd730rxRGHBVjVqDJdKMPo=; b=fnR2enpIcLGj8lbL6TH5Evq3rvxatIA7ErMjZz8uNg0qTu7wn+NHEmzz7V+3ML40yW P8ycg1v424bfh/vuN7kPrIQXnxz4emYwcjEe30FPd1m/B/4L1VGbJDo0muET8/rxlRRO w5t+wmP0j01SFwFAzrwW3CFZa9v9kjssGsg+T7/E8FDv6SFZyWgeYtnFIv9jtuSMGdEG Y7BMJjXgmollpIt5DzHnVmu+w45koGSTG7rvRdKqPe5k5stBLFZlwmvlZN7CLSg5+yNe 3LDidzRC/ixpuN2+ZJhhezureZeXQxdo3rz6tuF/vSJzlWpwytYeIx2CvOCHNgVQR8ED C0lA== X-Gm-Message-State: APjAAAWeEA92GFMD7vX1YUlanQ9HAApkgGb7e40Urnivq2ZQGq+aRiVs 0FcBPfMqiBWh8l8MyRK2V3s= X-Google-Smtp-Source: APXvYqxlXD1SLWCwLirIyKrZzgQOoQBI/ev8EUl1EUmTRlXWWLkxHgBNcMzOuDkDKyHydHvvb5xhJA== X-Received: by 2002:a17:90a:9105:: with SMTP id k5mr7910815pjo.9.1567744694307; Thu, 05 Sep 2019 21:38:14 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:202:201:3adc:b08c:7acc:b325]) by smtp.gmail.com with ESMTPSA id y15sm6085378pfp.111.2019.09.05.21.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2019 21:38:13 -0700 (PDT) From: Dmitry Torokhov To: "Rafael J. Wysocki" , Heikki Krogerus Cc: Andy Shevchenko , Linus Walleij , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 3/3] software node: remove separate handling of references Date: Thu, 5 Sep 2019 21:38:09 -0700 Message-Id: <20190906043809.18990-3-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190906043809.18990-1-dmitry.torokhov@gmail.com> References: <20190906043809.18990-1-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Now that all users of references have moved to reference properties, we can remove separate handling of references. Signed-off-by: Dmitry Torokhov --- drivers/base/swnode.c | 31 +++++++++---------------------- include/linux/property.h | 26 ++++++-------------------- 2 files changed, 15 insertions(+), 42 deletions(-) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index 01325705b8e4..21771b29b641 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -568,7 +568,6 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, { struct swnode *swnode = to_swnode(fwnode); const struct software_node_reference *ref; - const struct software_node_ref_args *ref_args; const struct property_entry *prop; struct fwnode_handle *refnode; int i; @@ -577,30 +576,18 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, return -ENOENT; prop = property_entry_get(swnode->node->properties, propname); - if (prop) { - if (prop->type != DEV_PROP_REF) - return -EINVAL; - - if (index * sizeof(*ref_args) >= prop->length) - return -ENOENT; - - ref_args = prop->is_array ? - &prop->pointer.ref[index] : &prop->value.ref; - } else { - if (!swnode->node->references) - return -ENOENT; + if (!prop) + return -ENOENT; - for (ref = swnode->node->references; ref->name; ref++) - if (!strcmp(ref->name, propname)) - break; + if (prop->type != DEV_PROP_REF) + return -EINVAL; - if (!ref->name || index > (ref->nrefs - 1)) - return -ENOENT; + if (index * sizeof(*ref) >= prop->length) + return -ENOENT; - ref_args = &ref->refs[index]; - } + ref = prop->is_array ? &prop->pointer.ref[index] : &prop->value.ref; - refnode = software_node_fwnode(ref_args->node); + refnode = software_node_fwnode(ref->node); if (!refnode) return -ENOENT; @@ -619,7 +606,7 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, args->nargs = nargs; for (i = 0; i < nargs; i++) - args->args[i] = ref_args->args[i]; + args->args[i] = ref->args[i]; return 0; } diff --git a/include/linux/property.h b/include/linux/property.h index b25440344743..005b90d9e608 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -223,12 +223,12 @@ static inline int fwnode_property_count_u64(const struct fwnode_handle *fwnode, struct software_node; /** - * struct software_node_ref_args - Reference property with additional arguments + * struct software_node_reference - Named software node reference property * @node: Reference to a software node * @nargs: Number of elements in @args array * @args: Integer arguments */ -struct software_node_ref_args { +struct software_node_reference { const struct software_node *node; unsigned int nargs; u64 args[NR_FWNODE_REFERENCE_ARGS]; @@ -255,7 +255,7 @@ struct property_entry { const u32 *u32_data; const u64 *u64_data; const char * const *str; - const struct software_node_ref_args *ref; + const struct software_node_reference *ref; } pointer; union { u8 u8_data; @@ -263,7 +263,7 @@ struct property_entry { u32 u32_data; u64 u64_data; const char *str; - struct software_node_ref_args ref; + struct software_node_reference ref; } value; }; }; @@ -305,7 +305,7 @@ struct property_entry { (struct property_entry) { \ .name = _name_, \ .length = ARRAY_SIZE(_val_) * \ - sizeof(struct software_node_ref_args), \ + sizeof(struct software_node_reference), \ .is_array = true, \ .type = DEV_PROP_REF, \ .pointer.ref = _val_, \ @@ -344,7 +344,7 @@ struct property_entry { #define PROPERTY_ENTRY_REF(_name_, _ref_, ...) \ (struct property_entry) { \ .name = _name_, \ - .length = sizeof(struct software_node_ref_args), \ + .length = sizeof(struct software_node_reference), \ .type = DEV_PROP_REF, \ .value.ref.node = _ref_, \ .value.ref.nargs = \ @@ -415,30 +415,16 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, /* -------------------------------------------------------------------------- */ /* Software fwnode support - when HW description is incomplete or missing */ -/** - * struct software_node_reference - Named software node reference property - * @name: Name of the property - * @nrefs: Number of elements in @refs array - * @refs: Array of references with optional arguments - */ -struct software_node_reference { - const char *name; - unsigned int nrefs; - const struct software_node_ref_args *refs; -}; - /** * struct software_node - Software node description * @name: Name of the software node * @parent: Parent of the software node * @properties: Array of device properties - * @references: Array of software node reference properties */ struct software_node { const char *name; const struct software_node *parent; const struct property_entry *properties; - const struct software_node_reference *references; }; bool is_software_node(const struct fwnode_handle *fwnode);