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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9862CC05027 for ; Fri, 10 Feb 2023 17:41:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 308EB6B016A; Fri, 10 Feb 2023 12:41:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2911E6B016B; Fri, 10 Feb 2023 12:41:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 132446B016C; Fri, 10 Feb 2023 12:41:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F04616B016A for ; Fri, 10 Feb 2023 12:41:20 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C5A371A0DFB for ; Fri, 10 Feb 2023 17:41:20 +0000 (UTC) X-FDA: 80452098720.11.868CFF4 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by imf16.hostedemail.com (Postfix) with ESMTP id 93D47180003 for ; Fri, 10 Feb 2023 17:41:18 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of jonathan.cameron@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=jonathan.cameron@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676050879; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LN9QOG7Ydh0Ex95Zqp+UfufVJAPrJN53rf4CmXjnopk=; b=U+5Mr9Gu9r8/gV0O1XeIcJAPjt7p6vaI+ZSwT99+wXn3eIc521f8KNc53vSeKJby0hK/QS 27oezWJlXyBhZe4Q0Zg4mpK+49MmjWie9+Zr5axFZdXBU5nBy+HhFQWnaAR5zR8rVv+Kfa ZvJjBLR7+b2Q7wjZ/iVcFz7OSA56wtE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of jonathan.cameron@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=jonathan.cameron@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676050879; a=rsa-sha256; cv=none; b=lf0kPT9HeO88kI+C9vfCb0RZwdhOeyBi2UV8iSwfN378oe7GOjcQKPDibIOO2FZ+tZXRII 1FnECmRYpd4etE18bPcDX+D/OQvuTqlaNU8E+iF6lfJMdZNSmBn0g36vQNSrIX7zS929dC CXBc24zJUJF0wx8n9ilyXQy1+28TWgg= Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4PD1BP4Wt4z67Qtq; Sat, 11 Feb 2023 01:36:45 +0800 (CST) Received: from localhost (10.81.210.211) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Fri, 10 Feb 2023 17:41:14 +0000 Date: Fri, 10 Feb 2023 17:41:13 +0000 From: Jonathan Cameron To: Dan Williams CC: , , , , Subject: Re: [PATCH v2 12/20] cxl/port: Split endpoint and switch port probe Message-ID: <20230210174113.000079d0@Huawei.com> In-Reply-To: <167601999378.1924368.15071142145866277623.stgit@dwillia2-xfh.jf.intel.com> References: <167601992097.1924368.18291887895351917895.stgit@dwillia2-xfh.jf.intel.com> <167601999378.1924368.15071142145866277623.stgit@dwillia2-xfh.jf.intel.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.81.210.211] X-ClientProxiedBy: lhrpeml500004.china.huawei.com (7.191.163.9) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 1cy9wjo3gmt9eh7kug56oaadg4d53y6y X-Rspamd-Queue-Id: 93D47180003 X-HE-Tag: 1676050878-943253 X-HE-Meta: U2FsdGVkX1+vuJrlERnBrsK2dMaQ5y2i3QYT0A+HukIh4tKixfyPmm+jMpxSh1bmkbem7lSZ4Zcc3TminZ2As5RGuvS96FpsXFmL9AJ5TXNLCKW0p+z0pJdMG1bVvXNlkKgR9j/zijQCxDowp7JeoyyzzXegSfUkSLy978s+p2Nx9+HdO1oA+UePSi1dU7ZbxOuXwxWl+Nvp5k2JBK0ltCrEOYJOOc3CvZpTvWLTUUMSLIU5NkPkrF5ii5wFqj+rFekiuibU79OkSJod8engmPRZBhxASGLmY2GY3fXulNPar3wU/f4SJvS1igKWBzdHRLxeMCgFsR9EW73s+yOJHRRkK8+Iy0JNdlgxq+/v8v8oimQuJblLaY7tzKT6k7bm7eKFuUx3EdQm4vzjGMhAyqiTuly8JzlhBrwHaQ5uqKaVLm4dYV4atdNGZgxZxJ7e+jMMq3cnjLEQoiVoVumtO3aZcyy0u4qyn1DZ8mSO5Dk9Zj8RggU13n3zfwGuR1GJM1k36GIJFi9x0USZFp5wbyEcQa9Q8TDSKuhYvTrtNIGYnYmt8y6JoBg89aPfYqbGJVfVOgl3gdOJmJtM5y0EMLlvwAwt1AF+sBy3QknZkjgoPJkU3V6ykWOm12a0AG52oHInxmV5l8SfMEszqdvAPD5/zT3N72Eh4hSzhQY2cDkAm5IJb/fnmKb55D0AEkD2LXTiW/mLYjh9cpyfSe2suQcVM/gflUrDgdbhqghikSh+e7/Ad05srCccbRkaF2O5C0qBT8WZ1B3PIiJ07Xiex5+f8UWAcN2uEUDT3rxO5gghwHYWAxAlirgAXCjXcLduBYtZq2Yj+WOvQvyxqPokwgc8mmfhipCbHXHxXo1YlPfGrGKotmX1+i3DQHWlDz0/Op4qNiM2J+1Q1U9UC9v9f48XJLxuVzm8vSogv+GGbhj7DaceY/K7HBpWr6U7ol4eO2z5uccmhLTjGAiTW9O 5DXanzxP DOPqNZMXKTskr0G0CJ0fmUD572IG8O4sY6IV/FSiu3kUevb3eD096uAILel9fMhZLc9QOXo3sn2vPScYcjdV6lOQdPIODkSpUJtoKCC3OKb/pMg7MYFFqeFaBtegDBUmdsa1fmRUBDICzhh0R6MP1U2vKQI2Y3cD+s/x75KcWpfn7TiiHY++8zhshrGMwl8ujusOsTrLsHlqIciLSftSvR7fugXFQHkMSw+C8+VkSvfOJraKRvM5ertrHhL7yp6zljz5M18O/1WVV6HQ3vgYO+nP1dXGcWp7b4Ag7KlfdDs1FSXDJ9Vbs1k0sl3+K2P+KUOJjtaeXZrzr3dA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, 10 Feb 2023 01:06:33 -0800 Dan Williams wrote: > Jonathan points out that the shared code between the switch and endpoint > case is small. Before adding another is_cxl_endpoint() conditional, > just split the two cases. > > Rather than duplicate the "Couldn't enumerate decoders" error message > take the opportunity to improve the error messages in > devm_cxl_enumerate_decoders(). > > Reported-by: Jonathan Cameron > Link: http://lore.kernel.org/r/20230208170724.000067ec@Huawei.com > Signed-off-by: Dan Williams LGTM. Reviewed-by: Jonathan Cameron > --- > drivers/cxl/core/hdm.c | 11 ++++++-- > drivers/cxl/port.c | 69 +++++++++++++++++++++++++++--------------------- > 2 files changed, 47 insertions(+), 33 deletions(-) > > diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c > index dcc16d7cb8f3..a0891c3464f1 100644 > --- a/drivers/cxl/core/hdm.c > +++ b/drivers/cxl/core/hdm.c > @@ -826,7 +826,8 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) > cxled = cxl_endpoint_decoder_alloc(port); > if (IS_ERR(cxled)) { > dev_warn(&port->dev, > - "Failed to allocate the decoder\n"); > + "Failed to allocate decoder%d.%d\n", > + port->id, i); > return PTR_ERR(cxled); > } > cxld = &cxled->cxld; > @@ -836,7 +837,8 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) > cxlsd = cxl_switch_decoder_alloc(port, target_count); > if (IS_ERR(cxlsd)) { > dev_warn(&port->dev, > - "Failed to allocate the decoder\n"); > + "Failed to allocate decoder%d.%d\n", > + port->id, i); > return PTR_ERR(cxlsd); > } > cxld = &cxlsd->cxld; > @@ -844,13 +846,16 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) > > rc = init_hdm_decoder(port, cxld, target_map, hdm, i, &dpa_base); > if (rc) { > + dev_warn(&port->dev, > + "Failed to initialize decoder%d.%d\n", > + port->id, i); > put_device(&cxld->dev); > return rc; > } > rc = add_hdm_decoder(port, cxld, target_map); > if (rc) { > dev_warn(&port->dev, > - "Failed to add decoder to port\n"); > + "Failed to add decoder%d.%d\n", port->id, i); > return rc; > } > } > diff --git a/drivers/cxl/port.c b/drivers/cxl/port.c > index 5453771bf330..a8d46a67b45e 100644 > --- a/drivers/cxl/port.c > +++ b/drivers/cxl/port.c > @@ -30,55 +30,64 @@ static void schedule_detach(void *cxlmd) > schedule_cxl_memdev_detach(cxlmd); > } > > -static int cxl_port_probe(struct device *dev) > +static int cxl_switch_port_probe(struct cxl_port *port) > { > - struct cxl_port *port = to_cxl_port(dev); > struct cxl_hdm *cxlhdm; > int rc; > > + rc = devm_cxl_port_enumerate_dports(port); > + if (rc < 0) > + return rc; > > - if (!is_cxl_endpoint(port)) { > - rc = devm_cxl_port_enumerate_dports(port); > - if (rc < 0) > - return rc; > - if (rc == 1) > - return devm_cxl_add_passthrough_decoder(port); > - } > + if (rc == 1) > + return devm_cxl_add_passthrough_decoder(port); > > cxlhdm = devm_cxl_setup_hdm(port); > if (IS_ERR(cxlhdm)) > return PTR_ERR(cxlhdm); > > - if (is_cxl_endpoint(port)) { > - struct cxl_memdev *cxlmd = to_cxl_memdev(port->uport); > - struct cxl_dev_state *cxlds = cxlmd->cxlds; > + return devm_cxl_enumerate_decoders(cxlhdm); > +} > > - /* Cache the data early to ensure is_visible() works */ > - read_cdat_data(port); > +static int cxl_endpoint_port_probe(struct cxl_port *port) > +{ > + struct cxl_memdev *cxlmd = to_cxl_memdev(port->uport); > + struct cxl_dev_state *cxlds = cxlmd->cxlds; > + struct cxl_hdm *cxlhdm; > + int rc; > + > + cxlhdm = devm_cxl_setup_hdm(port); > + if (IS_ERR(cxlhdm)) > + return PTR_ERR(cxlhdm); > > - get_device(&cxlmd->dev); > - rc = devm_add_action_or_reset(dev, schedule_detach, cxlmd); > - if (rc) > - return rc; > + /* Cache the data early to ensure is_visible() works */ > + read_cdat_data(port); > > - rc = cxl_hdm_decode_init(cxlds, cxlhdm); > - if (rc) > - return rc; > + get_device(&cxlmd->dev); > + rc = devm_add_action_or_reset(&port->dev, schedule_detach, cxlmd); > + if (rc) > + return rc; > > - rc = cxl_await_media_ready(cxlds); > - if (rc) { > - dev_err(dev, "Media not active (%d)\n", rc); > - return rc; > - } > - } > + rc = cxl_hdm_decode_init(cxlds, cxlhdm); > + if (rc) > + return rc; > > - rc = devm_cxl_enumerate_decoders(cxlhdm); > + rc = cxl_await_media_ready(cxlds); > if (rc) { > - dev_err(dev, "Couldn't enumerate decoders (%d)\n", rc); > + dev_err(&port->dev, "Media not active (%d)\n", rc); > return rc; > } > > - return 0; > + return devm_cxl_enumerate_decoders(cxlhdm); > +} > + > +static int cxl_port_probe(struct device *dev) > +{ > + struct cxl_port *port = to_cxl_port(dev); > + > + if (is_cxl_endpoint(port)) > + return cxl_endpoint_port_probe(port); > + return cxl_switch_port_probe(port); > } > > static ssize_t CDAT_read(struct file *filp, struct kobject *kobj, >