Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 7 Sep 2022 22:53:12 -0700
From:   Dan Williams <dan.j.williams@intel.com>
To:     Robert Richter <rrichter@amd.com>,
        Alison Schofield <alison.schofield@intel.com>,
        Vishal Verma <vishal.l.verma@intel.com>,
        "Ira Weiny" <ira.weiny@intel.com>,
        Ben Widawsky <bwidawsk@kernel.org>,
        "Dan Williams" <dan.j.williams@intel.com>
CC:     <linux-cxl@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        Bjorn Helgaas <bhelgaas@google.com>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        Len Brown <lenb@kernel.org>, Robert Richter <rrichter@amd.com>
Subject: RE: [PATCH 03/15] cxl: Unify debug messages when calling
 devm_cxl_add_port()
Message-ID: <631983487d3d3_5801629418@dwillia2-xfh.jf.intel.com.notmuch>
References: <20220831081603.3415-1-rrichter@amd.com>
 <20220831081603.3415-4-rrichter@amd.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20220831081603.3415-4-rrichter@amd.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SjMJyUigfNLHlLCii/nanSajCcSdkrHL9lI4yyot/Abr8TaAm8e2UyH0jkCM?=
 =?us-ascii?Q?YOvlS7seSMQpUiAojNDVYblunnBXYnX5TVRQctz9wbP/GAhp1c8KHmVMlF50?=
 =?us-ascii?Q?qyyERWNBpKGgVw1X5qM2ewamwd8Fm6SbhLoKK3pmXTNKxsMTY73+s4aZzxeX?=
 =?us-ascii?Q?cpTnO7UXu7PndhB67dQPyvIeaxkIjf9fWG+pyPqPpwf9rIENIBVnnz4PwcnB?=
 =?us-ascii?Q?17LsQ63tDUMQXwuUJ+x0zTyxC2Lc8oShFON3TgQijUI1K9gKW57wxLhmYtAH?=
 =?us-ascii?Q?cd+nZdtUotS4tGJB0azab5iyFmo3E+T3YV8mcIJynQlzKrNu2NfyLcs7yZUS?=
 =?us-ascii?Q?UXkspLUdzCdQcgWO8JdLDcNaC/1cEn3UrHRgCbpRvxOZH4KSH/xtJeQQ7mGL?=
 =?us-ascii?Q?WvqxcUq2x4IMSJIJ/RKE+jp1peMvRzjy0Q8ZxIr583ZxPuUw/fiWMncNF0xV?=
 =?us-ascii?Q?4n06aaxP0wSAfv19SV6I4zc8ZNsM88IjL44ks2JqhT76eDrAuP0gDAZxEjFD?=
 =?us-ascii?Q?0TO6NqtCGdbNidrf3Cb0F6F3odgPVxhJdjHRzrYqVq0N7EJ9OI+dcpIJFhbz?=
 =?us-ascii?Q?ghgswhG08jwh2/JbFRD/OQ3j5QoAW8FDzksaSod5WrA4oR/VE6CHZX8ufXEO?=
 =?us-ascii?Q?c8f3jLWO0Hcb9DTljX6QIP7uwtJLDdUWYnwQ6gW/h+VyxQ22dF3t0YY2OF83?=
 =?us-ascii?Q?2EAMqJI2EBBCLf8X9P8dv6TdJBtSnKT12yi3VfStJBpv7n+0ZWuy0ofzb9EN?=
 =?us-ascii?Q?7CTAzNqB5psqxbIKO/8GcVUB+koX1NbKwVcPmUtEiRir8ibLIzkPoykXbR5N?=
 =?us-ascii?Q?gCqvC0bDtxHnDOigD9DPRItzHAugNkOLTmvxfc3J4GQIQLwCUByDSIa1pPZP?=
 =?us-ascii?Q?vyk8xxixWNIN5knfUqX8FeWaLaYDr0tiBg6vll2Y/91gNHxryNb5srZ0fgMt?=
 =?us-ascii?Q?dAhzUgMNFUe1X4duV0UiKcqd+zUNTfHdlucMxrS87rjgnaelRXHrSrsa7Jzo?=
 =?us-ascii?Q?u0qfQ8GEyoufYkmooyvM08ADsSJIGgYBWZAStm3y8MNAS1grkrFJkB03TLLr?=
 =?us-ascii?Q?c5xai/Du2R9iffTWyzgPz/Mz2o7MI3rCWCuumPcMi1AjnZl9mX2hD4jYDiKM?=
 =?us-ascii?Q?bLD6YwLiTB3jV6D2RCsoyMzBBs9tfoK4mWDDsuBciRYYA5OCDvzu1eSyUk5d?=
 =?us-ascii?Q?+yiqxy9tRPB83kJVQIauAepD8NK3E7k+X8VH/WsHoYAUlRVPY0/nqRq5bleY?=
 =?us-ascii?Q?5GrW+MAjdobnXdomt33IqNudfuDdS0EwranmM+eAOJ8p6Jpl7NTGz2I7nlzP?=
 =?us-ascii?Q?kCB8185n6T1qVoaS1h28lxuldrKoh7wLXMyveQmmOxI8c1o0ytzKWXeEmDbO?=
 =?us-ascii?Q?PQle0wLRjngrEjdVb2Lf6kMs7Mk4rlCde72npxSnak2NFufW1ACRxgMC7MJM?=
 =?us-ascii?Q?Co7zgoLvV3xB8Pp6eA64MvPzYCjL2OAQmKlILmfz0myvH8egLbH0ODLDOSF5?=
 =?us-ascii?Q?yAl/arP6npW3wA+qhDxX2At1zvmvQN0F07YuF0YPTZJfJ+K+XooGoOQaVNow?=
 =?us-ascii?Q?jdxKnC3cnRULyuDeiuZXTamcypCm4pIdn9TlbqhIjt4sgggNkOoJ8NrrIhHa?=
 =?us-ascii?Q?Ow=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 57b1964b-401d-43af-cb96-08da915e6bc8
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 05:53:14.8714
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: vsXIOCRW9/zsc7dYQauD3SK2qm8Mba5Q9efpU8i+xQ2WmQC2lflTWe/XLZc/vB/K6+Wt0bxWZQbbdCyUnYhdlh32/jmG/qu/S46F0luPGQ8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4426
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Robert Richter wrote:
> CXL ports are added in a couple of code paths using
> devm_cxl_add_port(). Debug messages are individually generated, but
> are incomplete and inconsistent. Change this by moving its generation
> to devm_cxl_add_port(). This unifies the messages and reduces code
> duplication. Also, generate messages on failure.
> 
> Signed-off-by: Robert Richter <rrichter@amd.com>
> ---
>  drivers/cxl/acpi.c      |  2 --
>  drivers/cxl/core/port.c | 39 ++++++++++++++++++++++++++++-----------
>  2 files changed, 28 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c
> index fb649683dd3a..767a91f44221 100644
> --- a/drivers/cxl/acpi.c
> +++ b/drivers/cxl/acpi.c
> @@ -220,7 +220,6 @@ static int add_host_bridge_uport(struct device *match, void *arg)
>  	port = devm_cxl_add_port(host, match, dport->component_reg_phys, dport);
>  	if (IS_ERR(port))
>  		return PTR_ERR(port);
> -	dev_dbg(host, "%s: add: %s\n", dev_name(match), dev_name(&port->dev));
>  
>  	return 0;
>  }
> @@ -466,7 +465,6 @@ static int cxl_acpi_probe(struct platform_device *pdev)
>  	root_port = devm_cxl_add_port(host, host, CXL_RESOURCE_NONE, NULL);
>  	if (IS_ERR(root_port))
>  		return PTR_ERR(root_port);
> -	dev_dbg(host, "add: %s\n", dev_name(&root_port->dev));
>  
>  	rc = bus_for_each_dev(adev->dev.bus, NULL, root_port,
>  			      add_host_bridge_dport);
> diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
> index bffde862de0b..8604cda88787 100644
> --- a/drivers/cxl/core/port.c
> +++ b/drivers/cxl/core/port.c
> @@ -666,13 +666,17 @@ struct cxl_port *devm_cxl_add_port(struct device *host, struct device *uport,
>  				   resource_size_t component_reg_phys,
>  				   struct cxl_dport *parent_dport)
>  {
> -	struct cxl_port *port;
> +	struct cxl_port *port, *parent_port;
>  	struct device *dev;
>  	int rc;
>  
> +	parent_port = parent_dport ? parent_dport->port : NULL;
> +
>  	port = cxl_port_alloc(uport, component_reg_phys, parent_dport);
> -	if (IS_ERR(port))
> -		return port;
> +	if (IS_ERR(port)) {
> +		rc = PTR_ERR(port);
> +		goto err_out;

While I agree this unifies the error messaging I am not a fan of what
this does to the readability of the error exits. What about a compromise
of renaming devm_cxl_add_port to __devm_cxl_add_port() and add back a
new devm_cxl_add_port that does the unified debug messaging?