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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 8C884C28CC0 for ; Wed, 29 May 2019 09:36:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 625AD20B1F for ; Wed, 29 May 2019 09:36:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726320AbfE2JgJ (ORCPT ); Wed, 29 May 2019 05:36:09 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:35444 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726005AbfE2JgI (ORCPT ); Wed, 29 May 2019 05:36:08 -0400 Received: by mail-ed1-f66.google.com with SMTP id p26so2768077edr.2 for ; Wed, 29 May 2019 02:36:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=+JR93oPof/EMEek7mDnj8OOcvuCQwdSytsivGNj6W1k=; b=CQuhh3oErg65As/6XAqVzQGZOVsv0W6wPwistMYwn3NuCBofjGHd3+HGXdsV9hXI/8 ByGqbGJmVjph0b/yCrdxPpburiKSDF2WcR4ptCI9oHyLDHSHNeVXwZLNhqiNu4PCFCYO 6FI7WbC9uHCj++pbomeUEOcgaG8O5YiRaaslP0ag3XH50aSOVU2PZyFyrnD2zWYtXx3K 2uqKUsAqSB9MfiuGfHJb7/OWuuhAPaFStKfKnbphBo0zILadaVYVK/kTQ5GgSQsjG1KY L9RsCrgNaZMsH7LC6tVV3vRbw888ixbOxwZutXj/ODfCMqRDWzes8EC6HpC6XHSxfA+c qF5w== X-Gm-Message-State: APjAAAVRcNKpI0NzmFKpKSTqOKLDoWUlLCEc7Pr2rhKuYrzhUPN3AJWM I/qiTsuffHCVQzRct2e7dxfECA== X-Google-Smtp-Source: APXvYqxmNiiFw39c3SbWZfLqlEtorg7H+UdPzQ5FPoaOQL1v6449ESbGUuWLrRRxwJMxnqoxrSoAqA== X-Received: by 2002:a50:b7f8:: with SMTP id i53mr134880111ede.196.1559122566947; Wed, 29 May 2019 02:36:06 -0700 (PDT) Received: from localhost.localdomain ([2a01:4f8:1c0c:6c86:46e0:a7ad:5246:f04d]) by smtp.gmail.com with ESMTPSA id x22sm5024494edd.59.2019.05.29.02.36.05 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Wed, 29 May 2019 02:36:06 -0700 (PDT) Subject: Re: [PATCH v4 15/16] platform/x86: intel_cht_int33fe: Supply fwnodes for the external dependencies To: Heikki Krogerus , "Rafael J. Wysocki" Cc: Greg Kroah-Hartman , Andy Shevchenko , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org References: <20190522105113.11153-1-heikki.krogerus@linux.intel.com> <20190522105113.11153-16-heikki.krogerus@linux.intel.com> From: Hans de Goede Message-ID: Date: Wed, 29 May 2019 11:36:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190522105113.11153-16-heikki.krogerus@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 5/22/19 12:51 PM, Heikki Krogerus wrote: > Supplying also external devices, the DisplayPort connector > and the USB role switch, software fwnodes. After this the > driver has access to all the components tied to the USB > Type-C connector and can start creating software node > references to actually associate them with the USB Type-C > connector device. > > Signed-off-by: Heikki Krogerus > Reviewed-by: Andy Shevchenko > --- > drivers/platform/x86/intel_cht_int33fe.c | 128 ++++++++++++++++++++++- > 1 file changed, 125 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c > index 34bc2d178760..e5c0b6573618 100644 > --- a/drivers/platform/x86/intel_cht_int33fe.c > +++ b/drivers/platform/x86/intel_cht_int33fe.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -32,6 +33,8 @@ enum { > INT33FE_NODE_FUSB302, > INT33FE_NODE_MAX17047, > INT33FE_NODE_PI3USB30532, > + INT33FE_NODE_DISPLAYPORT, > + INT33FE_NODE_ROLE_SWITCH, > INT33FE_NODE_USB_CONNECTOR, > INT33FE_NODE_MAX, > }; > @@ -42,6 +45,9 @@ struct cht_int33fe_data { > struct i2c_client *pi3usb30532; > /* Contain a list-head must be per device */ > struct device_connection connections[4]; > + > + struct fwnode_handle *dp; > + struct fwnode_handle *mux; > }; > > /* > @@ -110,10 +116,126 @@ static const struct software_node nodes[] = { > { "fusb302", NULL, fusb302_props }, > { "max17047", NULL, max17047_props }, > { "pi3usb30532" }, > + { "displayport" }, > + { "usb-role-switch" }, > { "connector", &nodes[0], usb_connector_props }, > { } > }; > > +static int cht_int33fe_setup_mux(struct cht_int33fe_data *data) > +{ > + struct fwnode_handle *fwnode; > + struct device *dev; > + struct device *p; > + > + fwnode = software_node_fwnode(&nodes[INT33FE_NODE_ROLE_SWITCH]); > + if (!fwnode) > + return -ENODEV; > + > + /* First finding the platform device */ > + p = bus_find_device_by_name(&platform_bus_type, NULL, > + "intel_xhci_usb_sw"); > + if (!p) > + return -EPROBE_DEFER; > + > + /* Then the mux child device */ > + dev = device_find_child_by_name(p, "intel_xhci_usb_sw-role-switch"); > + put_device(p); > + if (!dev) > + return -EPROBE_DEFER; > + > + /* If there already is a node for the mux, using that one. */ > + if (dev->fwnode) > + fwnode_remove_software_node(fwnode); > + else > + dev->fwnode = fwnode; > + > + data->mux = fwnode_handle_get(dev->fwnode); > + put_device(dev); > + > + return 0; > +} > + > +static int cht_int33fe_setup_dp(struct cht_int33fe_data *data) > +{ > + struct fwnode_handle *fwnode; > + struct pci_dev *pdev; > + > + fwnode = software_node_fwnode(&nodes[INT33FE_NODE_DISPLAYPORT]); > + if (!fwnode) > + return -ENODEV; > + > + /* First let's find the GPU PCI device */ > + pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, NULL); > + if (!pdev || pdev->vendor != PCI_VENDOR_ID_INTEL) { > + pci_dev_put(pdev); > + return -ENODEV; > + } > + > + /* Then the DP child device node */ > + data->dp = device_get_named_child_node(&pdev->dev, "DD02"); > + pci_dev_put(pdev); > + if (!data->dp) > + return -ENODEV; > + > + fwnode->secondary = ERR_PTR(-ENODEV); > + data->dp->secondary = fwnode; > + > + return 0; > +} > + > +static void cht_int33fe_remove_nodes(struct cht_int33fe_data *data) > +{ > + software_node_unregister_nodes(nodes); > + > + if (data->mux) { > + fwnode_handle_put(data->mux); > + data->mux = NULL; > + } > + > + if (data->dp) { > + data->dp->secondary = NULL; > + fwnode_handle_put(data->dp); > + data->dp = NULL; > + } > +} > + > +static int cht_int33fe_add_nodes(struct cht_int33fe_data *data) > +{ > + 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 find > + * the mux device and assign our node directly to it. That means we > + * depend on the mux driver. This function will return -PROBE_DEFER > + * until the mux device is registered. > + */ > + ret = cht_int33fe_setup_mux(data); > + if (ret) > + goto err_remove_nodes; > + > + /* > + * The DP connector does have ACPI device node. In this case we can just > + * find that ACPI node and assing our node as the secondary node to it. > + */ s/assing/adding/ I presume ? Regards, Hans > + ret = cht_int33fe_setup_dp(data); > + if (ret) > + goto err_remove_nodes; > + > + return 0; > + > +err_remove_nodes: > + cht_int33fe_remove_nodes(data); > + > + return ret; > +} > + > static int > cht_int33fe_register_max17047(struct device *dev, struct cht_int33fe_data *data) > { > @@ -211,7 +333,7 @@ static int cht_int33fe_probe(struct platform_device *pdev) > if (!data) > return -ENOMEM; > > - ret = software_node_register_nodes(nodes); > + ret = cht_int33fe_add_nodes(data); > if (ret) > return ret; > > @@ -280,7 +402,7 @@ static int cht_int33fe_probe(struct platform_device *pdev) > device_connections_remove(data->connections); > > out_remove_nodes: > - software_node_unregister_nodes(nodes); > + cht_int33fe_remove_nodes(data); > > return ret; > } > @@ -294,7 +416,7 @@ static int cht_int33fe_remove(struct platform_device *pdev) > i2c_unregister_device(data->max17047); > > device_connections_remove(data->connections); > - software_node_unregister_nodes(nodes); > + cht_int33fe_remove_nodes(data); > > return 0; > } >