From patchwork Wed Feb 19 06:28:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 13981565 Received: from giraffe.ash.relay.mailchannels.net (giraffe.ash.relay.mailchannels.net [23.83.222.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE7C519D882 for ; Wed, 19 Feb 2025 06:29:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=23.83.222.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739946555; cv=pass; b=mXBD1foBDzl93BjFQWoikrmJYts8smMAGB0fuepUkmJBPN8t/wl5GPDlvy/inAaHxGp75a3gn6itCF3a8F900CCOYdDVW60nL6WyaA5Yb9dh/Jg6m9o+C/JfH6wUGs5xZIZKvRGZ9h7FLOwOHYW67nIyBS2k1OFgfBI/rQWF2LQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739946555; c=relaxed/simple; bh=v36LvLSZyPoWkkvMFHJw30bhV3LPqHkLEhalZQr+Ck8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kwAIkEPsOHj6KwzaX1tlYEx+tHCWootvdzFn6yDyOb2tvmsKKOpESC9renvONJG+e8cuFnKYvMklxEEm76ROz41SH7ehHq8WQ4EuJUNZImDtEHjQ5Go6tDBe5nYDo5TXkZIRsWgjHQuJXZeub8WMgJscvdUUnBtavA2MvBlqQmU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net; spf=pass smtp.mailfrom=stgolabs.net; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b=gGswqqZN; arc=pass smtp.client-ip=23.83.222.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b="gGswqqZN" X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 8BC3C2C2980; Wed, 19 Feb 2025 06:29:12 +0000 (UTC) Received: from pdx1-sub0-mail-a223.dreamhost.com (100-99-192-59.trex-nlb.outbound.svc.cluster.local [100.99.192.59]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 1B5752C1751; Wed, 19 Feb 2025 06:29:12 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1739946552; a=rsa-sha256; cv=none; b=O+Eq3/sbaUy7VI7X/ISpD2NUg5A0d6zygUHiOLDuDGCz+nyee9woNTt81N/lq50gJd/jY4 f7kuO8Z+/JYxoNWm39EGf8m8xmRC1og98Ui+uzF95OQl2bU2rMXN6xIySeObDDizdOk726 VN8cvG25DtmWzwyVtAa6sIdJ19NEh+PzTHrGDAXB7ozDnI5WcaI3DgdYhWy05blSSP3YGc IZ33UeQMV0k0xxzlVtzX9v4kROHv/bGmOcSXPV8O98K0QX2dp4DGaFvYdl5WAeTF+0+Wpo Vg2+QkDnsA1AKI65EDAjZabjYmfmv/Sr7514An4UjiQ013c173j+ErdN8M30JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1739946552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tFtZ+ioYAnA8eERmLGxwju+zYUC5gkPAWas38tgbIto=; b=FoYmnQ7FamO8FTQl+JwLmBG/N6fMmwDhiG4QAbsYluSHnkA0vcnQm9ZHz6BqCC09TPtOww acjFb1ZQDujmgRCfcvQ4VX8J9D37bdYmUCEfjwSIr0N/idQkftGl5Pw99AF+CN16jYs1ZS Sib/ATq61/XErID1vQLnhAMgksuhxxz2MOR/I6ozBA4+I2ABlJR+FwXrdnSzjl+hMyo6Zz XRtOePBDUKJ0e2ct2FLXnFIoXet7WllaN7Bwghn7L74t1x6oEwxJb0C9/Gj1M62UW9olyW E4zA9cjERfRIOeTl03T9q6F2zHMjiE4X0V044PSyTyUF7Pzxz1YAUb1qHBtZVw== ARC-Authentication-Results: i=1; rspamd-6d7cc6b78d-cr46q; auth=pass smtp.auth=dreamhost smtp.mailfrom=dave@stgolabs.net X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|dave@stgolabs.net X-MailChannels-Auth-Id: dreamhost X-Hook-Cure: 1d9b26293fee4e82_1739946552407_3590763540 X-MC-Loop-Signature: 1739946552407:3251624839 X-MC-Ingress-Time: 1739946552406 Received: from pdx1-sub0-mail-a223.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.99.192.59 (trex/7.0.2); Wed, 19 Feb 2025 06:29:12 +0000 Received: from localhost.localdomain (ip72-199-50-187.sd.sd.cox.net [72.199.50.187]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dave@stgolabs.net) by pdx1-sub0-mail-a223.dreamhost.com (Postfix) with ESMTPSA id 4YyRLb2Hs8zFh; Tue, 18 Feb 2025 22:29:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stgolabs.net; s=dreamhost; t=1739946552; bh=tFtZ+ioYAnA8eERmLGxwju+zYUC5gkPAWas38tgbIto=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=gGswqqZNij0dYi6e/pWcbd5OcMR4Jjo0Mpk4uYsAGWUc+awq633ENoNcwgFpeDhzn iVikcddtgKCtyGNKmQvkiTk9nZ/6fx2JjcmWUiCRLmuAn8PItOybfjTE9Pn6FVBGh8 izyYgaIGHo7kmL7GJgmykjruFBDqXZiCcAz9dM0LT9hbe3rJ0hWBKHCvcr4O9dWanm dVsr6aQbTMD/fM0RgkpYeXgrny4T4Cv2hOgbQryP5Cz9eRJrlDISHQCTUSXL4ozKSh EZxphMs5xzaZthm3eY8CCT4tGYHwHcB6Lk71ax7dLqvVo+8X3qsUkQevRzr+Qxbynv +9/tMQducRWdQ== From: Davidlohr Bueso To: dave.jiang@intel.com, dan.j.williams@intel.com Cc: jonathan.cameron@huawei.com, alison.schofield@intel.com, ira.weiny@intel.com, vishal.l.verma@intel.com, seven.yi.lee@gmail.com, a.manzanares@samsung.com, fan.ni@samsung.com, anisa.su@samsung.com, dave@stgolabs.net, linux-cxl@vger.kernel.org Subject: [PATCH 1/4] cxl/pci: Introduce cxl_gpf_get_dvsec() Date: Tue, 18 Feb 2025 22:28:29 -0800 Message-Id: <20250219062832.237881-2-dave@stgolabs.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250219062832.237881-1-dave@stgolabs.net> References: <20250219062832.237881-1-dave@stgolabs.net> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add a helper to fetch the port/device GPF dvsecs. This is currently only used for ports, but a later patch to export dirty count to users will make use of the device one. Signed-off-by: Davidlohr Bueso Reviewed-by: Li Ming --- drivers/cxl/core/pci.c | 38 ++++++++++++++++++++++++++++---------- drivers/cxl/cxl.h | 2 ++ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index a5c65f79db18..2226cca3382d 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -1072,6 +1072,27 @@ int cxl_pci_get_bandwidth(struct pci_dev *pdev, struct access_coordinate *c) #define GPF_TIMEOUT_BASE_MAX 2 #define GPF_TIMEOUT_SCALE_MAX 7 /* 10 seconds */ +int cxl_gpf_get_dvsec(struct device *dev, bool port) +{ + struct pci_dev *pdev; + int dvsec; + + if (!dev_is_pci(dev)) + return -EINVAL; + + pdev = to_pci_dev(dev); + if (!pdev) + return -EINVAL; + + dvsec = pci_find_dvsec_capability(pdev, PCI_VENDOR_ID_CXL, + port ? CXL_DVSEC_PORT_GPF : CXL_DVSEC_DEVICE_GPF); + if (!dvsec) + pci_warn(pdev, "%s GPF DVSEC not present\n", + port ? "Port" : "Device"); + return dvsec; +} +EXPORT_SYMBOL_NS_GPL(cxl_gpf_get_dvsec, "CXL"); + static int update_gpf_port_dvsec(struct pci_dev *pdev, int dvsec, int phase) { u64 base, scale; @@ -1116,26 +1137,23 @@ int cxl_gpf_port_setup(struct device *dport_dev, struct cxl_port *port) { struct pci_dev *pdev; - if (!dev_is_pci(dport_dev)) - return 0; - - pdev = to_pci_dev(dport_dev); - if (!pdev || !port) + if (!port) return -EINVAL; if (!port->gpf_dvsec) { int dvsec; - dvsec = pci_find_dvsec_capability(pdev, PCI_VENDOR_ID_CXL, - CXL_DVSEC_PORT_GPF); - if (!dvsec) { - pci_warn(pdev, "Port GPF DVSEC not present\n"); + dvsec = cxl_gpf_get_dvsec(dport_dev, true); + if (dvsec <= 0) return -EINVAL; - } port->gpf_dvsec = dvsec; } + pdev = to_pci_dev(dport_dev); + if (!pdev) + return -EINVAL; + update_gpf_port_dvsec(pdev, port->gpf_dvsec, 1); update_gpf_port_dvsec(pdev, port->gpf_dvsec, 2); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 6baec4ba9141..acbbba41356d 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -901,4 +901,6 @@ bool cxl_endpoint_decoder_reset_detected(struct cxl_port *port); #define __mock static #endif +int cxl_gpf_get_dvsec(struct device *dev, bool port); + #endif /* __CXL_H__ */ From patchwork Wed Feb 19 06:28:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 13981566 Received: from zebra.cherry.relay.mailchannels.net (zebra.cherry.relay.mailchannels.net [23.83.223.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5204B1BBBDD for ; Wed, 19 Feb 2025 06:29:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=23.83.223.195 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739946557; cv=fail; b=OnS0Pxx8STdoT3iriUyf6BiTexnuIYl+jg94ftUviAvGUXnr3bOQmXtLDMq/2LpkgPWZ7znS82rHtq+o+SL2Fhgw9CmvR1tSVz3rpnoLvR/us6x3RdiGXZ7ML27fdJobzLcExumO6nnRr9j+BuZsHWDXnrBorObdR2Fe06b1qps= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739946557; c=relaxed/simple; bh=h8tA71RFrlQhtkBAcVa/w8gdbj9HNuaepjd4KEiMaGQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SCN9ipVGPPygejCHZrCLJM/aN528wQ9JIRGCKH2jni9PFbLX3ynTrjGJyCINcVmdXc0Artyz1r40jatHRox0cWWS30bUySWyK9Rbb8VWLypSVvwXEOS+zTp5Z2smCfx/9A8zgE7DE4MAiq+BnobqZ+iLBE/95yHj/brR5vRtzOM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net; spf=pass smtp.mailfrom=stgolabs.net; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b=pR/zpc5L; arc=fail smtp.client-ip=23.83.223.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b="pR/zpc5L" X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 88DE1322191; Wed, 19 Feb 2025 06:29:13 +0000 (UTC) Received: from pdx1-sub0-mail-a223.dreamhost.com (trex-7.trex.outbound.svc.cluster.local [100.97.164.218]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id F1D633209EF; Wed, 19 Feb 2025 06:29:12 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1739946553; a=rsa-sha256; cv=none; b=H2qsQsotqqbdF2P5Yu74PjLWSsewD45Z0luJdiYZwLDDi/SmE3XDPrROcOtTovV26t5f1W QrSO9l8Eq8wKIddqHGM+NYi5KiiuVedt4+bbpSxnPGChsPvH52yTxHhbSMH/fCH1hzWFn+ 1LARf8e8f9ruvbX+G2BW9tHYEXeHyhWTccMTWBJOPt5UNfR/t2E+DR8QBNFlpZ2yHQHJYG xzxR9m1wp+/m6Nrepw1I9iFFkzGBMY1rU7klaHm++Hr8xc7nSNDSXxTU26NVRU05voeGLg A54jM9XIsT/5BKP8wU+kH94feUb/H1QZbmlRP840FTnpLaKK4olWmjEMT5/qMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1739946553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kNnIhAIy8y5jzKquXxkJ9feqPL5tQp8S1l6poafr0YA=; b=lc1Sl8fwvrp6QBtfYj7hKH+7NC2BSMwSdbfTkQUy+NPmrMsWgw93Oxdzdjmt+yCciDAvNk Sm/x4yU/KKqWdM83qtCIlzgt7tYtJs+ThsrN1OcUp0VIjtz49sApDErp+YIWUwX2bc0acu yUYG/ViPcJQO3PTSA9Dt8FqeOGfPNTfM2G50E1LQJn6bfhlSMWhA3NJ7PTQ9NZRodFWlyZ 38LdKNQzEi87ikyUs822/vCwpOZyYaTZrCjWwb0WWEUdZ/z/e/0Ky4qGz07YEmFg94HEBW BkwDvBDr0fJt7TU3vnE8/HN8scDKdLM0lpZCKY05IP5GmQ0R014zb2+fQiRmtw== ARC-Authentication-Results: i=1; rspamd-6d7cc6b78d-k4sxl; auth=pass smtp.auth=dreamhost smtp.mailfrom=dave@stgolabs.net X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|dave@stgolabs.net X-MailChannels-Auth-Id: dreamhost X-Sponge-Grain: 27d0246870c368aa_1739946553416_541140854 X-MC-Loop-Signature: 1739946553416:1448416348 X-MC-Ingress-Time: 1739946553416 Received: from pdx1-sub0-mail-a223.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.97.164.218 (trex/7.0.2); Wed, 19 Feb 2025 06:29:13 +0000 Received: from localhost.localdomain (ip72-199-50-187.sd.sd.cox.net [72.199.50.187]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dave@stgolabs.net) by pdx1-sub0-mail-a223.dreamhost.com (Postfix) with ESMTPSA id 4YyRLc0rLgzKn; Tue, 18 Feb 2025 22:29:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stgolabs.net; s=dreamhost; t=1739946552; bh=AwjeP9Ekg1SXiXHrkOJ5S+lDI+lScxRU4Ayfo04F65U=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=pR/zpc5LFHBOLUneHfY5mGWV95AOuqd7Cooj9Q5uNq0Fo7VOy4vDpVoNiPSWp00kB iWgrI5+TZyyQWSELLD4At63UWLts6X07OFh4eZMlahgAj0Ac34nzNYf/wP0DYKoYn3 eN8fqQiKGHsmnhFRGPNh4k4ySXuAUFDblshmzgy7cmAXhc5+ltzRqri/V5GzOlIgEm 0LQywL95WDkLmKFGWGafLGGUv7TL0NitZDaEITrQgjvkihUK+iqaEW/L3aadxONqQa h5lWaJg79QvSqd6XPteTYCNC0NZDvrSEWoWHS/Xxn8Clf/VUg/vcFlKpdbPGIhS68z pe8tBwfVL7r6A== From: Davidlohr Bueso To: dave.jiang@intel.com, dan.j.williams@intel.com Cc: jonathan.cameron@huawei.com, alison.schofield@intel.com, ira.weiny@intel.com, vishal.l.verma@intel.com, seven.yi.lee@gmail.com, a.manzanares@samsung.com, fan.ni@samsung.com, anisa.su@samsung.com, dave@stgolabs.net, linux-cxl@vger.kernel.org Subject: [PATCH 2/4] cxl/pmem: Rename cxl_dirty_shutdown_state() Date: Tue, 18 Feb 2025 22:28:30 -0800 Message-Id: <20250219062832.237881-3-dave@stgolabs.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250219062832.237881-1-dave@stgolabs.net> References: <20250219062832.237881-1-dave@stgolabs.net> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 ... to a better suited 'cxl_arm_dirty_shutdown()'. Signed-off-by: Davidlohr Bueso Reviewed-by: Dave Jiang Reviewed-by: Li Ming --- drivers/cxl/core/mbox.c | 4 ++-- drivers/cxl/cxlmem.h | 2 +- drivers/cxl/pmem.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index c5eedcae3b02..86d13f4a1c18 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -1281,7 +1281,7 @@ int cxl_mem_dpa_fetch(struct cxl_memdev_state *mds, struct cxl_dpa_info *info) } EXPORT_SYMBOL_NS_GPL(cxl_mem_dpa_fetch, "CXL"); -int cxl_dirty_shutdown_state(struct cxl_memdev_state *mds) +int cxl_arm_dirty_shutdown(struct cxl_memdev_state *mds) { struct cxl_mailbox *cxl_mbox = &mds->cxlds.cxl_mbox; struct cxl_mbox_cmd mbox_cmd; @@ -1297,7 +1297,7 @@ int cxl_dirty_shutdown_state(struct cxl_memdev_state *mds) return cxl_internal_send_cmd(cxl_mbox, &mbox_cmd); } -EXPORT_SYMBOL_NS_GPL(cxl_dirty_shutdown_state, "CXL"); +EXPORT_SYMBOL_NS_GPL(cxl_arm_dirty_shutdown, "CXL"); int cxl_set_timestamp(struct cxl_memdev_state *mds) { diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index 8e1e46c348f5..6d60030139df 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -822,7 +822,7 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd, enum cxl_event_log_type type, enum cxl_event_type event_type, const uuid_t *uuid, union cxl_event *evt); -int cxl_dirty_shutdown_state(struct cxl_memdev_state *mds); +int cxl_arm_dirty_shutdown(struct cxl_memdev_state *mds); int cxl_set_timestamp(struct cxl_memdev_state *mds); int cxl_poison_state_init(struct cxl_memdev_state *mds); int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len, diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c index a39e2c52d7ab..6b284962592f 100644 --- a/drivers/cxl/pmem.c +++ b/drivers/cxl/pmem.c @@ -90,7 +90,7 @@ static int cxl_nvdimm_probe(struct device *dev) * clear it upon a successful GPF flow. The exception to this * is upon Viral detection, per CXL 3.2 section 12.4.2. */ - if (cxl_dirty_shutdown_state(mds)) + if (cxl_arm_dirty_shutdown(mds)) dev_warn(dev, "GPF: could not dirty shutdown state\n"); dev_set_drvdata(dev, nvdimm); From patchwork Wed Feb 19 06:28:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 13981575 Received: from rusty.tulip.relay.mailchannels.net (rusty.tulip.relay.mailchannels.net [23.83.218.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7667F22F11 for ; Wed, 19 Feb 2025 06:45:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=23.83.218.252 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739947526; cv=pass; b=DwHBeYCtF6vT3c4f975KpWmeIsyt+MAPHpmmTCI62mrWLFVJ5moBGdjNT18XaKP3EMV80kDXpzdXiD9j/DOoA7FJiq5W8wZpddNr7V1brltMY+sdUFVW1TWUnwQINYGUWhmWuc0afJZK8Vrt5eDuMKRQVuJO+yKMMKwyqzWZCVE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739947526; c=relaxed/simple; bh=Yo1mVlU60uv+OVSWS6/nBok9v35JRuSKnH0W3ZYbMd4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HEf8LY9wPQu3wot+ZhusOniwMfoTuLpttlev8VOygOCEuFSyXp36ppiQIReNV02XQG1Zrn3zExYEzyy+DxsRd9RCKJSrPzdi78GVYJuQzLPrMN39vuACz0kwLew5olbYyZ2I+toM550evG53Sk8/Z6B8/S3y/L+tCy57lYyGYso= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net; spf=pass smtp.mailfrom=stgolabs.net; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b=mUppwMCp; arc=pass smtp.client-ip=23.83.218.252 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b="mUppwMCp" X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 5302878320B; Wed, 19 Feb 2025 06:29:14 +0000 (UTC) Received: from pdx1-sub0-mail-a223.dreamhost.com (100-100-209-197.trex-nlb.outbound.svc.cluster.local [100.100.209.197]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id DFFCE782DDE; Wed, 19 Feb 2025 06:29:13 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1739946554; a=rsa-sha256; cv=none; b=1VwZhstJzQH710zzH4mGbA5GLoMzDg2GuXf4AGq1xzQrAdgMf++drKRiMLQQB9AIj9XyeS 0TBQGGiUDs+VWK/QjyOzWbLhEB2qqFZZxFJmu+SZX05GlQ7UIBMpZnBebZ122SdiWr89Be yPPzciqneepdN4jgwPMmvkRMZ9SmzAjcj9T2fN88ekmTphgS2lC3Uf5isi4ZG9aU09fuu1 WL2DQaKPCjt760Xp7bqSWypyaXonWFlBS0jFoOX6e98QEOq8cJJb4Ba5dAXQHo8bNiObbP 7ukBU5mn4Sfx/dVuzJZjOBxSYv/o5OugOjIr3UX2fovcVa03u6FLsMML0J0oDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1739946554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Ep+VlKhuM20wFLB3UUjQe5uf8/ZbfbDSIIG3I14++ds=; b=Sbh3biV0bmMxWqHqEGuQpwnzwB8rQ/EDb+cqhvQxrMmaKN8YXq4yndQkBE/FdrGbaHYncD apufNqcWYivkKmew8XfLsegVR36GjCGxarBuLgxHrn1Ll+n9r69hfSmXwhj+lFq4Z15JOv c+yJxBRRz3DJGbjUExeC0GHbdG3mermmXlm8ya9PMXbOCo9gj8BoggEF2egF8OfN8oe0eN uy7k/S8BYnV4dzgqFT2qwUvWpoAMrkEtp8ex9CIUBt9tZhaKmHvtk6hGNPoA5oAg+noXS3 0OuZgJ/1rMaFbA4EDsU2vc7v//M5/hKct9u4jg9JDIBNmTlTBw1AevsUnv0wIg== ARC-Authentication-Results: i=1; rspamd-6d7cc6b78d-bq9x4; auth=pass smtp.auth=dreamhost smtp.mailfrom=dave@stgolabs.net X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|dave@stgolabs.net X-MailChannels-Auth-Id: dreamhost X-Industry-Shade: 69e0452a42d8eec6_1739946554226_4176659332 X-MC-Loop-Signature: 1739946554226:3279060998 X-MC-Ingress-Time: 1739946554226 Received: from pdx1-sub0-mail-a223.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.100.209.197 (trex/7.0.2); Wed, 19 Feb 2025 06:29:14 +0000 Received: from localhost.localdomain (ip72-199-50-187.sd.sd.cox.net [72.199.50.187]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dave@stgolabs.net) by pdx1-sub0-mail-a223.dreamhost.com (Postfix) with ESMTPSA id 4YyRLc6vskzFh; Tue, 18 Feb 2025 22:29:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stgolabs.net; s=dreamhost; t=1739946553; bh=Ep+VlKhuM20wFLB3UUjQe5uf8/ZbfbDSIIG3I14++ds=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=mUppwMCp3sJ9apGsZL0/LpocG2QIdZ5T1hBye7U9H37WD3Xf/GWc6dTX2SuViebuM HA6PeXi9R9YSlZs6L1dxquG7CcVIkUMNv/KnkIBx2gXVM4f1PluHmwZKQcTvFVzckf APqDGpKk5oO3hJ1zkdUCaLIvA+D4ugkM4c9cXjflcyQmxBZJ/3XmVyIqkM/0J7F5df /J+INMegSvbS4584C3V1DlJ1DgA7RLcixF2eeTL+EiyJ37uIvnP4ZbYc5Jv97Byz6z sudac8mEMtJV0jv0yQc4naZE3avk8tnkANiCWf4hvJqAd2/jszqsMcRjZQ2w2xa7b5 qnzfPMM6gfryg== From: Davidlohr Bueso To: dave.jiang@intel.com, dan.j.williams@intel.com Cc: jonathan.cameron@huawei.com, alison.schofield@intel.com, ira.weiny@intel.com, vishal.l.verma@intel.com, seven.yi.lee@gmail.com, a.manzanares@samsung.com, fan.ni@samsung.com, anisa.su@samsung.com, dave@stgolabs.net, linux-cxl@vger.kernel.org Subject: [PATCH 3/4] cxl/pmem: Export dirty shutdown count via sysfs Date: Tue, 18 Feb 2025 22:28:31 -0800 Message-Id: <20250219062832.237881-4-dave@stgolabs.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250219062832.237881-1-dave@stgolabs.net> References: <20250219062832.237881-1-dave@stgolabs.net> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Similar to how the acpi_nfit driver exports Optane dirty shutdown count, introduce: /sys/bus/cxl/devices/nvdimm-bridge0/ndbusX/nmemY/cxl/dirty_shutdown Under the conditions that 1) dirty shutdown can be set, 2) Device GPF DVSEC exists, and 3) the count itself can be retrieved. Suggested-by: Dan Williams Signed-off-by: Davidlohr Bueso Reviewed-by: Dave Jiang --- Documentation/ABI/testing/sysfs-bus-cxl | 12 +++ Documentation/driver-api/cxl/maturity-map.rst | 2 +- drivers/cxl/core/mbox.c | 21 +++++ drivers/cxl/cxl.h | 1 + drivers/cxl/cxlmem.h | 13 ++++ drivers/cxl/pmem.c | 77 +++++++++++++++++-- 6 files changed, 117 insertions(+), 9 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 3f5627a1210a..a7491d214098 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -586,3 +586,15 @@ Description: See Documentation/ABI/stable/sysfs-devices-node. access0 provides the number to the closest initiator and access1 provides the number to the closest CPU. + + +What: /sys/bus/cxl/devices/nvdimm-bridge0/ndbusX/nmemY/cxl/dirty_shutdown +Date: Feb, 2025 +KernelVersion: v6.15 +Contact: linux-cxl@vger.kernel.org +Description: + (RO) The device dirty shutdown count value, which is the number + of times the device could have incurred in potential data loss. + The count is persistent across power loss and wraps back to 0 + upon overflow. If this file is not present, the device does not + have the necessary support for dirty tracking. diff --git a/Documentation/driver-api/cxl/maturity-map.rst b/Documentation/driver-api/cxl/maturity-map.rst index 99dd2c841e69..a2288f9df658 100644 --- a/Documentation/driver-api/cxl/maturity-map.rst +++ b/Documentation/driver-api/cxl/maturity-map.rst @@ -130,7 +130,7 @@ Mailbox commands * [0] Switch CCI * [3] Timestamp * [1] PMEM labels -* [1] PMEM GPF / Dirty Shutdown +* [3] PMEM GPF / Dirty Shutdown * [0] Scan Media PMU diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index 86d13f4a1c18..f1009a265f9d 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -1281,6 +1281,27 @@ int cxl_mem_dpa_fetch(struct cxl_memdev_state *mds, struct cxl_dpa_info *info) } EXPORT_SYMBOL_NS_GPL(cxl_mem_dpa_fetch, "CXL"); +int cxl_get_dirty_count(struct cxl_memdev_state *mds, u32 *count) +{ + int rc; + struct cxl_mailbox *cxl_mbox = &mds->cxlds.cxl_mbox; + struct cxl_mbox_cmd mbox_cmd; + struct cxl_mbox_get_health_info_out hi; + + mbox_cmd = (struct cxl_mbox_cmd) { + .opcode = CXL_MBOX_OP_GET_HEALTH_INFO, + .size_out = sizeof(hi), + .payload_out = &hi, + }; + + rc = cxl_internal_send_cmd(cxl_mbox, &mbox_cmd); + if (!rc) + *count = le32_to_cpu(hi.dirty_shutdown_cnt); + + return rc; +} +EXPORT_SYMBOL_NS_GPL(cxl_get_dirty_count, "CXL"); + int cxl_arm_dirty_shutdown(struct cxl_memdev_state *mds) { struct cxl_mailbox *cxl_mbox = &mds->cxlds.cxl_mbox; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index acbbba41356d..4dbf1cc60047 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -542,6 +542,7 @@ struct cxl_nvdimm { struct device dev; struct cxl_memdev *cxlmd; u8 dev_id[CXL_DEV_ID_LEN]; /* for nvdimm, string of 'serial' */ + u64 dirty_shutdowns; }; struct cxl_pmem_region_mapping { diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index 6d60030139df..3b6ef9e936c3 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -681,6 +681,18 @@ struct cxl_mbox_set_partition_info { #define CXL_SET_PARTITION_IMMEDIATE_FLAG BIT(0) +/* Get Health Info Output Payload CXL 3.2 Spec 8.2.10.9.3.1 Table 8-148 */ +struct cxl_mbox_get_health_info_out { + u8 health_status; + u8 media_status; + u8 additional_status; + u8 life_used; + __le16 device_temperature; + __le32 dirty_shutdown_cnt; + __le32 corrected_volatile_error_cnt; + __le32 corrected_persistent_error_cnt; +} __packed; + /* Set Shutdown State Input Payload CXL 3.2 Spec 8.2.10.9.3.5 Table 8-152 */ struct cxl_mbox_set_shutdown_state_in { u8 state; @@ -822,6 +834,7 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd, enum cxl_event_log_type type, enum cxl_event_type event_type, const uuid_t *uuid, union cxl_event *evt); +int cxl_get_dirty_count(struct cxl_memdev_state *mds, u32 *count); int cxl_arm_dirty_shutdown(struct cxl_memdev_state *mds); int cxl_set_timestamp(struct cxl_memdev_state *mds); int cxl_poison_state_init(struct cxl_memdev_state *mds); diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c index 6b284962592f..aee1afe9d287 100644 --- a/drivers/cxl/pmem.c +++ b/drivers/cxl/pmem.c @@ -42,15 +42,44 @@ static ssize_t id_show(struct device *dev, struct device_attribute *attr, char * } static DEVICE_ATTR_RO(id); +static ssize_t dirty_shutdown_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct nvdimm *nvdimm = to_nvdimm(dev); + struct cxl_nvdimm *cxl_nvd = nvdimm_provider_data(nvdimm); + + return sysfs_emit(buf, "%lld\n", cxl_nvd->dirty_shutdowns); +} +static DEVICE_ATTR_RO(dirty_shutdown); + static struct attribute *cxl_dimm_attributes[] = { &dev_attr_id.attr, &dev_attr_provider.attr, + &dev_attr_dirty_shutdown.attr, NULL }; +#define CXL_INVALID_DIRTY_SHUTDOWN_COUNT -1 +static umode_t cxl_dimm_visible(struct kobject *kobj, + struct attribute *a, int n) +{ + if (a == &dev_attr_dirty_shutdown.attr) { + struct device *dev = kobj_to_dev(kobj); + struct nvdimm *nvdimm = to_nvdimm(dev); + struct cxl_nvdimm *cxl_nvd = nvdimm_provider_data(nvdimm); + + if (cxl_nvd->dirty_shutdowns == + CXL_INVALID_DIRTY_SHUTDOWN_COUNT) + return 0; + } + + return a->mode; +} + static const struct attribute_group cxl_dimm_attribute_group = { .name = "cxl", .attrs = cxl_dimm_attributes, + .is_visible = cxl_dimm_visible }; static const struct attribute_group *cxl_dimm_attribute_groups[] = { @@ -58,6 +87,38 @@ static const struct attribute_group *cxl_dimm_attribute_groups[] = { NULL }; +static void cxl_nvdimm_setup_dirty_tracking(struct cxl_nvdimm *cxl_nvd) +{ + u32 count; + struct cxl_memdev *cxlmd = cxl_nvd->cxlmd; + struct cxl_dev_state *cxlds = cxlmd->cxlds; + struct cxl_memdev_state *mds = to_cxl_memdev_state(cxlds); + struct device *dev = &cxl_nvd->dev; + + /* + * Dirty tracking is enabled and exposed to the user, only when: + * - dirty shutdown on the device can be set, and, + * - the device has a Device GPF DVSEC (albeit unused), and, + * - the Get Health Info cmd can retrieve the device's dirty count. + */ + cxl_nvd->dirty_shutdowns = CXL_INVALID_DIRTY_SHUTDOWN_COUNT; + + if (cxl_arm_dirty_shutdown(mds)) { + dev_warn(dev, "GPF: could not set dirty shutdown state\n"); + return; + } + + if (cxl_gpf_get_dvsec(cxlds->dev, false) <= 0) + return; + + if (cxl_get_dirty_count(mds, &count)) { + dev_warn(dev, "GPF: could not retrieve dirty count\n"); + return; + } + + cxl_nvd->dirty_shutdowns = count; +} + static int cxl_nvdimm_probe(struct device *dev) { struct cxl_nvdimm *cxl_nvd = to_cxl_nvdimm(dev); @@ -78,20 +139,20 @@ static int cxl_nvdimm_probe(struct device *dev) set_bit(ND_CMD_GET_CONFIG_SIZE, &cmd_mask); set_bit(ND_CMD_GET_CONFIG_DATA, &cmd_mask); set_bit(ND_CMD_SET_CONFIG_DATA, &cmd_mask); - nvdimm = __nvdimm_create(cxl_nvb->nvdimm_bus, cxl_nvd, - cxl_dimm_attribute_groups, flags, - cmd_mask, 0, NULL, cxl_nvd->dev_id, - cxl_security_ops, NULL); - if (!nvdimm) - return -ENOMEM; /* * Set dirty shutdown now, with the expectation that the device * clear it upon a successful GPF flow. The exception to this * is upon Viral detection, per CXL 3.2 section 12.4.2. */ - if (cxl_arm_dirty_shutdown(mds)) - dev_warn(dev, "GPF: could not dirty shutdown state\n"); + cxl_nvdimm_setup_dirty_tracking(cxl_nvd); + + nvdimm = __nvdimm_create(cxl_nvb->nvdimm_bus, cxl_nvd, + cxl_dimm_attribute_groups, flags, + cmd_mask, 0, NULL, cxl_nvd->dev_id, + cxl_security_ops, NULL); + if (!nvdimm) + return -ENOMEM; dev_set_drvdata(dev, nvdimm); return devm_add_action_or_reset(dev, unregister_nvdimm, nvdimm); From patchwork Wed Feb 19 06:28:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 13981571 Received: from crocodile.elm.relay.mailchannels.net (crocodile.elm.relay.mailchannels.net [23.83.212.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0417E4C6D for ; Wed, 19 Feb 2025 06:39:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=23.83.212.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739947161; cv=pass; b=II3kvQgJ7qRe1NJFbI9t6oSFznQTk2LF100XUgKPZqiUhFjWBOVbjuBrpgAmv6VbvqbeP6ujN7RC2r2EJOc+c0cLg3jQyL6yvceFrhxMMZPvGpGi1TAyv7p8CIL5qdUmV444+q8b9eSfEhENyGqC/azerGhVhOXOcEawdFAkVa4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739947161; c=relaxed/simple; bh=fixYkbbpMpN+IFI9hXDzeqe1oXfjB+UxqhKAOZJeIHs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oUk9wnZZFqj3isVith7nTKln6o7sAnCZ6+rc9cik7d4YTlMhQbSXyHom1GHM0FFL8Xn0wEnVddwxIVXLpU0mlZHZWV0/infHTOFV2OKCD4Xp4JsawBKxgjL9snelyMuYgqqJfQkdD1gUFDjABk5KlwhNfo45Sd8Quvs/609rr2Q= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net; spf=pass smtp.mailfrom=stgolabs.net; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b=ZXAynl5i; arc=pass smtp.client-ip=23.83.212.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b="ZXAynl5i" X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 329721C0579; Wed, 19 Feb 2025 06:29:15 +0000 (UTC) Received: from pdx1-sub0-mail-a223.dreamhost.com (trex-6.trex.outbound.svc.cluster.local [100.100.209.197]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id B468A1C0850; Wed, 19 Feb 2025 06:29:14 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1739946554; a=rsa-sha256; cv=none; b=zu4M2Ib9Uy9tw/jt97ToxDceD+xO6Tm26ps1EIhWbJI06Fhd07b7tKXb/k5Mk8IqtcbtjH gFPom+XQfmPrwCaIIIzn0DlbkNQmPyDJjDcSAMBlPcOqDI2Wf6m/3a7OSjabObkWnkb6Iw xbsWheEygt/e3YBVF44fjw5uZyDtfD8DeQgtxiI5LwlVR/BmTvzh2IcmlwUdxnL/R/m0IE zmwqUw7v3PvsiBTpcU94EgxHQSjWRPCnC51NQMz5ZlIi0cIClP6rz/TSgqEaqvB59upgiy eQ0eZlvCBLgfvgTWdFLUk+SizAONUKbajdQ34yTMHsvbm5lZFEpcoRDkFzZluw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1739946554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OgVWa1w0Glp7+aIcrEC6ne8i2ADuKDrBVq8uQMTjI+0=; b=eevlA2yNdCofZFNpPbGXjcUomdENiUljyfgHXTilQ2znBYSvt6pfUe1NfJalyhHpTEcW/a sd4pv3k6BrgxRv3mfquYtYAOIe1B8PLtFwjMa+bJF52B0t1Bxagm2WhhWY0pb8IdUYIXaJ 5pnYWUuPCo/TV/pnHZJESq9mMVbfUiGNlsKxPtYdUtBw1DDOKRpzb+n2NrAoYVAXNMyd3E KJIjM7Gq397tCsvhHvZvvZUMzvr3UahNn4ckIslSzA5tcjvZcIQO3aG+yZfAKH2JZqmIuw 77ZuCt0v/DDIAhf+0EAnI4/Afeii1mU/9F2zrZshX3k6XeUr+JVLMuB+rfzH0A== ARC-Authentication-Results: i=1; rspamd-6d7cc6b78d-cf5kg; auth=pass smtp.auth=dreamhost smtp.mailfrom=dave@stgolabs.net X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|dave@stgolabs.net X-MailChannels-Auth-Id: dreamhost X-Shrill-Name: 21cbc419396c7fc6_1739946555096_3204543989 X-MC-Loop-Signature: 1739946555096:3694675468 X-MC-Ingress-Time: 1739946555096 Received: from pdx1-sub0-mail-a223.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.100.209.197 (trex/7.0.2); Wed, 19 Feb 2025 06:29:15 +0000 Received: from localhost.localdomain (ip72-199-50-187.sd.sd.cox.net [72.199.50.187]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dave@stgolabs.net) by pdx1-sub0-mail-a223.dreamhost.com (Postfix) with ESMTPSA id 4YyRLd5ZP3zFb; Tue, 18 Feb 2025 22:29:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stgolabs.net; s=dreamhost; t=1739946554; bh=OgVWa1w0Glp7+aIcrEC6ne8i2ADuKDrBVq8uQMTjI+0=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=ZXAynl5i13g0m1CFKQyaHE1TsIS/PUf5KQKsqz+zKwVHGtCIcZM66pi2M7ck01ZRl dallz4cX6q18p30vPLl5xTRxr+bTbpqqmrkpzRUmtU+V4/hbC2I8uKE4CEVBSxXvRC SoQEM9hg8rPejXBvom79JCMhiEt0IklKl2tG0l3n549k+eZQ2S6lm3aCchrZpdoYDP u6UC0jwvTVntDq5+KqY1ekhRM63zk5ayT8d70q0Pv5sNXV7GaWKrhukxaKrp12uMAQ zbJEe7nYWZZpvjhBAmdztcn+QJy7iOVl14uZHessujgzS9meAStN7I74biD7IyAkBO jbs17t447/SMQ== From: Davidlohr Bueso To: dave.jiang@intel.com, dan.j.williams@intel.com Cc: jonathan.cameron@huawei.com, alison.schofield@intel.com, ira.weiny@intel.com, vishal.l.verma@intel.com, seven.yi.lee@gmail.com, a.manzanares@samsung.com, fan.ni@samsung.com, anisa.su@samsung.com, dave@stgolabs.net, linux-cxl@vger.kernel.org Subject: [PATCH 4/4] tools/testing/cxl: Set Shutdown State support Date: Tue, 18 Feb 2025 22:28:32 -0800 Message-Id: <20250219062832.237881-5-dave@stgolabs.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250219062832.237881-1-dave@stgolabs.net> References: <20250219062832.237881-1-dave@stgolabs.net> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add support to emulate the CXL Set Shutdown State operation. Reviewed-by: Dave Jiang Signed-off-by: Davidlohr Bueso Reviewed-by: Li Ming --- tools/testing/cxl/test/mem.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c index 495199238335..832680a87c73 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -65,6 +65,10 @@ static struct cxl_cel_entry mock_cel[] = { .opcode = cpu_to_le16(CXL_MBOX_OP_GET_HEALTH_INFO), .effect = CXL_CMD_EFFECT_NONE, }, + { + .opcode = cpu_to_le16(CXL_MBOX_OP_SET_SHUTDOWN_STATE), + .effect = POLICY_CHANGE_IMMEDIATE, + }, { .opcode = cpu_to_le16(CXL_MBOX_OP_GET_POISON), .effect = CXL_CMD_EFFECT_NONE, @@ -161,6 +165,7 @@ struct cxl_mockmem_data { u8 event_buf[SZ_4K]; u64 timestamp; unsigned long sanitize_timeout; + int shutdown_state; }; static struct mock_event_log *event_find_log(struct device *dev, int log_type) @@ -1088,6 +1093,21 @@ static int mock_health_info(struct cxl_mbox_cmd *cmd) return 0; } +static int mock_set_shutdown_state(struct cxl_mockmem_data *mdata, + struct cxl_mbox_cmd *cmd) +{ + struct cxl_mbox_set_shutdown_state_in *ss = cmd->payload_in; + + if (cmd->size_in != sizeof(*ss)) + return -EINVAL; + + if (cmd->size_out != 0) + return -EINVAL; + + mdata->shutdown_state = ss->state; + return 0; +} + static struct mock_poison { struct cxl_dev_state *cxlds; u64 dpa; @@ -1421,6 +1441,9 @@ static int cxl_mock_mbox_send(struct cxl_mailbox *cxl_mbox, case CXL_MBOX_OP_PASSPHRASE_SECURE_ERASE: rc = mock_passphrase_secure_erase(mdata, cmd); break; + case CXL_MBOX_OP_SET_SHUTDOWN_STATE: + rc = mock_set_shutdown_state(mdata, cmd); + break; case CXL_MBOX_OP_GET_POISON: rc = mock_get_poison(cxlds, cmd); break;