From patchwork Wed Jul 10 02:33:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 13728804 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) (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 A6C0D224DC; Wed, 10 Jul 2024 02:33:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720578821; cv=none; b=uNo4y/vUNGYLwjXhkw/5gw9qgdpVgZtnVrO/abPdM6zV62z0UsAAaH9BKdJeQcYdGEXNkLzqs7/07iv+kTk704TDad8nEYx/u8lqEmhfooZlNSyNOw1e2Y+UPiAW+w5LxEZbUYibKjqqOf8crRBrG+Q28dbS3awyyBCh8JL6wEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720578821; c=relaxed/simple; bh=oZLMb2ZUEpzZrCDNaU/hFZABiqinH3YQJrjAmBTdY/w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HxJqqn3U+Vk6cjdvQlYOi7S5B2SKtZwZbwqmTho9Lwwxz64xwuynb0BQl85WuXLcYl6Q7d1d3CngvAlmMce1+cC+E/HC+mgK48ZIxhri5/otm3J18qm7F2hW9NS3qYcmqR9cI16Q97hDIAr+OH9NR7vqZ/zrWHKN//Ox7iPX0X4= 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=U5Es5Aon; arc=none smtp.client-ip=209.85.160.54 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="U5Es5Aon" Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-25dfb580d1fso2816764fac.2; Tue, 09 Jul 2024 19:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578818; x=1721183618; 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=HMbDc5NWyywmEjccyZ08I/QERAwcWCVtBkbsQsYPqlk=; b=U5Es5AonBx2CrubWsZj960leVwBOXe0vICB+EWRs72mHRig/HXerP3DzN30QRjTO9e iCQqLytgCrUmZ4gslOOrkfXzC8s65aEGw7LLB9krl33zaX//ubuZyhlalOtunXZfCUTk gGi7KEMOmnRn5BZNesNax9RXZJRhC/Te0DOTqugd+hrZ9ORQhfx/YrepfgblPRqj3xqy xc47V28L6YkB5cp4lseOyv1Yz3IMCS6mvy9hTaNxv3FSCGnm+4q1VXgMf1mG1fawFC58 qXvObptZdxyg/yYIUbEgXiFaL6d22X02ugBuPn4uoT7WrKc0xV7cc4HlJezMZpH+pNSI V1Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578818; x=1721183618; 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=HMbDc5NWyywmEjccyZ08I/QERAwcWCVtBkbsQsYPqlk=; b=tbmVj4y1QXS7t0vMMfcUnS2PSAqb71ATqxw/4Tiupzp0rZ1zhEsOSjgJxzT0BjOyb1 N4V19KDATd++/n20ySz1T5iiPuaC/neu7qWYIHTSmDownQ2MskSZPHM1OQvHb+eHoGCe G5ujca6Rx+oE61vFPddI7r6KI1UpL8/xl6Lh/3E3k6yWSNSL3nxasigyt9QyS8e+8hF7 4Pb0l0FvmG8SOrL7XpRbNWsEGZayNBs521VlDtUcF7FiSbKEl7E+MKS6oQNOTEkbbe+k JBHTrAHEl3BAEEBPinVhm0xAndpOUWdjPaiKte1IObhH0uq+8TKImpl7XfFX1MCmt1qk mzyg== X-Forwarded-Encrypted: i=1; AJvYcCXrFnAjIJdg9oZi8vlbzhmtElApIxEvNqSoj0wQpkRcDoe4FMmo+Z9fRq+BObTMgKjLNFAyk5d/EqPgaKVrezpZotON0aRFtcFdD8XonssJcpowuXStBYLGONqD4NE6I1B6tMORhqWF X-Gm-Message-State: AOJu0YxgnaTqIPSLVxxEVWE74KldCBwg+coen1vi2BIuninYtllc9i2P KLzxr6icF3zIYh0zDMVojs99gWEc6RnQ/5ItAlTtL56C0sGeft/k X-Google-Smtp-Source: AGHT+IH3eW8MiEXIxV02WPXQV9FvW5OO1lCytvsgxsdL0+pRMSZxVQPqdc3P/ZqEPPTuulvt2ghJVA== X-Received: by 2002:a05:6870:10cd:b0:254:9501:db82 with SMTP id 586e51a60fabf-25eaec601efmr2494278fac.52.1720578818539; Tue, 09 Jul 2024 19:33:38 -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 d2e1a72fcca58-70b439b30b9sm2630992b3a.178.2024.07.09.19.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:33:38 -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 v14 1/4] PCI/DOE: Rename DOE protocol to feature Date: Wed, 10 Jul 2024 12:33:07 +1000 Message-ID: <20240710023310.480713-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 --- v14: - No changes 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 Wed Jul 10 02:33:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 13728805 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) (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 E5E402C1BA; Wed, 10 Jul 2024 02:33:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720578826; cv=none; b=gA9OSECDvNI751r1duOocm70A30VteDSbJu2uKSHR1F3VhQQfdYRtJSdepcs3AbXMAvFaXIto2rWADgifua1/YhlTrcuJruVtTMtDlvUtiiqsrBOuw7jK1WeFg8rtSjin0mlF8sNOXgG/WmkpVrY9Soyc1NMgk+GV7s4tNlSli0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720578826; c=relaxed/simple; bh=eOgmxtB/x7JT6a1/AmJiXWxPHEcNVP+bI9sGnWp1yXE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CuaKUTp8QkJIaJ2Y7WCqnny/kfLMVbmqaGXlkawiKJP9yvLC5U73XxuLCAdis+noC95705SXMUcze2dRiej+XUBTByfTPD1nYvoPXKVxTfv0BbkrGzCQ0fkJRmf3mfj+1Vd7vgNu9Z70uHCWsWrfoCpNbNceh8eNbcVWPXTQZXk= 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=WcZKUYwR; arc=none smtp.client-ip=209.85.161.43 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="WcZKUYwR" Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-5b9778bb7c8so3138981eaf.3; Tue, 09 Jul 2024 19:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578824; x=1721183624; 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=wIvx7f/E46Io7lL1f2KBTCaQJpNKOTzfIoHw4smzaV0=; b=WcZKUYwR0JR+wzj7OWoLdcjeEBT6PdPloxKiRcs9ZApyeWi6kEygGUVgzGtJGpL5CI +U4IVVT3b/qRXkIveH4A4rEoI05/y8cAh0Px9RaYnmAKuPLc3vWEZxsiG4PkmMYHkKhn Z67dmZ1b6If9Ekq3tNYkIEEIv5Q9J1FrQ/PS/4BfRdh7CmrUfzpxqNamO7Sxe3Xd0vIU 2XETHkB3vkSqA8I+vj4QntJwbuO5BTBnLbW3/AycYOhxIw0nTKILQlA0jfOevrcXWCsb ZLsagHw9vOBpHSBZ5a1/XYlG4GWrEZPkwkjal9niTmFeMSJhvxF+RQkwZ2ZnR3IdT/+E 3GFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578824; x=1721183624; 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=wIvx7f/E46Io7lL1f2KBTCaQJpNKOTzfIoHw4smzaV0=; b=iDBmES3InvEniO9IlR8+YcUcQWXF5XVqsQmz7QNqIvlR0vBgrWYu17Uox3EYkOeOwC B8b/F3cQ4ImvYhJHwFALhshiErCnHo9DhuLkTIB0TSM3IR34ZBYiRB8W+OHywWxmpPJh 1437FGB61j6KxiWEcz2MlG0vK7lpwyfTFu1dhp9uWQ7VnusiNyG2EEXIWXLG0gNLlzZq JcM/5m0QU/C199+mFhZPb8lOr1cynOxrPj7R6iPLAbGkXEdvpmly1LAxTmbCy2gb3Ena JLivI3QnPdaw7iYgpiyRceSdO/uirhXHzpncWXcMQF66BvEvMuXoez/mz+Bzn2KKAd7Q tOxA== X-Forwarded-Encrypted: i=1; AJvYcCWGiHdqVrkuah0q41Pf/72juO7ituEqhoqmsfeSL80ZS0KWG3cfmchOl55lIQ+8Mp8fLr9Jw2rWYioAfTVS8z3JlJCpRY2cRxcw5VabmC8SN3l2vA5q6igxCF7Vnp7n5iI5V5PDUSxt X-Gm-Message-State: AOJu0YwiF4qTKQbssGUUKphG3yGu8lwZ69JBPIU+krWZNFEput/Dmqro T5KpfgFE8zrPKEoKTS5yML3KF2eJ7Tge+17vw9y7pE/b/I76iBoT X-Google-Smtp-Source: AGHT+IHZPEEoCpaQaBIN4vpOnluNcKcuAVs7tfe5M53e8bu5YsaKB9/ePHDHIyZYpFJ+XBjpwQReTQ== X-Received: by 2002:a05:6871:580b:b0:259:8420:8e3b with SMTP id 586e51a60fabf-25eae7f55f8mr3090954fac.21.1720578823894; Tue, 09 Jul 2024 19:33:43 -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 d2e1a72fcca58-70b439b30b9sm2630992b3a.178.2024.07.09.19.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:33:43 -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 v14 2/4] PCI/DOE: Rename Discovery Response Data Object Contents to type Date: Wed, 10 Jul 2024 12:33:08 +1000 Message-ID: <20240710023310.480713-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240710023310.480713-1-alistair.francis@wdc.com> References: <20240710023310.480713-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 --- v14 - No changes 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 Wed Jul 10 02:33:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 13728806 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.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 4A1743B2BB; Wed, 10 Jul 2024 02:33:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720578832; cv=none; b=ABm6eIxMzQow//12UW4noc4ExlxbYUf/ewkY6OeC/2K1tbASpYQ742BuS4XmXLi/IsUW3omWcwYlMmxxhJzrGLzUzwEezGrK7uZWZhYHxpFoC9HQczUXLuG7wFWEbBQnt15OS0opSVmmBlwS1lxiyEI3uPa8Vq3A/gZQ6kIwHJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720578832; c=relaxed/simple; bh=ZwQwlF47E7PtI7FlM+YTy9TdbgDQSr+oLU8C7pzy6Mw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CSC/7b3sjahDhO5ibDCFvWWfI+dEiea/9f/3/tWpmd9IDSC2AHg/ZtUXHszx99F9VF2C6CQzgvJzNvcrCjj5CHWtxm5M+DaQkafoLfemfa3SkHqENtR5Cna/lhI20FFRi4XQnlgH7s8RFXLeMnvEEO/oDqNpwcWuQd/tHIQyTcs= 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=lwDoZbYx; arc=none smtp.client-ip=209.85.167.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="lwDoZbYx" Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3d9dd7e5f6eso70455b6e.2; Tue, 09 Jul 2024 19:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578829; x=1721183629; 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=SjGiz+1O53z4zlo501+oylDw+437L8q98TUMeoGUWcQ=; b=lwDoZbYx/qwvt0zE8nRKvr2VvIAuPXwd0NnrTw25Nt2h8Gu0Nfy9zzT4uI4lmLlT90 /72+3C95rYyRikEcw2geDdncMWClv4B4XThAGaGqVAIVk1g1TF5lmCTqGPUDVDLPPT8g tDYQpAsuOQOiG+miiVyVraeGs7IIQKLHMpWKyXAoiw9dEVhILn1aN6gPyo+yNFolq1d4 1t3wezryOwUqRCjBFm062L22T1HGwfk6yPq90UUzr9/OQrz8pTQjC1bhfeBCaKoZcbRu 7WZf9qkgMxe+MJSnAaRh2rF+DRlKlP+D5o1RvPunWjapmBebPejw2a8pDyJ/o81ppFoM ZwbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578829; x=1721183629; 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=SjGiz+1O53z4zlo501+oylDw+437L8q98TUMeoGUWcQ=; b=DaOg16TxTp4Lf/6vvfBMb3D6nP8Bt8G8XoThScNpL3iyZT6RXYt6YwODaW76s11BYZ yOB279I1ta1ZMzIMrY6gW9gZ8zSNrrvM59p4VdvDtFyyllhvRmWfzPaBCcmmU+cU2jD2 6+F2aK6ZUgPrDALvGQP/EmWUj8Qk1AdUjmuHQfLySTFc7aEHc8SbNuI8MqSQtEv1QXmx Gm2c2IMy86a6mvkbcz6qv44+WHCSaOGEEZVaXS4Ab35E18bw+xtt9soo6Gs8S73d5vNq hmvzK6zoGFLTvjRrLZY927nbJlaCAKoNJgYaw+H4m5lvowz8JftgClrYQR9pCSDrdyaD /tdA== X-Forwarded-Encrypted: i=1; AJvYcCXLwPrikOa+FE9orKMloplqqTYHO9z2eFl9ns3oNO4QhyaEX/SRgTAA/iJzcuUQsJRNqtU+7hHkWxcGWqex1s3j8K2IX8rHw3Ijvb+o72yc+9WVOeUIxId9ABqjyFfSM1BSvMfSa14x X-Gm-Message-State: AOJu0Yyp2SMZn/iVAvCbYqZcaOpaGOeoLf5iWV/L9/6bThAJEgOU09rV HSv/Ur7rZjnFzbhs2/2liZSC6mtPE70qE40pJJyPmtzdgWNwJ9OKzfW/0Q== X-Google-Smtp-Source: AGHT+IGjcQAOROW+mxC6HIuQRjAkTEOL9s11oGQVae8i4QFhFoteZU/eo1jOyzibxYPRsyVWOc2Ufw== X-Received: by 2002:a05:6808:1911:b0:3d9:2ec9:4bb8 with SMTP id 5614622812f47-3d93c016d5amr5414568b6e.19.1720578829282; Tue, 09 Jul 2024 19:33:49 -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 d2e1a72fcca58-70b439b30b9sm2630992b3a.178.2024.07.09.19.33.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:33:48 -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 v14 3/4] PCI/DOE: Expose the DOE features via sysfs Date: Wed, 10 Jul 2024 12:33:09 +1000 Message-ID: <20240710023310.480713-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240710023310.480713-1-alistair.francis@wdc.com> References: <20240710023310.480713-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. As the DOE Discovery feature must always be supported we treat it as a special named attribute case. This allows the usual PCI attribute_group handling to correctly create the doe_features directory when registering pci_doe_sysfs_group (otherwise it doesn't and sysfs_add_file_to_group() will seg fault). 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:01 0001:02 doe_discovery Signed-off-by: Alistair Francis Reviewed-by: Jonathan Cameron --- v14: - Revert back to v12 with extra pci_remove_resource_files() call 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 | 151 ++++++++++++++++++++++++ drivers/pci/pci-sysfs.c | 15 +++ drivers/pci/pci.h | 10 ++ 4 files changed, 204 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci index ecf47559f495..65a3238ab701 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: May 2024 +Contact: Linux PCI developers +Description: + This directory contains a list of the supported + Data Object Exchange (DOE) features. The features are + the file name. The contents of each file is the raw vendor id and + data object feature values. + + 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 the doe_discovery file, with + this contents + + # cat doe_features/doe_discovery + 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:01 0001:02 doe_discovery diff --git a/drivers/pci/doe.c b/drivers/pci/doe.c index defc4be81bd4..580370dc71ee 100644 --- a/drivers/pci/doe.c +++ b/drivers/pci/doe.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -47,6 +48,7 @@ * @wq: Wait queue for work item * @work_queue: Queue of pci_doe_work items * @flags: Bit array of PCI_DOE_FLAG_* flags + * @sysfs_attrs: Array of sysfs device attributes */ struct pci_doe_mb { struct pci_dev *pdev; @@ -56,6 +58,10 @@ struct pci_doe_mb { wait_queue_head_t wq; struct workqueue_struct *work_queue; unsigned long flags; + +#ifdef CONFIG_SYSFS + struct device_attribute *sysfs_attrs; +#endif }; struct pci_doe_feature { @@ -92,6 +98,151 @@ struct pci_doe_task { struct pci_doe_mb *doe_mb; }; +#ifdef CONFIG_SYSFS +static ssize_t doe_discovery_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sysfs_emit(buf, "0001:00\n"); +} +DEVICE_ATTR_RO(doe_discovery); + +static struct attribute *pci_doe_sysfs_feature_attrs[] = { + &dev_attr_doe_discovery.attr, + NULL +}; + +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) + +const struct attribute_group pci_doe_sysfs_group = { + .name = "doe_features", + .attrs = pci_doe_sysfs_feature_attrs, + .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->sysfs_attrs; + struct device *dev = &pdev->dev; + unsigned long i; + void *entry; + + if (!attrs) + return; + + doe_mb->sysfs_attrs = NULL; + xa_for_each(&doe_mb->feats, i, entry) { + if (attrs[i].show) + sysfs_remove_file_from_group(&dev->kobj, &attrs[i].attr, + pci_doe_sysfs_group.name); + kfree(attrs[i].attr.name); + } + kfree(attrs); +} + +static int pci_doe_sysfs_feature_populate(struct pci_dev *pdev, + struct pci_doe_mb *doe_mb) +{ + struct device *dev = &pdev->dev; + struct device_attribute *attrs; + unsigned long num_features = 0; + unsigned long vid, type; + unsigned long i; + void *entry; + int ret; + + xa_for_each(&doe_mb->feats, i, entry) + num_features++; + + attrs = kcalloc(num_features, sizeof(*attrs), GFP_KERNEL); + if (!attrs) + return -ENOMEM; + + doe_mb->sysfs_attrs = 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; + + if (vid == 0x01 && type == 0x00) { + /* DOE Discovery, manually displayed by `dev_attr_doe_discovery` */ + continue; + } + + attrs[i].attr.name = kasprintf(GFP_KERNEL, + "%04lx:%02lx", vid, type); + if (!attrs[i].attr.name) { + ret = -ENOMEM; + goto fail; + } + + attrs[i].attr.mode = 0444; + attrs[i].show = pci_doe_sysfs_feature_show; + + ret = sysfs_add_file_to_group(&dev->kobj, &attrs[i].attr, + pci_doe_sysfs_group.name); + if (ret) { + attrs[i].show = NULL; + if (ret != -EEXIST) + goto fail; + else + kfree(attrs[i].attr.name); + } + } + + return 0; + +fail: + pci_doe_sysfs_feature_remove(pdev, doe_mb); + return ret; +} + +void pci_doe_sysfs_teardown(struct pci_dev *pdev) +{ + struct pci_doe_mb *doe_mb; + unsigned long index; + + xa_for_each(&pdev->doe_mbs, index, doe_mb) + pci_doe_sysfs_feature_remove(pdev, doe_mb); +} + +int pci_doe_sysfs_init(struct pci_dev *pdev) +{ + struct pci_doe_mb *doe_mb; + unsigned long index; + int ret; + + xa_for_each(&pdev->doe_mbs, index, doe_mb) { + ret = pci_doe_sysfs_feature_populate(pdev, doe_mb); + if (ret) + return ret; + } + + return 0; +} +#endif + static int pci_doe_wait(struct pci_doe_mb *doe_mb, unsigned long timeout) { if (wait_event_timeout(doe_mb->wq, diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 40cfa716392f..db795bfe3c56 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -1143,6 +1144,9 @@ static void pci_remove_resource_files(struct pci_dev *pdev) { int i; + if (IS_ENABLED(CONFIG_PCI_DOE)) + pci_doe_sysfs_teardown(pdev); + for (i = 0; i < PCI_STD_NUM_BARS; i++) { struct bin_attribute *res_attr; @@ -1227,6 +1231,14 @@ static int pci_create_resource_files(struct pci_dev *pdev) int i; int retval; + if (IS_ENABLED(CONFIG_PCI_DOE)) { + retval = pci_doe_sysfs_init(pdev); + if (retval) { + pci_remove_resource_files(pdev); + return retval; + } + } + /* Expose the PCI resources from this device as files */ for (i = 0; i < PCI_STD_NUM_BARS; i++) { @@ -1661,6 +1673,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..3aee231dcb0c 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 const 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; @@ -333,6 +335,14 @@ static inline void pci_doe_destroy(struct pci_dev *pdev) { } static inline void pci_doe_disconnected(struct pci_dev *pdev) { } #endif +#if defined(CONFIG_PCI_DOE) && defined(CONFIG_SYSFS) +int pci_doe_sysfs_init(struct pci_dev *pci_dev); +void pci_doe_sysfs_teardown(struct pci_dev *pdev); +#else +static inline int pci_doe_sysfs_init(struct pci_dev *pdev) { return 0; } +static inline void pci_doe_sysfs_teardown(struct pci_dev *pdev) { } +#endif + /** * pci_dev_set_io_state - Set the new error state if possible. * From patchwork Wed Jul 10 02:33:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 13728807 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 7FD5D3C6AC; Wed, 10 Jul 2024 02:33:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720578836; cv=none; b=oeF6I0B9phFw/vAqOKvAiTzLSYj0fvuxYtrQ3xwK2Gfu2R5Og7jHMhzhyPU3adNAdjOtE53pkHRddYtH3hFOycTOolLWiz6jGcNg5/ILMxowo+nlxQvFW2qBMEoW43HN4fh4FTwGT8cOq52/z4QWCwVCgxf940WM+mHWdIRPoWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720578836; c=relaxed/simple; bh=ZNdxnGPfETJa9uUYOCiuRxUSQF8J7Opi/FFw5TRGvIA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZGqid4Hc40YhP/pBuMAt7KqReBeJQzrC5OxRmB8pvm8KnhX+IvaA5NSjif7mTKtN1a8f33tX+yO4Y4TyQ7fAZNqGChDtz2qKP/Oxg9lqpBOVbYxJT1esXKUb6J4HaQk0zarJFj9zul6JHN1JNRK5/pmZra48trEG8uT6YD1FzOA= 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=MFNH6AhN; arc=none smtp.client-ip=209.85.210.181 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="MFNH6AhN" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-70b4267ccfcso1586985b3a.3; Tue, 09 Jul 2024 19:33:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578835; x=1721183635; 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=MFNH6AhNpRyq4PTVVxMcre3QKkYdBY5+X6q87//tiAe+IiwSLBTMHgbfCkboD6EyU1 MCmHgP+j9rIRSAvLe4qVeh0y/tAU0k+S+y8trhHGq8+rDZ3tVwza/a6Kri018KFZPLBH pWDiY6jJQHoePBdZQpfAOv6lw630y8QhTE3gY8iOT2eDJJIrIq9EjTJYGV6vM6G3ir9R A2ugJHyxbILk/VLE/NFGsvLLiCcO0FIDRFks2NKacAxtqOiBXV3GyyOpIQuRfb53SLxX 3cgtkQXw2a6wNdwwMOWRgudekmLy9RcJzDEOBS5fEqPQivczwtGExrVlY6mzEaaVHGbU kmdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578835; x=1721183635; 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=XAwTwP+1mr6rFVKeAYe9rB4VxomVYkiDs+HnVwAdKY3POz8ubcSVM72b98X+d4/x0m KRtbvYTc18xtjyOXlLYoAH3iP/86v000WYqw+v/epzXdYGuaj8xxVWxhKrBF6c4w6ixp q3IVr/QTCxlg+V1RKpcsvbZQqyWLweaxexoLYg1ZlUkgJXTMgMvpSL9osP84AqLbqJ/I Ewgfr/xTRVo0apyJLSR+VTta2dp32EP4MKOvBnekjUARv40phIZGSAP0HtDS4S5Z/b+S /Yqr2UTfizeIfZijanAhV3sI+af/8e+UHfXTq1NJp4uWwvrFjJaR52rpspytXEkVDiGD 5gyw== X-Forwarded-Encrypted: i=1; AJvYcCU9tjAYs92N3CYJp4OulBnwO9esproD88Y8UD/hH9LvElOTsP8tTj0LGLQpH9hVI/OCGsETb4nP7X/NgnVgVBq4c+NvkXSJ/3cFg+7zvf+Y6XlW3tr2OIbrlc9W+vhwFR0aHFe4QgYZ X-Gm-Message-State: AOJu0YyCQ3lh7e+9cLa/H3+AKs+IHFwFz/SiEoZI2zU/Wz16Yhrvhe+5 iyrCJLYKGbltsXlBcDMcy3cCQMi2veX7KTsZpcLc2B4yl8o9WEk8 X-Google-Smtp-Source: AGHT+IECMI55o2YAxIbwis8rCI5ypoHccC3BasteSVpSq5u0Ig5C2GFoNxu8zwMPE8b3bdYhobfbgA== X-Received: by 2002:a05:6a00:90a2:b0:705:a32c:8b35 with SMTP id d2e1a72fcca58-70b43587c90mr4295525b3a.19.1720578834626; Tue, 09 Jul 2024 19:33:54 -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 d2e1a72fcca58-70b439b30b9sm2630992b3a.178.2024.07.09.19.33.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:33:54 -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 v14 4/4] PCI/DOE: Allow enabling DOE without CXL Date: Wed, 10 Jul 2024 12:33:10 +1000 Message-ID: <20240710023310.480713-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240710023310.480713-1-alistair.francis@wdc.com> References: <20240710023310.480713-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