From patchwork Fri Jan 7 00:37:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 12706032 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 466BFC4167B for ; Fri, 7 Jan 2022 00:38:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344325AbiAGAiL (ORCPT ); Thu, 6 Jan 2022 19:38:11 -0500 Received: from mga18.intel.com ([134.134.136.126]:59426 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344313AbiAGAiL (ORCPT ); Thu, 6 Jan 2022 19:38:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641515891; x=1673051891; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zCiUUcytCexUYYZvqVtEwyDzVzKLZ5yWtPaDBTJE3k0=; b=MwHQBoH/KSWvueSf5dcgL8EM7X5RWRvrGhebsE1Mehrn8RNsN+4Az88s 24JOC6kfsiit6xIv7+M402PNKzAyAoH4nmDZVWrgk0r+gyGo6vJNGAmUh 9huzdIKpnHuCXXSnJbKltNlYTL0qWpH2yrgqI1pLYXS2dGjdF2ddo/d1c hE8CGhshh9DE9rFKj2yIpvZhPXFGaB3ih676b8gBnJgS3+JtliPnF0Ugp uMTnz7HmLQ21lv5cVRt3QNv7dwmH38YbZ3EewED9pflfgQHbsW0q1N5O3 2dt3w3DXnSceA5qkBZry596g81k69HbVBHKYtkJm0m1wLnCtsqvkFTqKU g==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="229582025" X-IronPort-AV: E=Sophos;i="5.88,268,1635231600"; d="scan'208";a="229582025" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2022 16:38:11 -0800 X-IronPort-AV: E=Sophos;i="5.88,268,1635231600"; d="scan'208";a="471123204" Received: from elenawei-mobl2.amr.corp.intel.com (HELO localhost.localdomain) ([10.252.138.104]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2022 16:38:10 -0800 From: Ben Widawsky To: linux-cxl@vger.kernel.org, linux-nvdimm@lists.01.org, linux-pci@vger.kernel.org Cc: patches@lists.linux.dev, Bjorn Helgaas , Ben Widawsky , Alison Schofield , Dan Williams , Ira Weiny , Jonathan Cameron , Vishal Verma Subject: [PATCH 05/13] cxl/mem: Cache port created by the mem dev Date: Thu, 6 Jan 2022 16:37:48 -0800 Message-Id: <20220107003756.806582-6-ben.widawsky@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220107003756.806582-1-ben.widawsky@intel.com> References: <20220107003756.806582-1-ben.widawsky@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org Since region programming sees all components in the topology as a port, it's required that endpoints are treated equally. The easiest way to go from endpoint to port is to simply cache it at creation time. Signed-off-by: Ben Widawsky --- drivers/cxl/cxlmem.h | 2 ++ drivers/cxl/mem.c | 16 ++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index 4ea0686e5f84..38d6129499c8 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -36,12 +36,14 @@ * @cxlds: The device state backing this device * @id: id number of this memdev instance. * @component_reg_phys: register base of component registers + * @port: The port created by this device */ struct cxl_memdev { struct device dev; struct cdev cdev; struct cxl_dev_state *cxlds; int id; + struct cxl_port *port; }; static inline struct cxl_memdev *to_cxl_memdev(struct device *dev) diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c index 9e6e98e5ea06..2ed7554155d2 100644 --- a/drivers/cxl/mem.c +++ b/drivers/cxl/mem.c @@ -45,8 +45,8 @@ static int wait_for_media(struct cxl_memdev *cxlmd) return 0; } -static int create_endpoint(struct cxl_memdev *cxlmd, - struct cxl_port *parent_port) +static struct cxl_port *create_endpoint(struct cxl_memdev *cxlmd, + struct cxl_port *parent_port) { struct cxl_dev_state *cxlds = cxlmd->cxlds; struct cxl_port *endpoint; @@ -54,10 +54,10 @@ static int create_endpoint(struct cxl_memdev *cxlmd, endpoint = devm_cxl_add_port(&parent_port->dev, &cxlmd->dev, cxlds->component_reg_phys, parent_port); if (IS_ERR(endpoint)) - return PTR_ERR(endpoint); + return endpoint; dev_dbg(&cxlmd->dev, "add: %s\n", dev_name(&endpoint->dev)); - return 0; + return endpoint; } /** @@ -123,7 +123,7 @@ static int cxl_mem_probe(struct device *dev) { struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_dev_state *cxlds = cxlmd->cxlds; - struct cxl_port *parent_port; + struct cxl_port *parent_port, *ep_port; int rc; rc = wait_for_media(cxlmd); @@ -182,7 +182,11 @@ static int cxl_mem_probe(struct device *dev) goto out; } - rc = create_endpoint(cxlmd, parent_port); + ep_port = create_endpoint(cxlmd, parent_port); + if (IS_ERR(ep_port)) + rc = PTR_ERR(ep_port); + else + cxlmd->port = ep_port; out: device_unlock(&parent_port->dev); put_device(&parent_port->dev);