From patchwork Tue Jul 2 06:04:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 13718999 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93244747F; Tue, 2 Jul 2024 06:04:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719900294; cv=none; b=k2kbM/NxKJItnm0IsIDLcs8nKOlBOzH90STNjIZenJE7yQmg31Ps0rEkAjWxRvhuqM5gCimwYQWJ14QbEyHnskaU9K1ytocFuP4uA8hMDV2vL2qxt/JGZ3AwpgKhe9b15glmiVj68UDxG2iltUIsnk1xpOLtzo+YVzzv/aeeob0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719900294; c=relaxed/simple; bh=XJbekVCGRI2zpK4kIArp8YHfa0KmPlBLFHyM9n37db0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XaaZ8IfXysYGflJqehEBUQZvzW4B6J+81ZuV3mocG4adJPKajgPaktCjM+ZidoWLycDBMeiz6YtkFZ7QpFCt3TF3b87J9nZiD+O7RBR1aziBciLohgRf0M6w8iPadaB9gBuGIxaETj9dYWdi8n/pwSLLB7JfFgqKUSqB3t7KtJ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BeN+r15A; arc=none smtp.client-ip=209.85.215.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BeN+r15A" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-7226821ad86so2277605a12.2; Mon, 01 Jul 2024 23:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719900292; x=1720505092; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vPtTOSwTWC9IRJwVl7bNpramqOg1YnEqve+Q/QB+r0s=; b=BeN+r15AjKaf5XZ2w8mVVrMHzCJJCA+RzQmpjE7/iGX3a8iMqBbqMZJG/+jf9kZ7jz dLTegDCLdmpnYI1YTpvTMpDUDu1USIodwzXG6pPVa7nvquOefViPW9LG4oBxlEB1e5vz fYhQkuqHrvwBtPYyJ1F2VynEB2TojzBHANGMwGo8qDX5TC1w9VYbWlVoLwC47J6o9R7Q 8S+7bCGak3YqkB2cd/L33ugAT4Gkoo9Xa33jDXTr4QVzMOFpOjPb4VFU2opuhdJVsTCA /wR8J/KGhVrfbj625zfM2dcnM6WegmMzGuQhcE2G4PYBM03t0mUMw60R5ZNqONs6OgVN OMAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719900292; x=1720505092; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vPtTOSwTWC9IRJwVl7bNpramqOg1YnEqve+Q/QB+r0s=; b=OZHjMyd3ItrHrCqX1HFJSb7qZOE+14rQEl70/o/IPRNNce0le/xXmQQftEiifFq6Vl KqABXrvZ02L5CKWsf9TYf58ZPirvwpoYOpIsVojuDqhgcQwT1ZwKDaxgOM+Egh93GkVk 15usVK413ndZEhR1kkPULn13o1n4oihU/9x+KCpGwaUTadkQATi8lAL2JeNhE0O5o2Op PlUrOl2smqsco4Mm0QZnalnhi7TWcDh57y0fwueVMM2KLU4VgGN2JEJwc+5TClZcVZd5 XYKMrYj1R0NbmV8GzdmpXMofmVxICXG582qaieT8NAg3dKkN7wE4f8lpRZ09zhtQkqyj 39iA== X-Forwarded-Encrypted: i=1; AJvYcCUFNtR9dMwwq6zgJV+wdgoUYxxHpmkUeQCDfSybHfTvfEqEMtvr+pZ2RMLIuvg1suvaQ1v2TBt1VlnIKUReAvFjuMxjOAbBI6DpDGTicXzI32vM8stY7Qzc1bGZdIxYmcbgfj5hwg+R X-Gm-Message-State: AOJu0Yz7hjRfdNEg/VD1m9KoU9xoSRoFUPmmalEC2F3j9Gjp61fqTZlo 3NqV4+3iRljND6FW2NAF6i5azjmKx8AkefZSS2K0MnAfbXEynlM9 X-Google-Smtp-Source: AGHT+IGtip74DVlK4Ct/5qLSCWTMsvzbDzvfcCqdfFnflO5RF+PCHP6h+NrFBgcOqOP/P0pB4ke6/A== X-Received: by 2002:a05:6a20:914d:b0:1be:e05c:8c70 with SMTP id adf61e73a8af0-1bef6199934mr7140605637.37.1719900291654; Mon, 01 Jul 2024 23:04:51 -0700 (PDT) Received: from toolbox.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fac10d23edsm75484225ad.58.2024.07.01.23.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 23:04:51 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: bhelgaas@google.com, linux-pci@vger.kernel.org, Jonathan.Cameron@huawei.com, lukas@wunner.de Cc: alex.williamson@redhat.com, christian.koenig@amd.com, kch@nvidia.com, gregkh@linuxfoundation.org, logang@deltatee.com, linux-kernel@vger.kernel.org, alistair23@gmail.com, chaitanyak@nvidia.com, rdunlap@infradead.org, Alistair Francis Subject: [PATCH v13 1/4] PCI/DOE: Rename DOE protocol to feature Date: Tue, 2 Jul 2024 16:04:15 +1000 Message-ID: <20240702060418.387500-1-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DOE r1.1 replaced all occurrences of "protocol" with the term "feature" or "Data Object Type". PCIe r6.1 (which was published July 24) incorporated that change. Rename the existing terms protocol with feature. Signed-off-by: Alistair Francis Reviewed-by: Jonathan Cameron Reviewed-by: Lukas Wunner --- v13: - No changes v12: - No changes v11: - No changes v10: - Split original patch into two v9: - Rename two more DOE macros v8: - Rename prot to feat as well v7: - Initial patch drivers/pci/doe.c | 88 +++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/drivers/pci/doe.c b/drivers/pci/doe.c index 652d63df9d22..f776f5304a3e 100644 --- a/drivers/pci/doe.c +++ b/drivers/pci/doe.c @@ -22,7 +22,7 @@ #include "pci.h" -#define PCI_DOE_PROTOCOL_DISCOVERY 0 +#define PCI_DOE_FEATURE_DISCOVERY 0 /* Timeout of 1 second from 6.30.2 Operation, PCI Spec r6.0 */ #define PCI_DOE_TIMEOUT HZ @@ -43,7 +43,7 @@ * * @pdev: PCI device this mailbox belongs to * @cap_offset: Capability offset - * @prots: Array of protocols supported (encoded as long values) + * @feats: Array of features supported (encoded as long values) * @wq: Wait queue for work item * @work_queue: Queue of pci_doe_work items * @flags: Bit array of PCI_DOE_FLAG_* flags @@ -51,14 +51,14 @@ struct pci_doe_mb { struct pci_dev *pdev; u16 cap_offset; - struct xarray prots; + struct xarray feats; wait_queue_head_t wq; struct workqueue_struct *work_queue; unsigned long flags; }; -struct pci_doe_protocol { +struct pci_doe_feature { u16 vid; u8 type; }; @@ -66,7 +66,7 @@ struct pci_doe_protocol { /** * struct pci_doe_task - represents a single query/response * - * @prot: DOE Protocol + * @feat: DOE Feature * @request_pl: The request payload * @request_pl_sz: Size of the request payload (bytes) * @response_pl: The response payload @@ -78,7 +78,7 @@ struct pci_doe_protocol { * @doe_mb: Used internally by the mailbox */ struct pci_doe_task { - struct pci_doe_protocol prot; + struct pci_doe_feature feat; const __le32 *request_pl; size_t request_pl_sz; __le32 *response_pl; @@ -171,8 +171,8 @@ static int pci_doe_send_req(struct pci_doe_mb *doe_mb, length = 0; /* Write DOE Header */ - val = FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_1_VID, task->prot.vid) | - FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, task->prot.type); + val = FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_1_VID, task->feat.vid) | + FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, task->feat.type); pci_write_config_dword(pdev, offset + PCI_DOE_WRITE, val); pci_write_config_dword(pdev, offset + PCI_DOE_WRITE, FIELD_PREP(PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH, @@ -217,12 +217,12 @@ static int pci_doe_recv_resp(struct pci_doe_mb *doe_mb, struct pci_doe_task *tas int i = 0; u32 val; - /* Read the first dword to get the protocol */ + /* Read the first dword to get the feature */ pci_read_config_dword(pdev, offset + PCI_DOE_READ, &val); - if ((FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_VID, val) != task->prot.vid) || - (FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, val) != task->prot.type)) { - dev_err_ratelimited(&pdev->dev, "[%x] expected [VID, Protocol] = [%04x, %02x], got [%04x, %02x]\n", - doe_mb->cap_offset, task->prot.vid, task->prot.type, + if ((FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_VID, val) != task->feat.vid) || + (FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, val) != task->feat.type)) { + dev_err_ratelimited(&pdev->dev, "[%x] expected [VID, Feature] = [%04x, %02x], got [%04x, %02x]\n", + doe_mb->cap_offset, task->feat.vid, task->feat.type, FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_VID, val), FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, val)); return -EIO; @@ -384,7 +384,7 @@ static void pci_doe_task_complete(struct pci_doe_task *task) } static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u16 *vid, - u8 *protocol) + u8 *feature) { u32 request_pl = FIELD_PREP(PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX, *index) | @@ -395,7 +395,7 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1 u32 response_pl; int rc; - rc = pci_doe(doe_mb, PCI_VENDOR_ID_PCI_SIG, PCI_DOE_PROTOCOL_DISCOVERY, + rc = pci_doe(doe_mb, PCI_VENDOR_ID_PCI_SIG, PCI_DOE_FEATURE_DISCOVERY, &request_pl_le, sizeof(request_pl_le), &response_pl_le, sizeof(response_pl_le)); if (rc < 0) @@ -406,7 +406,7 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1 response_pl = le32_to_cpu(response_pl_le); *vid = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID, response_pl); - *protocol = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL, + *feature = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL, response_pl); *index = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX, response_pl); @@ -414,12 +414,12 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1 return 0; } -static void *pci_doe_xa_prot_entry(u16 vid, u8 prot) +static void *pci_doe_xa_feat_entry(u16 vid, u8 prot) { return xa_mk_value((vid << 8) | prot); } -static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) +static int pci_doe_cache_features(struct pci_doe_mb *doe_mb) { u8 index = 0; u8 xa_idx = 0; @@ -438,11 +438,11 @@ static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) return rc; pci_dbg(doe_mb->pdev, - "[%x] Found protocol %d vid: %x prot: %x\n", + "[%x] Found feature %d vid: %x prot: %x\n", doe_mb->cap_offset, xa_idx, vid, prot); - rc = xa_insert(&doe_mb->prots, xa_idx++, - pci_doe_xa_prot_entry(vid, prot), GFP_KERNEL); + rc = xa_insert(&doe_mb->feats, xa_idx++, + pci_doe_xa_feat_entry(vid, prot), GFP_KERNEL); if (rc) return rc; } while (index); @@ -466,7 +466,7 @@ static void pci_doe_cancel_tasks(struct pci_doe_mb *doe_mb) * @pdev: PCI device to create the DOE mailbox for * @cap_offset: Offset of the DOE mailbox * - * Create a single mailbox object to manage the mailbox protocol at the + * Create a single mailbox object to manage the mailbox feature at the * cap_offset specified. * * RETURNS: created mailbox object on success @@ -485,7 +485,7 @@ static struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, doe_mb->pdev = pdev; doe_mb->cap_offset = cap_offset; init_waitqueue_head(&doe_mb->wq); - xa_init(&doe_mb->prots); + xa_init(&doe_mb->feats); doe_mb->work_queue = alloc_ordered_workqueue("%s %s DOE [%x]", 0, dev_bus_name(&pdev->dev), @@ -508,11 +508,11 @@ static struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, /* * The state machine and the mailbox should be in sync now; - * Use the mailbox to query protocols. + * Use the mailbox to query features. */ - rc = pci_doe_cache_protocols(doe_mb); + rc = pci_doe_cache_features(doe_mb); if (rc) { - pci_err(pdev, "[%x] failed to cache protocols : %d\n", + pci_err(pdev, "[%x] failed to cache features : %d\n", doe_mb->cap_offset, rc); goto err_cancel; } @@ -521,7 +521,7 @@ static struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, err_cancel: pci_doe_cancel_tasks(doe_mb); - xa_destroy(&doe_mb->prots); + xa_destroy(&doe_mb->feats); err_destroy_wq: destroy_workqueue(doe_mb->work_queue); err_free: @@ -539,31 +539,31 @@ static struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, static void pci_doe_destroy_mb(struct pci_doe_mb *doe_mb) { pci_doe_cancel_tasks(doe_mb); - xa_destroy(&doe_mb->prots); + xa_destroy(&doe_mb->feats); destroy_workqueue(doe_mb->work_queue); kfree(doe_mb); } /** - * pci_doe_supports_prot() - Return if the DOE instance supports the given - * protocol + * pci_doe_supports_feat() - Return if the DOE instance supports the given + * feature * @doe_mb: DOE mailbox capability to query - * @vid: Protocol Vendor ID - * @type: Protocol type + * @vid: Feature Vendor ID + * @type: Feature type * - * RETURNS: True if the DOE mailbox supports the protocol specified + * RETURNS: True if the DOE mailbox supports the feature specified */ -static bool pci_doe_supports_prot(struct pci_doe_mb *doe_mb, u16 vid, u8 type) +static bool pci_doe_supports_feat(struct pci_doe_mb *doe_mb, u16 vid, u8 type) { unsigned long index; void *entry; - /* The discovery protocol must always be supported */ - if (vid == PCI_VENDOR_ID_PCI_SIG && type == PCI_DOE_PROTOCOL_DISCOVERY) + /* The discovery feature must always be supported */ + if (vid == PCI_VENDOR_ID_PCI_SIG && type == PCI_DOE_FEATURE_DISCOVERY) return true; - xa_for_each(&doe_mb->prots, index, entry) - if (entry == pci_doe_xa_prot_entry(vid, type)) + xa_for_each(&doe_mb->feats, index, entry) + if (entry == pci_doe_xa_feat_entry(vid, type)) return true; return false; @@ -591,7 +591,7 @@ static bool pci_doe_supports_prot(struct pci_doe_mb *doe_mb, u16 vid, u8 type) static int pci_doe_submit_task(struct pci_doe_mb *doe_mb, struct pci_doe_task *task) { - if (!pci_doe_supports_prot(doe_mb, task->prot.vid, task->prot.type)) + if (!pci_doe_supports_feat(doe_mb, task->feat.vid, task->feat.type)) return -EINVAL; if (test_bit(PCI_DOE_FLAG_DEAD, &doe_mb->flags)) @@ -637,8 +637,8 @@ int pci_doe(struct pci_doe_mb *doe_mb, u16 vendor, u8 type, { DECLARE_COMPLETION_ONSTACK(c); struct pci_doe_task task = { - .prot.vid = vendor, - .prot.type = type, + .feat.vid = vendor, + .feat.type = type, .request_pl = request, .request_pl_sz = request_sz, .response_pl = response, @@ -663,9 +663,9 @@ EXPORT_SYMBOL_GPL(pci_doe); * * @pdev: PCI device * @vendor: Vendor ID - * @type: Data Object Type + * @prot: Data Object Type * - * Find first DOE mailbox of a PCI device which supports the given protocol. + * Find first DOE mailbox of a PCI device which supports the given feature. * * RETURNS: Pointer to the DOE mailbox or NULL if none was found. */ @@ -676,7 +676,7 @@ struct pci_doe_mb *pci_find_doe_mailbox(struct pci_dev *pdev, u16 vendor, unsigned long index; xa_for_each(&pdev->doe_mbs, index, doe_mb) - if (pci_doe_supports_prot(doe_mb, vendor, type)) + if (pci_doe_supports_feat(doe_mb, vendor, type)) return doe_mb; return NULL; From patchwork Tue Jul 2 06:04:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 13719000 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A53676F17; Tue, 2 Jul 2024 06:04:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719900299; cv=none; b=DVw8R1JauJEmX7+CTggha5kqYRris9h9mign79YbMw77PdGogzf1gV7f/c2nji5mxC8vswJF8quUxiUYF0dIeTkp2F+r95LvOFG28EDzmYejIMMpON/WQWfd9wWc84xnFirtuhnGENvr+9BL5mzmxRp3pTFx/sr5WpJzK2D+qY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719900299; c=relaxed/simple; bh=C1S9OhbpaG+umG8H8ub5Rz2NOuku6ZPmmSJhnUy0xn4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SLEHDcL8I6CUfQ5WmBfzQQfOdm6Pq3TuN3lFg+oBuRVFr4bWu+Ngm7OkJHUaw2GlRD8WbfyYiV+vp6rykNgxxvbNr4jQ9IKujuT//PvCl8cd28dCDrhPFL0HtNoc6kqn3/Hs8L4cKl2AWVvpQUmzDtwysdmUvMuHnYuY/G8tNmM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=V8wl5pjn; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V8wl5pjn" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1f64ecb1766so20358335ad.1; Mon, 01 Jul 2024 23:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719900297; x=1720505097; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4HmXWBZI2234C0SEXKItAogwfmQcb4GdnpH9BKghxlg=; b=V8wl5pjnS1tTTFm/HAgJ9n10aaVW1NLq8gWEShBE7dRvl5LfCWWDKjGYeVzpO71BWD Lm+hIAGxxsAtFsixSRAp0SDjcCZ6+LAU5YLR5ntT0flfpLYi+VFghzYClQwlxUaBk7nU dv4Z2/MXMFxrSUHeLjYnHCyiyNMi+X1CNv1fCSXW/qohhy/vUO3AXaKB7PlS7a70YM89 1Z2zMbd1fC8bXqphTfOJV4iUwMTbd+1o374KSmpnO8LbJ3YYkdHDtCVu9imOx9TLDVNI fbx0rzQO9WcJXgtzjnoGta1hHxHFXYDlzlXYD6C0pHOdIPSGiko8Xjoo2w1dveaZpMGE 809w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719900297; x=1720505097; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4HmXWBZI2234C0SEXKItAogwfmQcb4GdnpH9BKghxlg=; b=D1K1AQVs5Fx3ACI/TcShIb6+sqLvnQrKfUgOYKDGr1+Ag1+d5zjT9A+5ViHYv2R1Lj Yw1ActcRgMAg5Z7URYKVAV0pWMps9nDeBY8+7LIi3eYJlVeH1UiYVmTJ/iGLVZz9T9KP INRJeUcgjW0ZwxfE/VwRzb+/ykbbg5jxgswlkG8jHGmvn+WMxe9X8+vP9+nN4JiqPSrq FRKW2F6N0LQ51MjeA/i2vIvq2bIuhCub5sDwHgMc74eJZgYtVSSAJ23L2kV+N10qzdaq aBZFWJpWUKs3CGLPGJaXAhjvwpT++Aw72YJd1zsNMFmQ0H+Bq31vnFE0qwS4eoO5Hspl SjWg== X-Forwarded-Encrypted: i=1; AJvYcCVbebP00wAhmXztyxmqstmeo9Ul5r9mMHfzmO14WYQB0YE2+M635Fc2/lS4EVogucX7PySvF71JnLtu6M9079xk6pFSpDYzhorBSuliH8lJJixa0BiTTgY86/RilLgxDUdb8Kp4c4Om X-Gm-Message-State: AOJu0YxQ1HRmvpSK1WH4AKULAuZOBg33UG7L6QTqGMsCViI2OPdv3Zk2 +l98xh6nmM+ExOrXZVlE8HmEDWZzVDkzjS8kg75Ufog/mVyclzpD X-Google-Smtp-Source: AGHT+IGzQGIUI5rSwqaAGFu53Ui2dWXrVNhzn2xhMo8RR4wn7PB9VF0JhmARQ9iBln9WlGEG/yyfAg== X-Received: by 2002:a17:902:d48d:b0:1fa:fc15:c528 with SMTP id d9443c01a7336-1fafc15d4fbmr2968865ad.37.1719900297162; Mon, 01 Jul 2024 23:04:57 -0700 (PDT) Received: from toolbox.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fac10d23edsm75484225ad.58.2024.07.01.23.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 23:04:56 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: bhelgaas@google.com, linux-pci@vger.kernel.org, Jonathan.Cameron@huawei.com, lukas@wunner.de Cc: alex.williamson@redhat.com, christian.koenig@amd.com, kch@nvidia.com, gregkh@linuxfoundation.org, logang@deltatee.com, linux-kernel@vger.kernel.org, alistair23@gmail.com, chaitanyak@nvidia.com, rdunlap@infradead.org, Alistair Francis Subject: [PATCH v13 2/4] PCI/DOE: Rename Discovery Response Data Object Contents to type Date: Tue, 2 Jul 2024 16:04:16 +1000 Message-ID: <20240702060418.387500-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702060418.387500-1-alistair.francis@wdc.com> References: <20240702060418.387500-1-alistair.francis@wdc.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 PCIe r6.1 (which was published July 24) describes a "Vendor ID", a "Data Object Type" and "Next Index" as the fields in the DOE Discovery Response Data Object. The DOE driver currently uses both the terms type and prot for the second element. This patch renames all uses of the DOE Discovery Response Data Object to use type as the second element of the object header, instead of type/prot as it currently is. Signed-off-by: Alistair Francis Reviewed-by: Jonathan Cameron --- v13 - No changes v12: - Use PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE for PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL v11: - Avoid breaking changes to userspace header v10: - Split original patch into two v9: - Rename two more DOE macros v8: - Rename prot to feat as well v7: - Initial patch drivers/pci/doe.c | 18 +++++++++--------- include/uapi/linux/pci_regs.h | 5 ++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/pci/doe.c b/drivers/pci/doe.c index f776f5304a3e..defc4be81bd4 100644 --- a/drivers/pci/doe.c +++ b/drivers/pci/doe.c @@ -406,7 +406,7 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1 response_pl = le32_to_cpu(response_pl_le); *vid = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID, response_pl); - *feature = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL, + *feature = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE, response_pl); *index = FIELD_GET(PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX, response_pl); @@ -414,9 +414,9 @@ static int pci_doe_discovery(struct pci_doe_mb *doe_mb, u8 capver, u8 *index, u1 return 0; } -static void *pci_doe_xa_feat_entry(u16 vid, u8 prot) +static void *pci_doe_xa_feat_entry(u16 vid, u8 type) { - return xa_mk_value((vid << 8) | prot); + return xa_mk_value((vid << 8) | type); } static int pci_doe_cache_features(struct pci_doe_mb *doe_mb) @@ -430,19 +430,19 @@ static int pci_doe_cache_features(struct pci_doe_mb *doe_mb) do { int rc; u16 vid; - u8 prot; + u8 type; rc = pci_doe_discovery(doe_mb, PCI_EXT_CAP_VER(hdr), &index, - &vid, &prot); + &vid, &type); if (rc) return rc; pci_dbg(doe_mb->pdev, - "[%x] Found feature %d vid: %x prot: %x\n", - doe_mb->cap_offset, xa_idx, vid, prot); + "[%x] Found feature %d vid: %x type: %x\n", + doe_mb->cap_offset, xa_idx, vid, type); rc = xa_insert(&doe_mb->feats, xa_idx++, - pci_doe_xa_feat_entry(vid, prot), GFP_KERNEL); + pci_doe_xa_feat_entry(vid, type), GFP_KERNEL); if (rc) return rc; } while (index); @@ -663,7 +663,7 @@ EXPORT_SYMBOL_GPL(pci_doe); * * @pdev: PCI device * @vendor: Vendor ID - * @prot: Data Object Type + * @type: Data Object Type * * Find first DOE mailbox of a PCI device which supports the given feature. * diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index 94c00996e633..795e49304ae4 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -1146,9 +1146,12 @@ #define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff #define PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER 0x0000ff00 #define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff -#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE 0x00ff0000 #define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000 +/* Deprecated old name, replaced with PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE */ +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL PCI_DOE_DATA_OBJECT_DISC_RSP_3_TYPE + /* Compute Express Link (CXL r3.1, sec 8.1.5) */ #define PCI_DVSEC_CXL_PORT 3 #define PCI_DVSEC_CXL_PORT_CTL 0x0c From patchwork Tue Jul 2 06:04:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 13719001 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D8BA76F17; Tue, 2 Jul 2024 06:05:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719900305; cv=none; b=YqAUBv6817hfaCFd+Uxn1o0CJJfJvZ+c3qWm5fhYwE37bx7zFvPw72YUhrT27GqBXzC8aQ0TN7jYTuzVevqZr0RwZzw/eXprKQXBaNE4kU5SXqJaMuTAxU3qqfb4cYgfP703cQ3shSgHuUqeDupQAyL2QbThZfjd6ihhXD/5TKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719900305; c=relaxed/simple; bh=7gLoiQaheyOASUObEPOweTpdS0YPBYzAdvY3uQH5E08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H5Dz4A/D6NXXEHSm0PvP/mYWjXGS1j3+z0y99skZglVcwCiqntSVeKvmPJj4S0DbX1ZXCmY2hukWEUht1jvhrvJZPJ81wP98/NnpGyLxlE79jZcoCydJnEc4Q5ZE89PiWFyrQ0IvIFOTq4K0Xm+BTSQkGRxfMrOQbqZMKMWeyRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FyatEopa; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FyatEopa" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1f4a5344ec7so27058565ad.1; Mon, 01 Jul 2024 23:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719900303; x=1720505103; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FSf3rl2yEsfnEGBe3PL6PrYi1SxdyQnECve6feZibF0=; b=FyatEopaJllHZWEUjMbJ/wf5xvYFDa8tJRD/oJ4E8LzyYqbw3CkIU659qtdgoTQUBa ovwKb2Y73Ma858tp2bBPt+hwfetr05Xc0pR6qiQYcMbO3TgqmANI2PSh/Rupb5dTiIWK TEkUFWlUt1Cb6XJ7xPg9wUn77oDwuf+CdG24rveROkN8C3FaeqhXDYeJRfOk1Xf/HusO b8Yk9BaVF6ltsrW11W41vGOZZZH4EShRv6DGX16FHdGN+XnHIV1icZF1qtEQyGXGfQz3 1d/mF39Qa9PGQ3A9E9G3izhbErOWxhdL9V3IqGAMAMXgmKjfSo58sg9u0857Dr6x/vVS LGNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719900303; x=1720505103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FSf3rl2yEsfnEGBe3PL6PrYi1SxdyQnECve6feZibF0=; b=V3h9uP1hgohQJs7pDK/pXLJ6sMkGPYIZO8aEjOWQ6pTybJ6Z/C2OXG2kq0cyJkLzKC hJQKenLXLlsDcNrWM41j1RuRubxLZANKqKwR+BIeOR43jXjB1Jtg2l/Hm7HWY2I3zWx4 8P2NvbMS/WQw+Ms+ZZB8ZrfFESNVbR8EKrOFBK5H2MLfY85m8XnxmSfZIa0szXS1rR2z J+nB3cn6nWjIB00G/2N7GoUO3TW9H2Z0kOhKMWXbSxtftiHoFveEg7Tg+8SSuJWpYtpx vKBfQvcDIpB7EO4kXP7zGfOO1dEarWTz97SbL23qnUwWfRM812YlNVWx7l6yfyyWQVY9 TNUA== X-Forwarded-Encrypted: i=1; AJvYcCXp8du8kTmMsfAXtOP92M2SjnZAGpRFxgSIZi7r6wCOXQ4uzruYPat1cLD7lIReM/1FZR2LY6ePgAgJmlqW5GgOuuysrjXs0sHZaHlw41djyv13LNz3+ppyzjytq1cUr3TSXUBhfJW9 X-Gm-Message-State: AOJu0YxmvLKhOkO/eSU35M9snxRZQnKx9e4w2kfFGgTPHPd0jt19uT0R 1+luWp4gECu80TJoEhBftXP792aoNwPQbGzLqbXi2BreGOfg/8JU X-Google-Smtp-Source: AGHT+IFPTqBU3HOHLkC0a2mMJL+lxRZ+QCT1ipfUxnjKbha7eU8zSiZhVz1skKU3JbBGUxKRYu/I1A== X-Received: by 2002:a17:902:ecc1:b0:1f9:d577:f532 with SMTP id d9443c01a7336-1fac7f1b463mr189828245ad.28.1719900302717; Mon, 01 Jul 2024 23:05:02 -0700 (PDT) Received: from toolbox.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fac10d23edsm75484225ad.58.2024.07.01.23.04.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 23:05:02 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: bhelgaas@google.com, linux-pci@vger.kernel.org, Jonathan.Cameron@huawei.com, lukas@wunner.de Cc: alex.williamson@redhat.com, christian.koenig@amd.com, kch@nvidia.com, gregkh@linuxfoundation.org, logang@deltatee.com, linux-kernel@vger.kernel.org, alistair23@gmail.com, chaitanyak@nvidia.com, rdunlap@infradead.org, Alistair Francis Subject: [PATCH v13 3/4] PCI/DOE: Expose the DOE features via sysfs Date: Tue, 2 Jul 2024 16:04:17 +1000 Message-ID: <20240702060418.387500-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702060418.387500-1-alistair.francis@wdc.com> References: <20240702060418.387500-1-alistair.francis@wdc.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The PCIe 6 specification added support for the Data Object Exchange (DOE). When DOE is supported the DOE Discovery Feature must be implemented per PCIe r6.1 sec 6.30.1.1. The protocol allows a requester to obtain information about the other DOE features supported by the device. The kernel is already querying the DOE features supported and cacheing the values. Expose the values in sysfs to allow user space to determine which DOE features are supported by the PCIe device. By exposing the information to userspace tools like lspci can relay the information to users. By listing all of the supported features we can allow userspace to parse the list, which might include vendor specific features as well as yet to be supported features. After this patch is supported you can see something like this when attaching a DOE device $ ls /sys/devices/pci0000:00/0000:00:02.0//doe* 0001:00 0001:01 0001:02 Signed-off-by: Alistair Francis --- v13: - Drop pci_doe_sysfs_init() and use pci_doe_sysfs_group - As discussed in https://lore.kernel.org/all/20231019165829.GA1381099@bhelgaas/ we can just modify pci_doe_sysfs_group at the DOE init and let device_add() handle the sysfs attributes. v12: - Drop pci_doe_features_sysfs_attr_visible() v11: - Gracefully handle multiple entried of same feature - Minor fixes and code cleanups v10: - Rebase to use DEFINE_SYSFS_GROUP_VISIBLE and remove special setup function v9: - Add a teardown function - Rename functions to be clearer - Tidy up the commit message - Remove #ifdef from header v8: - Inlucde an example in the docs - Fixup removing a file that wasn't added - Remove a blank line v7: - Fixup the #ifdefs to keep the test robot happy v6: - Use "feature" instead of protocol - Don't use any devm_* functions - Add two more patches to the series v5: - Return the file name as the file contents - Code cleanups and simplifications v4: - Fixup typos in the documentation - Make it clear that the file names contain the information - Small code cleanups - Remove most #ifdefs - Remove extra NULL assignment v3: - Expose each DOE feature as a separate file v2: - Add documentation - Code cleanups Documentation/ABI/testing/sysfs-bus-pci | 28 ++++++ drivers/pci/doe.c | 109 +++++++++++++++++++++++- drivers/pci/pci-sysfs.c | 4 + drivers/pci/pci.h | 2 + 4 files changed, 142 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci index ecf47559f495..e1b8f15e4a3a 100644 --- a/Documentation/ABI/testing/sysfs-bus-pci +++ b/Documentation/ABI/testing/sysfs-bus-pci @@ -500,3 +500,31 @@ Description: console drivers from the device. Raw users of pci-sysfs resourceN attributes must be terminated prior to resizing. Success of the resizing operation is not guaranteed. + +What: /sys/bus/pci/devices/.../doe_features +Date: July 2024 +Contact: Linux PCI developers +Description: + This directory contains a list of the supported + Data Object Exchange (DOE) features. The feature values are + the file name. The contents of each file is the raw vendor id and + data object feature values, the same as the name. + + The value comes from the device and specifies the vendor and + data object type supported. The lower (RHS of the colon) is + the data object type in hex. The upper (LHS of the colon) + is the vendor ID. + + As all DOE devices must support the DOE discovery protocol, if + DOE is supported you will at least see this file, with + this contents + + # cat doe_features/0001:00 + 0001:00 + + If the device supports other protocols you will see other files + as well. For example is CMA/SPDM and secure CMA/SPDM are supported + the doe_features directory will look like this + + # ls doe_features + 0001:00 0001:01 0001:02 diff --git a/drivers/pci/doe.c b/drivers/pci/doe.c index defc4be81bd4..e7b702afce88 100644 --- a/drivers/pci/doe.c +++ b/drivers/pci/doe.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -47,6 +48,8 @@ * @wq: Wait queue for work item * @work_queue: Queue of pci_doe_work items * @flags: Bit array of PCI_DOE_FLAG_* flags + * @device_attrs: Array of device attributes, used in cleanup + * @sysfs_attrs: Array of sysfs attributes, used in cleanup */ struct pci_doe_mb { struct pci_dev *pdev; @@ -56,6 +59,11 @@ struct pci_doe_mb { wait_queue_head_t wq; struct workqueue_struct *work_queue; unsigned long flags; + +#ifdef CONFIG_SYSFS + struct device_attribute *device_attrs; + struct attribute **sysfs_attrs; +#endif }; struct pci_doe_feature { @@ -92,6 +100,58 @@ struct pci_doe_task { struct pci_doe_mb *doe_mb; }; +#ifdef CONFIG_SYSFS +static bool pci_doe_features_sysfs_group_visible(struct kobject *kobj) +{ + struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj)); + struct pci_doe_mb *doe_mb; + unsigned long index; + + xa_for_each(&pdev->doe_mbs, index, doe_mb) { + if (!xa_empty(&doe_mb->feats)) + return true; + } + + return false; +} +DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE(pci_doe_features_sysfs) + +struct attribute_group pci_doe_sysfs_group = { + .name = "doe_features", + .is_visible = SYSFS_GROUP_VISIBLE(pci_doe_features_sysfs), +}; + +static ssize_t pci_doe_sysfs_feature_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sysfs_emit(buf, "%s\n", attr->attr.name); +} + +static void pci_doe_sysfs_feature_remove(struct pci_dev *pdev, + struct pci_doe_mb *doe_mb) +{ + struct device_attribute *attrs = doe_mb->device_attrs; + struct attribute **sysfs_attrs = doe_mb->sysfs_attrs; + unsigned long i; + void *entry; + + if (!attrs) + return; + + doe_mb->device_attrs = NULL; + doe_mb->sysfs_attrs = NULL; + + xa_for_each(&doe_mb->feats, i, entry) { + if (attrs[i].attr.name) + kfree(attrs[i].attr.name); + } + + kfree(attrs); + kfree(sysfs_attrs); +} +#endif + static int pci_doe_wait(struct pci_doe_mb *doe_mb, unsigned long timeout) { if (wait_event_timeout(doe_mb->wq, @@ -687,6 +747,12 @@ void pci_doe_init(struct pci_dev *pdev) { struct pci_doe_mb *doe_mb; u16 offset = 0; + struct attribute **sysfs_attrs; + struct device_attribute *attrs; + unsigned long num_features = 0; + unsigned long i; + unsigned long vid, type; + void *entry; int rc; xa_init(&pdev->doe_mbs); @@ -707,6 +773,45 @@ void pci_doe_init(struct pci_dev *pdev) pci_doe_destroy_mb(doe_mb); } } + + if (doe_mb) { + xa_for_each(&doe_mb->feats, i, entry) + num_features++; + + sysfs_attrs = kcalloc(num_features + 1, sizeof(*sysfs_attrs), GFP_KERNEL); + if (!sysfs_attrs) + return; + + attrs = kcalloc(num_features, sizeof(*attrs), GFP_KERNEL); + if (!attrs) { + kfree(sysfs_attrs); + return; + } + + doe_mb->device_attrs = attrs; + doe_mb->sysfs_attrs = sysfs_attrs; + + xa_for_each(&doe_mb->feats, i, entry) { + sysfs_attr_init(&attrs[i].attr); + + vid = xa_to_value(entry) >> 8; + type = xa_to_value(entry) & 0xFF; + + attrs[i].attr.name = kasprintf(GFP_KERNEL, "%04lx:%02lx", vid, type); + if (!attrs[i].attr.name) { + pci_doe_sysfs_feature_remove(pdev, doe_mb); + return; + } + attrs[i].attr.mode = 0444; + attrs[i].show = pci_doe_sysfs_feature_show; + + sysfs_attrs[i] = &attrs[i].attr; + } + + sysfs_attrs[num_features] = NULL; + + pci_doe_sysfs_group.attrs = sysfs_attrs; + } } void pci_doe_destroy(struct pci_dev *pdev) @@ -714,8 +819,10 @@ void pci_doe_destroy(struct pci_dev *pdev) struct pci_doe_mb *doe_mb; unsigned long index; - xa_for_each(&pdev->doe_mbs, index, doe_mb) + xa_for_each(&pdev->doe_mbs, index, doe_mb) { + pci_doe_sysfs_feature_remove(pdev, doe_mb); pci_doe_destroy_mb(doe_mb); + } xa_destroy(&pdev->doe_mbs); } diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 40cfa716392f..cd838b85d6ab 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -1661,6 +1662,9 @@ const struct attribute_group *pci_dev_attr_groups[] = { #endif #ifdef CONFIG_PCIEASPM &aspm_ctrl_attr_group, +#endif +#ifdef CONFIG_PCI_DOE + &pci_doe_sysfs_group, #endif NULL, }; diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index fd44565c4756..a26c586cdeb4 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -189,6 +189,7 @@ extern const struct attribute_group *pci_dev_groups[]; extern const struct attribute_group *pci_dev_attr_groups[]; extern const struct attribute_group *pcibus_groups[]; extern const struct attribute_group *pci_bus_groups[]; +extern struct attribute_group pci_doe_sysfs_group; #else static inline int pci_create_sysfs_dev_files(struct pci_dev *pdev) { return 0; } static inline void pci_remove_sysfs_dev_files(struct pci_dev *pdev) { } @@ -196,6 +197,7 @@ static inline void pci_remove_sysfs_dev_files(struct pci_dev *pdev) { } #define pci_dev_attr_groups NULL #define pcibus_groups NULL #define pci_bus_groups NULL +#define pci_doe_sysfs_group NULL #endif extern unsigned long pci_hotplug_io_size; From patchwork Tue Jul 2 06:04:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 13719002 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C653A12C54A; Tue, 2 Jul 2024 06:05:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719900310; cv=none; b=tuMuiQxwuzZJ2SHM0URlca919bcvD+JLXSOJGCZ+ezucYxaLEMQarEyTJAiZBYXTEtK/A4BF+tOWZZsK3p5y+msF1xcyDHLCtLDo02Q3YsQl4gP7smRH/AXPuCQcKzg7TvCU4XQqNC1iiAhB1AlqfI70FxDkguCmtmsJbp4LY8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719900310; c=relaxed/simple; bh=ZNdxnGPfETJa9uUYOCiuRxUSQF8J7Opi/FFw5TRGvIA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PR6k37l5YFa1x5XJSl8txO5stwT8+YADV4qFLlaLlXUV7sRaWfVlmGod5zLIe3iiN3KGyS/9hUCtFfhjaNPols+QPXzq2yz3yL0Nt2q59MV7vyBcnSR2KfzmgiIJOMZcVfYr7I2iaArl8PLeieSgoppIhuXRXKFuqpT7TeUOrtk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ARJsxFGO; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ARJsxFGO" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1f480624d0dso29163545ad.1; Mon, 01 Jul 2024 23:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719900308; x=1720505108; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DbE0aIHExF+1pl24Q0B2lrRdlvYWUhpDzJPWc86zCWQ=; b=ARJsxFGOFRMWCxE1bSNDwTJg4z+VEiqCoeBCfj69Yn0K3mcsRQkClC5l0B2IAP+kc4 FLWVHk+FS0EuGJAf17oMkCT0DxNi4jmWIaMHjMF717e0MEY5jfMdS2KzV0nUhWVM0H1y vouJ1xN2fsejan+6E/zCOgZYgubLRG30RQSX9nc0KBrq+lacyskxFbCvkCdOj0Sz850U Mn/B/yD0xY1Zs870H0t2t6lrLkmL+Q/Uv//0Nt+iyyCZJ7nZ3QIAa3Qf8908LrRcdEuY OERHkvxDOfBgq57KdmzRDIqQ7csxvKNIes0QjMJ7WgyeqDSeb1vXlj4HEQ78zAwAJBf0 PqOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719900308; x=1720505108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DbE0aIHExF+1pl24Q0B2lrRdlvYWUhpDzJPWc86zCWQ=; b=vtEe+TZlvO5qv379sgDDybJFsTpph3g/YxQaxYNNewbpZpMSnG0P6LeGAnzyuesOQ0 0u0Dr0TP6y6yjx97TmdtY/3VT6d7z03lYPMbikVyQuJgTK3OdTCUyAqMFGJF4ZPCSHhk yTh6Fh8j/5s2dn0tZ5EMVrKc/Xd5hjD4RdqZF7lKQ3PLZsxEP6wE2cnsNBSWG4lr/tNZ YSAVPZu3EE0j0LUWBcUMvSOcCD6rD52XBbdxgWdcDLR5KpqejNHpVKkQrUA/EzTYUddl ZyAQxI+cX71nzt8SSmPYAgPUV2DnGlivd8rf56WQyQzB52LGSy6hhgaubVoZ6jOcJiaT 7J+g== X-Forwarded-Encrypted: i=1; AJvYcCXBNA5+gfcq6mOfjRVyMgKcKYUkZ3yCkLUV9KqKaQEY9PmqQYY+vgCHI57EBeaNRO2ccHrs/vUhMQDzH9KeTwkKNgLWR0axZNXUg6gWuLgXmpQeoIU93GmMu5/Fjtg4cY8JqwIR46RB X-Gm-Message-State: AOJu0YxxlcYY+uwT8ve1unA1zh6DGucJ1Nopd0nKIoGIc/YaNjE4YIHY o7/kP1uf34RZbi47esyAtLFB/FdR3wZRZMzKkofi4FzCQLWPQraU X-Google-Smtp-Source: AGHT+IFw23N44QYbnBt7D/dVDlYpnki+jkjcVK85ZTXmGeCz/nIS1a1XbqHQMMMEJIQp5JbG80HwZQ== X-Received: by 2002:a17:903:2308:b0:1fa:1d37:700b with SMTP id d9443c01a7336-1fadbce6a01mr68705095ad.45.1719900308217; Mon, 01 Jul 2024 23:05:08 -0700 (PDT) Received: from toolbox.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fac10d23edsm75484225ad.58.2024.07.01.23.05.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 23:05:07 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: bhelgaas@google.com, linux-pci@vger.kernel.org, Jonathan.Cameron@huawei.com, lukas@wunner.de Cc: alex.williamson@redhat.com, christian.koenig@amd.com, kch@nvidia.com, gregkh@linuxfoundation.org, logang@deltatee.com, linux-kernel@vger.kernel.org, alistair23@gmail.com, chaitanyak@nvidia.com, rdunlap@infradead.org, Alistair Francis Subject: [PATCH v13 4/4] PCI/DOE: Allow enabling DOE without CXL Date: Tue, 2 Jul 2024 16:04:18 +1000 Message-ID: <20240702060418.387500-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702060418.387500-1-alistair.francis@wdc.com> References: <20240702060418.387500-1-alistair.francis@wdc.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 PCIe devices (not CXL) can support DOE as well, so allow DOE to be enabled even if CXL isn't. Signed-off-by: Alistair Francis Reviewed-by: Jonathan Cameron --- drivers/pci/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index d35001589d88..09d3f5c8555c 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -122,7 +122,10 @@ config PCI_ATS bool config PCI_DOE - bool + bool "Enable PCI Data Object Exchange (DOE) support" + help + Say Y here if you want be able to communicate with PCIe DOE + mailboxes. config PCI_ECAM bool