From patchwork Tue Aug 6 23:01: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: 13755412 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.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 0625D149DE2; Tue, 6 Aug 2024 23:01:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722985301; cv=none; b=Y1jd+49bbxnSbKdD4gCyantS6bTzIQuVV2tA++dkaJsdyoFa93M8p5CvVwdSnzs/9A7HoescdhMebxS//tF7t4JhGFtkMeY29aU2weWOkmF24fTInYb/gr7GtlYlKMByRs8NmlbB6F6ZTFVJknmCfMvXT9vKjhhbW8QNef/iSrc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722985301; c=relaxed/simple; bh=f1xiifrjh7vKfrNfmLwT2AO9GXKGE9rht8EESovRZ6w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=l51iGUPc4s2p9PmjYxT7ZHqOjKns83gFDCPE7yEH2EspdnY0gAWI4VvzExxC4hMpm2rpaEB6+3haJFMh8aOeu5IZpyrn9sSuFzMbhIpSWdkz9cDtxaRFsbIK4psZMISzG8Od8kNkrsuX4Ab3T1/Lw0+yAMiJeTlOjg2RWAJh0Yg= 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=HpUxnG3N; arc=none smtp.client-ip=209.85.214.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="HpUxnG3N" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1fc56fd4de1so2546335ad.0; Tue, 06 Aug 2024 16:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722985299; x=1723590099; 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=qC3rSICI9IoAuJIQSFewWSX2BQATF5BEMr9DE8NVX7U=; b=HpUxnG3N3FFGPGWFaYyzDigE6WLyGC1g0paR6CvbFN5qrUf0Ean+Ml10qj6Z8heMYw HJPvQql2ymvrBPPTrY4hhfTs6g8OlrI8IpfRwNq+R/ClDJKagGrE2ULXdcskLIEmOIoz M655kaDVSeEfDNWHN2mNRczTrcMUG04oZYrT6DBLEwyEry33kRcgKNiVg030zuTlH7u+ vJhDoiAhaj8r5hCzM4ESudlKXBoDeCtBf8vlcoeL8NAvYQ0+q0Vq9gESldEWvcXBDxf0 JmHWaVNziJwvu7tGaeC5c+7SojytRTmCxoYh4o5Pt62gAkgOHq3KBkEFDg93nEu+NV/n yL+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722985299; x=1723590099; 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=qC3rSICI9IoAuJIQSFewWSX2BQATF5BEMr9DE8NVX7U=; b=sUPp1ASQ3ClTry4XFWF9gS4rLqukBnTiKzaXimM4X3Dje78hb6IxWb9memLe+alTst IslW4Qq3biiiWLZhWaTFUT9/eDuhadnZq7VbHRzyitxPTHVzTGx/dj3+D9+p5vkhnT4D SGjOhk/hXDftOX70ATJDl1ZbatvkfjDwi3izM3ruEnwSGwu8GNxMOYtA94C52mNmOCNc s14eep4qSTbO5AaHzMyqToWrTbq0ly6ZZnKM5pFPEN/ROv8T4jScwa37TRI5lraLP7Hi AQAKizjOnj0vtE8e5lYmyt2xcGz5d/KZzq8B2RbfAb5W1q7lohCDNmAhM6zyO+rjWwyU 4m1A== X-Forwarded-Encrypted: i=1; AJvYcCUEQD3Kyaybr8ijsJJukjoO3fGXMK9OUbzBpPqQ8f/a4eXFpWabGEJWIuqLuJrzHhzFWmvXCAN0Bpqd1K+3QruWfaOugL77jxV0cN3WJ1X1cNDbpqsM1ao/vp0ybUzS0DjzZdBnpnXZ X-Gm-Message-State: AOJu0YxLWCknBqTBKUTqd4IF/1qwRwpLHrLVTO9GVM/cjzE0tAy70kqg 9JbOL3+YRwz3PomZ+fRepBYIjSc4KUaQ8TCXi+LQreXMvA0PhxDH X-Google-Smtp-Source: AGHT+IGQGq476FDad1g00jhCresKLvmhdVnks40yA57CXQpJny0xtG5Iqg7MOXiJR/olGoc1WqP55w== X-Received: by 2002:a17:902:da8d:b0:1fc:5b81:729f with SMTP id d9443c01a7336-200855706cemr4295465ad.32.1722985298865; Tue, 06 Aug 2024 16:01: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 d9443c01a7336-1ff592b3997sm92780755ad.294.2024.08.06.16.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 16:01:37 -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 v15 1/4] PCI/DOE: Rename DOE protocol to feature Date: Wed, 7 Aug 2024 09:01:15 +1000 Message-ID: <20240806230118.1332763-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 --- v15: - No changes 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 Tue Aug 6 23:01: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: 13755413 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.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 EE9DF17556B; Tue, 6 Aug 2024 23:01:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722985306; cv=none; b=lOzeVWQOsH8N+zY5F1BDpbOb34fFgWr03vLEjtMMKfF48Y5F6yJYsb1Hox4YZ+fpH2KbE4j89DNS2dYQE84IUZZP3mtQgup7y2w1LbZf1T+RRQSU8+jaEDI3EcHb6wvxyrtsNf687OHsX8dARo6j/6hFWSK8wOMwir2At2/Uc/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722985306; c=relaxed/simple; bh=HtsBKDBMijTjd1okJzxrq2oHGtLd5WEmbJKrG9xXqW8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SjEhqaiMjCN158ynINE/IhdWm14xqcqIeA8tPX9dK1Now7f21yioZ1CbsvJj40RI7Uu0lOjAbzzmp22nGsiw+vqjvxzYu7OSz2AITC2ihKRDMKizsjUZBk0sPrBpiwAEXTUgOXrsqIrmhRbw+Wkf4JM2FrGXksrD7VpZ29vmb3s= 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=C/c2XThn; arc=none smtp.client-ip=209.85.214.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="C/c2XThn" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1fec34f94abso11468845ad.2; Tue, 06 Aug 2024 16:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722985304; x=1723590104; 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=xwZ+ccC34/aW915VxJFlGcLKeYK2TBqhEN1WMQ3EwR8=; b=C/c2XThnHH3akkour/7kkM5blFiPv7SnlMevjfin8F/OMLjMseulL/W9z0JMWp/Fii 8zg/ILtDOGY7jNycePzH9GegSq90eMCSReDm4PQYzu/y3dr8DKmNGwOfEWnQpYb+9dbC srDJaNasZaaDvR4eKdQtW3oXll/QJZVxd+3xUxjBkPynIbLHT4JgtjOvGI/055kAb8Uh mz16a2dEmrhtuuOu/cEqwF1n6DYLYToYoqNCBVjyYn2o6sdlQiXCTxzzKPepGlu/5vW/ 2VjmkpKrz+uvRn0MKalzcfb3A/xlUXxIqgr7JUbBxiRDVF0n2nb4/DCvr/hj2h8zn2YU 03/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722985304; x=1723590104; 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=xwZ+ccC34/aW915VxJFlGcLKeYK2TBqhEN1WMQ3EwR8=; b=OxIeuA9whKwaZYu6g7id+Hdv1Rw9G4/GwUhssRa8ZpXl7/J2uRoVz+cHl5GD/78sdQ E03uC/2pWBhnr8b2UhWncJ9Qe+npLGhzZ0aqMP4sT9yVzVy5Hieg3V1DpGuxdqocSjOU L2XZqBLpWGL77k0WGVTJP/MCxFxOVTxtGxAV0IURCRE8Pe9MG/s/Y/3E+QasKCF6Plun 1xuP8iA7jE3K8esqF1k/CRhRx1owoTGdg67enSwJCkoqaVuvtBIGFVXsglwKYuVSvrjn wcEwFJaYgDe3NWmtNs7UjerbIprM39Yn2U3ylw8NC08dyC3AJ8hSI66978ZreP46hGW1 O5Mg== X-Forwarded-Encrypted: i=1; AJvYcCXQVl3Y3em7p+pzq0CjrjnKA6mdB4yiDuVYYBzhgRUioGVo8Cg6Efj64rIy/ISuS2MXHfma354a9/kh1aKFJK/LqAYqAJ42Jllj/l3gBNswAUlhS1ivtHRakXhDuRu40aW0nHUcM6h1 X-Gm-Message-State: AOJu0Yze+0gNr3H8hQhkvhAfL2GQb5g7Wyfu+Qrk+m2ohcqCvwG3oeBM KaqwA3dzMr4KSfAK9qEv93ymOLclsYTv/vn+XxTGx5bwDz1qgxbm X-Google-Smtp-Source: AGHT+IEKDuAubKC927Eq3xY4Mh5Y8/8FdLj0XWW9ehxWNGWjFVBRn6KHCtFmlHjpQmwT4tp621oKzQ== X-Received: by 2002:a17:902:dac4:b0:1fb:90e1:c8c5 with SMTP id d9443c01a7336-1ff572c487fmr162715205ad.33.1722985304104; Tue, 06 Aug 2024 16:01:44 -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-1ff592b3997sm92780755ad.294.2024.08.06.16.01.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 16:01: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 v15 2/4] PCI/DOE: Rename Discovery Response Data Object Contents to type Date: Wed, 7 Aug 2024 09:01:16 +1000 Message-ID: <20240806230118.1332763-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240806230118.1332763-1-alistair.francis@wdc.com> References: <20240806230118.1332763-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 --- v15: - No changes 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 Tue Aug 6 23:01: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: 13755414 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 55E28176AB6; Tue, 6 Aug 2024 23:01:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722985312; cv=none; b=FB7pkrzgs7MjcgWJ9fqXhu8uNzbzLMQv4jKnl2jF2aSasOHtmYPzHoI9ynxzS9WJwIRUsAhX3X/iiUQls2Xzkue1b1qMwIxcJjgpmiV4StwNtlo5xubvBTWyXpQ+vvdfJJtU+CySERqPT2eg+mZlcabfWDDvjBxaaceDz0sblso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722985312; c=relaxed/simple; bh=KO7jfs2TgLEqYga30ZQedBWQkxKaRq9/xa6Gd+MXuiQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KorhCEeCTj7tAoFMJlvvRkQBP0H7SfDS0o29TqExUEcuBVWrqta05EQ0v+s8LVaN6XT7qTE8YfqJ2aQK0Y9QU0b9fmmTSUcCDKoytjW8nAOaIgLDteqBxABJ3tj3cWtjXK7bvlC5g85ikrprNVgyTcwF6U4PVrEVe4ngxHWH4go= 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=dCmuZyOV; arc=none smtp.client-ip=209.85.210.177 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="dCmuZyOV" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7104f939aa7so905445b3a.1; Tue, 06 Aug 2024 16:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722985309; x=1723590109; 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=uuhsPmOnvfzH2aVBohpHkJgMNzD8vpge8Y7lGmsDU5A=; b=dCmuZyOVx1TCrHcOpMPpn75W90g0hiCmsgXv7ZUIyad5e4fkZW4cZAgVxPYaxoG+gF s5r/F5fSsL3YaTJgAzu0baipmzl15BH6OLcNGxdK6NN35gBpIJyutiw3SAwYbs3pDs4I 4Uw1e0wLydbDAcwMwV8EcQlm73IlONqZ8UQhDfxmd4hJZCcoHxYECtLOlh6+cwKcdygA FlfwZeJva6weFbkWqxiAoJ8YVUUOvuSLF/tv7m8Ea1++kcZdM3VpeC3QjgfPjXHOyqQH /zepxH9duW+vF9Ja22o0LpR6+DKCerag12jsl54PjHVq16XxTSgv4Ri/NGeOO6IN11Hl OlFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722985309; x=1723590109; 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=uuhsPmOnvfzH2aVBohpHkJgMNzD8vpge8Y7lGmsDU5A=; b=UVN1GL5FVTf7MyseK7cplUeevBcrOUySKfRfrybsWXY23fGMvp6/XmQFsA9zRLcs2b 11V5aTGXwurD3q/rF2mtuhcqPCkrq9+FbqCwV71IYSYMndXHlh5CIg5OuNjOuPyIPcmu NeWQAsEmWyXHqk/9PXBsVKLlOFvhaGshokeWICfCdu+3M1cxcWtY6JK+g6qArq2rQaeh lNlDfvpfcrlvrTkKNwLJraVdKCOrKJn1A2XQEvnTbJ1adegCffh97IQL1Mv3b/3jqkFd 82jMrmHXL+1uTCy2yneUqI4r2ea8A0vcCcn+IklykiFxGJ1R3qgjiBTB7tRTCJczR37O UwWA== X-Forwarded-Encrypted: i=1; AJvYcCWlT4XJAK8iCiSCofUUSISPDH+eJyeWOSiiUitv27lJMkSm1Cr03Nh9f0NSFrA9r0c+OrUTUnPHvAx1eN6PAYAlp1wPzjCBmf7/WpXpX4ZSgHDlozqDMynKZUkFuI9VMZqfP5ba1hYR X-Gm-Message-State: AOJu0YxH5PlWA/1ViC6ZhHou6MQlNj7hjHKXTvrexIpTfWSSmnaASgPX c8aTyDUGgxytS33d8PAcigvd6Q7oOprYNbpkI2lmn73T4VjEgHB1 X-Google-Smtp-Source: AGHT+IEhFIq2phH3dKCdml4INS8n46f8eD7IaThGDAhAL0HwoW6Q48rxPIj0+h1uupeq9rgPj0T7MA== X-Received: by 2002:a17:902:da83:b0:1fd:96e1:801e with SMTP id d9443c01a7336-1ff57404e3fmr211554085ad.51.1722985309349; Tue, 06 Aug 2024 16:01: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 d9443c01a7336-1ff592b3997sm92780755ad.294.2024.08.06.16.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 16:01:49 -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 v15 3/4] PCI/DOE: Expose the DOE features via sysfs Date: Wed, 7 Aug 2024 09:01:17 +1000 Message-ID: <20240806230118.1332763-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240806230118.1332763-1-alistair.francis@wdc.com> References: <20240806230118.1332763-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 --- Using dev->groups and device_add() path as discussed earlier [1] doesn't work nicley as the pci_doe_sysfs_group is global. We end up needing to create a per device instance of dev->groups that is dynamically modified at init and appended to pci_dev_attr_groups. Something similar to: https://elixir.bootlin.com/linux/latest/source/drivers/iio/industrialio-core.c#L2029 except in this case groups is already assigned. It's complex and doesn't provide any advantages compared to the approach in this patch, where we can just use sysfs_add_file_to_group() to add the sysfs attributes. This aligns with other PCIe DOE related sysfs patches, such as [2] 1: https://lore.kernel.org/all/20231019165829.GA1381099@bhelgaas/ 2: https://lore.kernel.org/all/77f549685f994981c010aebb1e9057aa3555b18a.1719771133.git.lukas@wunner.de/ v15: - Move init/teardown from pci_{create,remove}_resource_files() - Remove `if (IS_ENABLED(CONFIG_PCI_DOE))` checks 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 | 144 ++++++++++++++++++++++++ drivers/pci/pci-sysfs.c | 3 + drivers/pci/pci.h | 9 ++ drivers/pci/probe.c | 3 + drivers/pci/remove.c | 2 + 6 files changed, 189 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..c0e1ed3bddfb 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,144 @@ 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)); + + return !xa_empty(&pdev->doe_mbs); +} +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 == PCI_VENDOR_ID_PCI_SIG && type == PCI_DOE_FEATURE_DISCOVERY) { + /* 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..eeda0c650537 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1661,6 +1661,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 79c8398f3938..abac97efc8fc 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -232,6 +232,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) { } @@ -398,6 +399,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. * diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b14b9876c030..2bdb4fe37dbc 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2593,6 +2593,9 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) dev->match_driver = false; ret = device_add(&dev->dev); WARN_ON(ret < 0); + + ret = pci_doe_sysfs_init(dev); + WARN_ON(ret < 0); } struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn) diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 910387e5bdbf..d1e0bed53acb 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -34,6 +34,8 @@ static void pci_destroy_dev(struct pci_dev *dev) if (!dev->dev.kobj.parent) return; + pci_doe_sysfs_teardown(dev); + device_del(&dev->dev); down_write(&pci_bus_sem); From patchwork Tue Aug 6 23:01: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: 13755415 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 5B5DC176AC2; Tue, 6 Aug 2024 23:01:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722985316; cv=none; b=qCi0wI3+ctJ3UnUF3AN6qVa+PoDkeZNA/Qe8w7k1hvYn4DSDHX9I5LSf3wS8s8djY4wEQrPjysArYQibO/XFbhKOYP0Vb2XiO7Y42sdoPyOuhvecW5/qixveyyTfmlnfnPM0kUZLRyhnzCoaiyoGYaAirbzDQf6YTrygThkb8Pc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722985316; c=relaxed/simple; bh=E7F+jikrY1ea4Cg2U9hTgk3SA6CkkasrCnZSU7WQ9+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I9MtnwP1QKF7ulEP+5QszlnzlaN2vajZFB6+IDvVgOH8wYbYvnMUhrmnc2JB4oKFTxg0ZrDx5rNyzU848aKhogRuRVjw9DCa1GUmau4fTuYlVYSqCVNp9ymvOEzcgEipJxiU8EX0xjFfRgaBPy4sYGGXLMU8zB0lf1S4rM03T5c= 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=WbSgrCGk; arc=none smtp.client-ip=209.85.214.182 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="WbSgrCGk" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1fc5296e214so11376615ad.0; Tue, 06 Aug 2024 16:01:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722985314; x=1723590114; 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=ZdVJJdDCqZKalivgmtRZB9cyZ9uUV+RhJk3mCj9v4vU=; b=WbSgrCGksCNYdvQGk25pRDrHACJKcrgaX96Ezp7eHvhjOxR16vuUqvy7Cpfd5pBrWR e6YHQxcuuHfm1nuKanWITBJ5LwQORACyvCKv2MKbcDxKF0Vkd4H2yw+cFLnCHfrd0Y3v ERLFwjVHk4r/wp+4xalsgyKVKh4LACdXAUIraDOXpcuoy/EjZ59/eg7Gn28Gkj10fjeM B8FY0DcUAmaoieHuYs0754gO5Iw6iHSWEz5R29SH3ihMKLHGizw4v652zBaUXml27J39 mJwFczYewGjC8+3RwSRwfmHuxdyjzt1YA9rCg6WSX+uKPieysQjXCI7WDgPSocSDn6o9 5Lyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722985314; x=1723590114; 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=ZdVJJdDCqZKalivgmtRZB9cyZ9uUV+RhJk3mCj9v4vU=; b=ASbmMDeYRcuhe0Fl/wzAqO11EewQgAEYFGPeTukV+353iY7C5KVjBZx+45P3IP29hl zGAY98Gp07bb3sqaIjb28HGIGw6EQqAb0eqXsBwLcGLYCAQgOLUqtvnqNtCitc3Mpih8 vbK1rJOfKYuT6QB7kJa4vombDC7cTNaWJJoz1h7S3qNjWPyDaxtIHNayzcxX8BuoIGA/ i22lpTE/tfTX8Xx/F7kPMVGGvmgJuHxLXuuXePE60HeaLXNlS4ZC/8+57MghqKATlkTA 1nISMc40OXAwnFTsuxYAM2BvBFH9Dneo+2mzJ+S0AeixIRVS6nWU1tkVyQT0sBu0pdga RWqA== X-Forwarded-Encrypted: i=1; AJvYcCW8aAVjcV5JU/QB/4RdhXIJG5Exa/IG0a+eGtapcQRoryJKOEhNrH5+/bhVhaYoalGvqXc1aXarycR1fNyfv/1S57GYxlaS2vws9JzjW/KXaOuTtoPjOBdxdWeMs+RDP1oivfu++kNK X-Gm-Message-State: AOJu0Yyxlm74JpBpOyoD5y+HaaEaR5OmIFPEvjq/Bgg4kBbXXNRi3d0c nk39b+exn975vNGeIlvFxQIqzaHUr02zZIRac5QmahgFYNTTtSsA X-Google-Smtp-Source: AGHT+IGKu6Uu5p66KKRw86KqLzb0kdhVrY7CZb8sOV5pguHraF37uyOcTxKsqC18hMgJMQrSsoYZmg== X-Received: by 2002:a17:903:41cf:b0:1fc:5820:8940 with SMTP id d9443c01a7336-1ff57274b55mr215231055ad.20.1722985314508; Tue, 06 Aug 2024 16:01: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 d9443c01a7336-1ff592b3997sm92780755ad.294.2024.08.06.16.01.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 16:01: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 v15 4/4] PCI/DOE: Allow enabling DOE without CXL Date: Wed, 7 Aug 2024 09:01:18 +1000 Message-ID: <20240806230118.1332763-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240806230118.1332763-1-alistair.francis@wdc.com> References: <20240806230118.1332763-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 aa4d1833f442..173dbcfc3b47 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