From patchwork Fri Sep 6 22:26: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: 11136095 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 33E1A13BD for ; Fri, 6 Sep 2019 22:26:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02ACC207FC for ; Fri, 6 Sep 2019 22:26:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PctYsTZe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404884AbfIFW0Q (ORCPT ); Fri, 6 Sep 2019 18:26:16 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:41150 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404877AbfIFW0Q (ORCPT ); Fri, 6 Sep 2019 18:26:16 -0400 Received: by mail-pf1-f193.google.com with SMTP id b13so5477329pfo.8; Fri, 06 Sep 2019 15:26: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:mime-version :content-transfer-encoding; bh=jy3R1WgQyiaWIhke8T/CbEBcNrYri/Fjw7+3lksM92U=; b=PctYsTZeb2Tg0O+MuAW/jpzBA4neZ2631KdjkzQvXekcuC7aBJAI8cQzxB/0Vrp4qo g5LvVH+O8SKhO+05O/7itdvULF5wpxVkvoPPw3/EYlMQ/Ji6WeorJtHSo2EEpC5LuHnH 60jhxYbp8RvcG74y+uMukzB2MGH+Hsaob+dM2tvY8SDSuNKbEUmH3AqQx7xqJ/WjQafo 1axr3AoQ9lpi0/9QoW2rD/TiBXvYbR1FZn0FY0Z+cH2E8uAmUP52hwp+qM7pGwi2l707 9+l25aJcCCQgpSf7+H4zOnifyQr0ffIFZVCN/d6kdEmdWjq6ADoii6OpDxa5XZvAxPp1 em5Q== 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=jy3R1WgQyiaWIhke8T/CbEBcNrYri/Fjw7+3lksM92U=; b=e5s6Ukyl5vYV2Y04OXr1l3bqU8THtVIsMwKVPx2InSIeooSmYRINdwD7iZGuuQq7CN 3cR2KQmCdG4ldnipgZrG3mTMwE3FB44Lg28w0AbXyU+gD043B2wv+xaadyCLDPhiL425 1OTqL3J+In/60h63awLUD6MlmSJoUES8Cyo3m5AwJ7wIR40jZXdmVwopf7yc2p/D76OL nJ5bruqUxqQedfyGkUNQV27IK2qccZ8kgozLo7S+rZ+jAFrfUx/rr6MX/Z7lt6mtujp8 rIGxW4+FyeCvSYB5D4KWR/nDrZ7ahS9529e7qmLyu+/nCzHUc0G664yccwlmcqyNiI8a Gk4w== X-Gm-Message-State: APjAAAVGnJ+R6ora0D3ICbrlBSoHLa1Ujrei/JlQ1WG+KvQLgEFuD3Yw Qw+BU16z2Z4nIglNXFM01PQ= X-Google-Smtp-Source: APXvYqwuEdDmNq6/ecMQjecZeu02BUQgc2gDK8ZpS6z+mMch/Kd40lBWVjqdEcquz0hVKbbX8La+9Q== X-Received: by 2002:a17:90a:33a9:: with SMTP id n38mr12048155pjb.18.1567808774786; Fri, 06 Sep 2019 15:26: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 o130sm9648902pfg.171.2019.09.06.15.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 15:26: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 v2 1/3] software node: implement reference properties Date: Fri, 6 Sep 2019 15:26:09 -0700 Message-Id: <20190906222611.223532-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: static const struct software_node gpio_bank_b_node = { .name = "B", }; static const struct property_entry simone_key_enter_props[] = { 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 --- v1->v2: - reworked code so that even single-entry reference properties are stored as arrays (i.e. the software_node_ref_args instances are not part of property_entry structure) to avoid size increase. From user's POV nothing is changed, one can still use PROPERTY_ENTRY_REF macro to define reference "inline". - dropped unused DEV_PROP_MAX drivers/base/swnode.c | 43 ++++++++++++++++++++++++++------ include/linux/property.h | 54 +++++++++++++++++++++++++++++----------- 2 files changed, 74 insertions(+), 23 deletions(-) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index ee2a405cca9a..bd720d995123 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -387,6 +387,9 @@ static int property_entry_copy_data(struct property_entry *dst, new = kstrdup(src->value.str, GFP_KERNEL); if (!new && src->value.str) return -ENOMEM; + } else if (src->type == DEV_PROP_REF) { + /* All reference properties must be arrays */ + return -EINVAL; } else { new = pointer; } @@ -568,21 +571,45 @@ 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; + /* + * We expect all references to be stored as arrays via + * a pointer, even single ones. + */ + if (!prop->is_array) + return -EINVAL; + + if (index * sizeof(*ref_args) >= prop->length) + return -ENOENT; + + ref_args = &prop->pointer.ref[index]; + } 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 +628,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 9b3d4ca3a73a..6658403f6fa9 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -22,7 +22,7 @@ enum dev_prop_type { DEV_PROP_U32, DEV_PROP_U64, DEV_PROP_STRING, - DEV_PROP_MAX, + DEV_PROP_REF, }; enum dev_dma_attr { @@ -219,6 +219,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 +254,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; @@ -284,6 +299,15 @@ 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 +338,20 @@ 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, \ + .is_array = true, \ + .type = DEV_PROP_REF, \ + .pointer.ref = &(const struct software_node_ref_args) { \ + .node = _ref_, \ + .nargs = ARRAY_SIZE(((u64[]){ 0, ##__VA_ARGS__ })) - 1, \ + .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 22:26:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 11136097 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 02EBE13BD for ; Fri, 6 Sep 2019 22:26:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D118E21835 for ; Fri, 6 Sep 2019 22:26:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eeqD8Rbt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404919AbfIFW0R (ORCPT ); Fri, 6 Sep 2019 18:26:17 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:37692 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404882AbfIFW0R (ORCPT ); Fri, 6 Sep 2019 18:26:17 -0400 Received: by mail-pl1-f196.google.com with SMTP id b10so3852578plr.4; Fri, 06 Sep 2019 15:26:16 -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=H1Zu9KBZxMApLDfSPgkhTVvwa+zQgEHW9F9tfasvlk0=; b=eeqD8RbtGYdsgVrNHy2xoIY/Vj4Tlt4JxBjJV/rBt3X7Xk/5yRJmnxspdNchcnbZv5 Y6wmpHA3s3CWltC/+P1EftjUEcLan8REABFb7tZFxvDYnpqtMG3jot5zSAwRnwb+hqL1 3NFlk9xX0tKRi2l/baV7oVdPTIY6HxqkPZqegK2Rvn/LNHL+Exe5RTSq4MUxpRCBY4bc +6rgZJafdIBiDsJTCEy9+oI6LUeZTrenq5+LAYZMeets/K6aATupyTNuvHC1bVDFzpdU DtCVXBkv5whh1MPHgYL7WH7TRdLe6AyBNLg6T+uBd5wrQ4N3Y9LkIZZ3SyJsbZLixUiM MYSA== 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=H1Zu9KBZxMApLDfSPgkhTVvwa+zQgEHW9F9tfasvlk0=; b=kYsfjJAKuBQDILx+oDOqeCDmKKYVfB58VZp0mbcvcESlqe8HBeG833qwDHxBowIJLo tPkO27Og9FAZwfoumgaK1atvdYnSPK72MXEodkxbFNovWeBYve53zH6esIyCScIYQywr jXIAGYizFVGHIABlgVZSjQycPQsC/hyWWRX0lgIjinyOdtKRpCqQppJsj+yKtriZchdQ 0WCsIDQXVMExKEdr5X9QJQGDbiXzfFFPrTh8i16chuxsjNNqEIdviWVVeNCc5Wkm7q6W vAG876UjYICh3cLuDiTYSeFY/EKWxTkpeiEnKnuDaptBoBBbD3jUAl5CbgbDtsiel5qm yShg== X-Gm-Message-State: APjAAAX00vrkIkSsWeCgggENS94Z03KvdGYZnVjJ6MA8phBkRfxsXlRE 6bazAMD9A45kbour11H82jI= X-Google-Smtp-Source: APXvYqwiNZE760NdkNzfl8xUiLziwMliKInjjQ486py98yVaKsBLZ79dUN7bJncbHsreh81Y7iin/Q== X-Received: by 2002:a17:902:a5c5:: with SMTP id t5mr11133988plq.316.1567808775566; Fri, 06 Sep 2019 15:26:15 -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 o130sm9648902pfg.171.2019.09.06.15.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 15:26:15 -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 v2 2/3] platform/x86: intel_cht_int33fe: use inline reference properties Date: Fri, 6 Sep 2019 15:26:10 -0700 Message-Id: <20190906222611.223532-2-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190906222611.223532-1-dmitry.torokhov@gmail.com> References: <20190906222611.223532-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 Acked-by: Andy Shevchenko --- v1-v2: - rebased on top of linux-next-20190904 drivers/platform/x86/intel_cht_int33fe.c | 81 ++++++++++++------------ 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index 1d5d877b9582..4177c5424931 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c @@ -46,30 +46,6 @@ struct cht_int33fe_data { struct fwnode_handle *dp; }; -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 @@ -105,8 +81,18 @@ static const struct property_entry max17047_props[] = { { } }; +/* + * We are not using inline property here because those are constant, + * and we need to adjust this one at runtime to point to real + * software node. + */ +static struct software_node_ref_args fusb302_mux_refs[] = { + { .node = NULL }, +}; + static const struct property_entry fusb302_props[] = { PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"), + PROPERTY_ENTRY_REF_ARRAY("usb-role-switch", fusb302_mux_refs), { } }; @@ -122,6 +108,8 @@ static const u32 snk_pdo[] = { PDO_VAR(5000, 12000, 3000), }; +static const struct software_node nodes[]; + static const struct property_entry usb_connector_props[] = { PROPERTY_ENTRY_STRING("data-role", "dual"), PROPERTY_ENTRY_STRING("power-role", "dual"), @@ -129,15 +117,21 @@ 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" }, - { "connector", &nodes[0], usb_connector_props, usb_connector_refs }, + { "connector", &nodes[0], usb_connector_props }, { } }; @@ -173,9 +167,10 @@ static void cht_int33fe_remove_nodes(struct cht_int33fe_data *data) { software_node_unregister_nodes(nodes); - if (mux_ref.node) { - fwnode_handle_put(software_node_fwnode(mux_ref.node)); - mux_ref.node = NULL; + if (fusb302_mux_refs[0].node) { + fwnode_handle_put( + software_node_fwnode(fusb302_mux_refs[0].node)); + fusb302_mux_refs[0].node = NULL; } if (data->dp) { @@ -187,25 +182,31 @@ static void cht_int33fe_remove_nodes(struct cht_int33fe_data *data) static int cht_int33fe_add_nodes(struct cht_int33fe_data *data) { + const struct software_node *mux_ref_node; int ret; - ret = software_node_register_nodes(nodes); - if (ret) - return ret; - - /* The devices that are not created in this driver need extra steps. */ - /* * There is no ACPI device node for the USB role mux, so we need to wait * until the mux driver has created software node for the mux device. * It means we depend on the mux driver. This function will return * -EPROBE_DEFER until the mux device is registered. */ - mux_ref.node = software_node_find_by_name(NULL, "intel-xhci-usb-sw"); - if (!mux_ref.node) { - ret = -EPROBE_DEFER; - goto err_remove_nodes; - } + mux_ref_node = software_node_find_by_name(NULL, "intel-xhci-usb-sw"); + if (!mux_ref_node) + return -EPROBE_DEFER; + + /* + * Update node used in "usb-role-switch" property. Note that we + * rely on software_node_register_nodes() to use the original + * instance of properties instead of copying them. + */ + fusb302_mux_refs[0].node = mux_ref_node; + + ret = software_node_register_nodes(nodes); + if (ret) + return ret; + + /* The devices that are not created in this driver need extra steps. */ /* * The DP connector does have ACPI device node. In this case we can just From patchwork Fri Sep 6 22:26:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 11136099 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 0E7E313BD for ; Fri, 6 Sep 2019 22:26:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DABFD207FC for ; Fri, 6 Sep 2019 22:26:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TPOOmssS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404882AbfIFW0W (ORCPT ); Fri, 6 Sep 2019 18:26:22 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:40395 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404918AbfIFW0S (ORCPT ); Fri, 6 Sep 2019 18:26:18 -0400 Received: by mail-pf1-f194.google.com with SMTP id x127so5490463pfb.7; Fri, 06 Sep 2019 15:26:17 -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=dwemBU+v3KzP8p62Iwnfn5JccM5nY24p7G/KK/8dCU8=; b=TPOOmssSdlRC00scR9zIyH6VvqkQesXn8nQHaHe1yocHyV6llbP75QzlImSqMFL7cT ktJBOCI3vrzOuFapqt1nSmnSjBeN25H6fwn0i0281/QdLHBkyZCJLXWieaJjg232vhXu 8a9F/N6+pM1A+kQDBwjWFeLzfFy+nK9RwPVeobjlDgf9PWlqBFsU/K0k+V51t1i52sRp 3wzmvwY1Wli4vgOkqaYbULaxd924fsIEILtzGa541lT9MCeFt409ROtdynkebTmMQ0nz KKTZTK0YwzOrNdfpeHfikCbryXMLGjMZ2UZgwLogxpf2t8xa5tYBF8TV1sk2gT8Kk17Q EiUQ== 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=dwemBU+v3KzP8p62Iwnfn5JccM5nY24p7G/KK/8dCU8=; b=NZRwzdOjT1Fmy9t11cPQ/NTrNmdRTTpZHI/P6jALDzJKFdwBhoXKVMLy3Bu3W9JBtY IbsqWSt/F816OkzNHhjHwX9kgPmby2kAGLe1BZDT8Y2y4is85xLIXGnxkBu771BL8RoO kTF5ygsdDUq+OcUzC1DkTDJ/PxWsahQexwX+u5pb59RGNIa3IrMg+aK93AO0QioISAhi Bj0+m6TxWkZ2ygrZ82f1YaaNjYJpml/Y9I2c9/MF26SupyJUGu522zsslS8FPy867gLC BmFlw9jaM672UFcCJ8cRj+vvXky7b0NIYtycWs6PvXBf0UTzUVWQ7kiOG7WV6tJVRivl vbSg== X-Gm-Message-State: APjAAAUnnuJCncp9CFn7yT7lh8+4/7ckRQYFL5aqhMdySYRKvCMTh6N6 KCCWy/YpEg2wsvorO2Qy3wU= X-Google-Smtp-Source: APXvYqx23C6Ba42TXbg+9w9fK12tQbcjz/a+3Fdzh88mbhk94bm9Cod2Rn5AKW7eD+mhdxjbKbSwbg== X-Received: by 2002:a17:90a:c24e:: with SMTP id d14mr12602456pjx.0.1567808776849; Fri, 06 Sep 2019 15:26:16 -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 o130sm9648902pfg.171.2019.09.06.15.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 15:26:15 -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 v2 3/3] software node: remove separate handling of references Date: Fri, 6 Sep 2019 15:26:11 -0700 Message-Id: <20190906222611.223532-3-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog In-Reply-To: <20190906222611.223532-1-dmitry.torokhov@gmail.com> References: <20190906222611.223532-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 Reviewed-by: Andy Shevchenko --- v1->v2: - dropped rename of struct software_node_ref_args -> struct software_node_reference drivers/base/swnode.c | 44 +++++++++++++++------------------------- include/linux/property.h | 14 ------------- 2 files changed, 16 insertions(+), 42 deletions(-) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index bd720d995123..5dc113de0cae 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -570,8 +570,7 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode, struct fwnode_reference_args *args) { struct swnode *swnode = to_swnode(fwnode); - const struct software_node_reference *ref; - const struct software_node_ref_args *ref_args; + const struct software_node_ref_args *ref; const struct property_entry *prop; struct fwnode_handle *refnode; int i; @@ -580,36 +579,25 @@ 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; - - /* - * We expect all references to be stored as arrays via - * a pointer, even single ones. - */ - if (!prop->is_array) - return -EINVAL; - - if (index * sizeof(*ref_args) >= prop->length) - return -ENOENT; + if (!prop) + return -ENOENT; - ref_args = &prop->pointer.ref[index]; - } else { - if (!swnode->node->references) - return -ENOENT; + if (prop->type != DEV_PROP_REF) + return -EINVAL; - for (ref = swnode->node->references; ref->name; ref++) - if (!strcmp(ref->name, propname)) - break; + /* + * We expect all references to be stored as arrays via + * a pointer, even single ones. + */ + if (!prop->is_array) + 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->pointer.ref[index]; - refnode = software_node_fwnode(ref_args->node); + refnode = software_node_fwnode(ref->node); if (!refnode) return -ENOENT; @@ -628,7 +616,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 6658403f6fa9..5e4adccd6404 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -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);