Re: [PATCH resend v6 04/10] PCI/TSM: Authenticate devices via platform TSM

[<dan.j.williams@intel.com>]

Alexey Kardashevskiy wrote:
> 
> 
> On 12/9/25 09:56, Dan Williams wrote:
> 
> [...]
> 
> > --- a/include/linux/pci-doe.h
> > +++ b/include/linux/pci-doe.h
> > @@ -15,6 +15,10 @@
> >   
> >   struct pci_doe_mb;
> >   
> > +#define PCI_DOE_FEATURE_DISCOVERY 0
> > +#define PCI_DOE_PROTO_CMA 1
> > +#define PCI_DOE_PROTO_SSESSION 2
> 
> These are "features" now:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b4db6be0ceec490f639d2e47449ffe3dd6db7679

Ah, thanks for the heads up. I will just append this fixup for v2 of the
TEE I/O series rather than resend patch4 again... unless something
bigger comes up requiring a respin.

-- 8< --
Subject: PCI/TSM: Rename new DOE defines from "protocol" to "feature"

From: Dan Williams <dan.j.williams@intel.com>

Follow the lead of:

b4db6be0ceec ("PCI/DOE: Rename DOE protocol to feature")

...and move the new PCI/TSM definitions to "feature".

Reported-by: Alexey Kardashevskiy <aik@amd.com>
Closes: http://lore.kernel.org/9ca082b6-ff38-4401-860e-e40d4437c3a3@amd.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 drivers/pci/tsm.c       |    2 +-
 include/linux/pci-doe.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/tsm.c b/drivers/pci/tsm.c
index 724a58e3ccf1..f0202e52ce2d 100644
--- a/drivers/pci/tsm.c
+++ b/drivers/pci/tsm.c
@@ -464,7 +464,7 @@ int pci_tsm_pf0_constructor(struct pci_dev *pdev, struct pci_tsm_pf0 *tsm,
 {
 	mutex_init(&tsm->lock);
 	tsm->doe_mb = pci_find_doe_mailbox(pdev, PCI_VENDOR_ID_PCI_SIG,
-					   PCI_DOE_PROTO_CMA);
+					   PCI_DOE_FEATURE_CMA);
 	if (!tsm->doe_mb) {
 		pci_warn(pdev, "TSM init failure, no CMA mailbox\n");
 		return -ENODEV;
diff --git a/include/linux/pci-doe.h b/include/linux/pci-doe.h
index 7d839f4a6340..bd4346a7c4e7 100644
--- a/include/linux/pci-doe.h
+++ b/include/linux/pci-doe.h
@@ -16,8 +16,8 @@
 struct pci_doe_mb;
 
 #define PCI_DOE_FEATURE_DISCOVERY 0
-#define PCI_DOE_PROTO_CMA 1
-#define PCI_DOE_PROTO_SSESSION 2
+#define PCI_DOE_FEATURE_CMA 1
+#define PCI_DOE_FEATURE_SSESSION 2
 
 struct pci_doe_mb *pci_find_doe_mailbox(struct pci_dev *pdev, u16 vendor,
 					u8 type);