PCI/DOE: Support discovery version 2
PATCH v3 1/1 PCI/DOE: Support discovery version 2
PCIe r6.1, sec 6.30.1.1 defines a "DOE Discovery Version" field in the DOE Discovery Request Data Object Contents (3rd DW) as:
15:8 DOE Discovery Version – must be 02h if the Capability Version in the Data Object Exchange Extended Capability is 02h or greater.
Add support for the version on devices with the DOE v2 capability.
---
Changes:
v3:
* updated subject line
* dropped "DISCOVER_" from the new field macro
v2:
* added the section number to the commit log
--- include/uapi/linux/pci_regs.h | 1 + drivers/pci/doe.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)
include/uapi/linux/pci_regs.h +1 -0
@@ -1144,6 +1144,7 @@#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff#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_NEXT_INDEX 0xff000000
drivers/pci/doe.c +8 -3
@@ -381,11 +381,13 @@ static void pci_doe_task_complete(struct pci_doe_task *task)complete (task->private); } -static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 *index,u16 *vid, +static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 capver,u8 *index,u16 *vid,u8 *protocol) {u32 request_pl =FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX , - *index); + *index) | +FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER , + (capver >=2 ) ?2 :0 );__le32 request_pl_le =cpu_to_le32 (request_pl);__le32 response_pl_le;u32 response_pl;
@@ -419,13 +421,16 @@ static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) {u8 index =0 ;u8 xa_idx =0 ; +u32 hdr =0 ; + +pci_read_config_dword (doe_mb->pdev, doe_mb->cap_offset, &hdr); do { int rc; u16 vid; u8 prot; - rc = pci_doe_discovery(doe_mb, &index, &vid, &prot); + rc = pci_doe_discovery(doe_mb, PCI_EXT_CAP_VER(hdr), &index, &vid, &prot); if (rc) return rc;
Signature · 1 line
2.41.0
Quoted 5 lines · Alexey Kardashevskiy
PCIe r6.1, sec 6.30.1.1 defines a "DOE Discovery Version" field in the DOE Discovery Request Data Object Contents (3rd DW) as:
15:8 DOE Discovery Version – must be 02h if the Capability Version in the Data Object Exchange Extended Capability is 02h or greater.
Does this change fix any functional issue? If yes, please add Fixes:
tag and probably CC stable?
Quoted 5 lines
Add support for the version on devices with the DOE v2 capability.
Signed-off-by Alexey Kardashevskiy <[email protected]>---
Change wise looks fine to me.
Quoted 62 lines
Changes:
v3:
* updated subject line
* dropped "DISCOVER_" from the new field macrov2:
* added the section number to the commit log--- include/uapi/linux/pci_regs.h | 1 + drivers/pci/doe.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)include/uapi/linux/pci_regs.h +1
-0@@ -1144,6 +1144,7 @@#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff#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_NEXT_INDEX 0xff000000drivers/pci/doe.c +8
-3@@ -381,11 +381,13 @@ static void pci_doe_task_complete(struct pci_doe_task *task)complete (task->private); } -static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 *index,u16 *vid, +static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 capver,u8 *index,u16 *vid,u8 *protocol) {u32 request_pl =FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX , - *index); + *index) | +FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER , + (capver >=2 ) ?2 :0 );__le32 request_pl_le =cpu_to_le32 (request_pl);__le32 response_pl_le;u32 response_pl;@@ -419,13 +421,16 @@ static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) {u8 index =0 ;u8 xa_idx =0 ; +u32 hdr =0 ; + +pci_read_config_dword (doe_mb->pdev, doe_mb->cap_offset, &hdr); do { int rc; u16 vid; u8 prot; - rc = pci_doe_discovery(doe_mb, &index, &vid, &prot); + rc = pci_doe_discovery(doe_mb, PCI_EXT_CAP_VER(hdr), &index, &vid, &prot); if (rc) return rc;
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
Quoted 10 lines · Kuppuswamy Sathyanarayanan
Quoted 5 lines · Alexey Kardashevskiy
PCIe r6.1, sec 6.30.1.1 defines a "DOE Discovery Version" field in the DOE Discovery Request Data Object Contents (3rd DW) as:
15:8 DOE Discovery Version – must be 02h if the Capability Version in the Data Object Exchange Extended Capability is 02h or greater.
Does this change fix any functional issue? If yes, please add Fixes:
tag and probably CC stable?
The issue is that before this patch the DOE driver was following PCIe r6.0 and it was not working on a device with DOE cap v2 added in r6.1. Is it "fixes"?
Quoted 8 lines
Quoted 5 lines
Add support for the version on devices with the DOE v2 capability.
Signed-off-by Alexey Kardashevskiy <[email protected]>---
Change wise looks fine to me.
Reviewed-by Kuppuswamy Sathyanarayanan <[email protected]>
Thanks!
Quoted 63 lines
Quoted 62 lines
Changes:
v3:
* updated subject line
* dropped "DISCOVER_" from the new field macrov2:
* added the section number to the commit log--- include/uapi/linux/pci_regs.h | 1 + drivers/pci/doe.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)include/uapi/linux/pci_regs.h +1
-0@@ -1144,6 +1144,7 @@#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff#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_NEXT_INDEX 0xff000000drivers/pci/doe.c +8
-3@@ -381,11 +381,13 @@ static void pci_doe_task_complete(struct pci_doe_task *task)complete (task->private); } -static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 *index,u16 *vid, +static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 capver,u8 *index,u16 *vid,u8 *protocol) {u32 request_pl =FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX , - *index); + *index) | +FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER , + (capver >=2 ) ?2 :0 );__le32 request_pl_le =cpu_to_le32 (request_pl);__le32 response_pl_le;u32 response_pl;@@ -419,13 +421,16 @@ static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) {u8 index =0 ;u8 xa_idx =0 ; +u32 hdr =0 ; + +pci_read_config_dword (doe_mb->pdev, doe_mb->cap_offset, &hdr); do { int rc; u16 vid; u8 prot; - rc = pci_doe_discovery(doe_mb, &index, &vid, &prot); + rc = pci_doe_discovery(doe_mb, PCI_EXT_CAP_VER(hdr), &index, &vid, &prot); if (rc) return rc;
Signature · 1 line
Alexey
Quoted 12 lines · Alexey Kardashevskiy
Quoted 8 lines · Kuppuswamy Sathyanarayanan
Quoted 5 lines · Alexey Kardashevskiy
PCIe r6.1, sec 6.30.1.1 defines a "DOE Discovery Version" field in the DOE Discovery Request Data Object Contents (3rd DW) as:
15:8 DOE Discovery Version – must be 02h if the Capability Version in the Data Object Exchange Extended Capability is 02h or greater.
Quoted 7 lines
Quoted 2 lines
Does this change fix any functional issue? If yes, please add Fixes:
tag and probably CC stable?The issue is that before this patch the DOE driver was following PCIe r6.0 and it was not working on a device with DOE cap v2 added in r6.1. Is it "fixes"?
Since you are enabling support for the newer spec version, I think it will not fall under bug fix. But it might be qualified for the stable branch. It depends on
whether you want to support this device in older(stable) kernels.
Quoted 79 lines
Quoted 9 lines
Quoted 6 lines
Add support for the version on devices with the DOE v2 capability.
Signed-off-by Alexey Kardashevskiy <[email protected]>---
Change wise looks fine to me.
Reviewed-by Kuppuswamy Sathyanarayanan <[email protected]>Thanks!
Quoted 57 lines
Quoted 57 lines
Changes:
v3:
* updated subject line
* dropped "DISCOVER_" from the new field macrov2:
* added the section number to the commit log--- include/uapi/linux/pci_regs.h | 1 + drivers/pci/doe.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)include/uapi/linux/pci_regs.h +1
-0@@ -1144,6 +1144,7 @@#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff#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_NEXT_INDEX 0xff000000drivers/pci/doe.c +7
-2@@ -381,11 +381,13 @@ static void pci_doe_task_complete(struct pci_doe_task *task)complete (task->private); } -static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 *index,u16 *vid, +static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 capver,u8 *index,u16 *vid,u8 *protocol) {u32 request_pl =FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX , - *index); + *index) | +FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER , + (capver >=2 ) ?2 :0 );__le32 request_pl_le =cpu_to_le32 (request_pl);__le32 response_pl_le;u32 response_pl;@@ -419,13 +421,16 @@ static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) {u8 index =0 ;u8 xa_idx =0 ; +u32 hdr =0 ; + +pci_read_config_dword (doe_mb->pdev, doe_mb->cap_offset, &hdr); do { int rc; u16 vid; u8 prot;Quoted 6 lines
drivers/pci/doe.c static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) · line 436
Quoted 5 lines
drivers/pci/doe.c +1
-1- rc =pci_doe_discovery (doe_mb, &index, &vid, &prot); + rc =pci_doe_discovery (doe_mb,PCI_EXT_CAP_VER (hdr), &index, &vid, &prot);if (rc)return rc;--
Alexey
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
Quoted 21 lines · Sathyanarayanan Kuppuswamy Natarajan
Quoted 12 lines · Alexey Kardashevskiy
Quoted 8 lines · Kuppuswamy Sathyanarayanan
Quoted 5 lines · Alexey Kardashevskiy
PCIe r6.1, sec 6.30.1.1 defines a "DOE Discovery Version" field in the DOE Discovery Request Data Object Contents (3rd DW) as:
15:8 DOE Discovery Version – must be 02h if the Capability Version in the Data Object Exchange Extended Capability is 02h or greater.
Quoted 7 lines
Quoted 2 lines
Does this change fix any functional issue? If yes, please add Fixes:
tag and probably CC stable?The issue is that before this patch the DOE driver was following PCIe r6.0 and it was not working on a device with DOE cap v2 added in r6.1. Is it "fixes"?
Quoted 4 lines
Since you are enabling support for the newer spec version, I think it will not fall under bug fix. But it might be qualified for the stable branch. It depends on
whether you want to support this device in older(stable) kernels.
I am going to need lot more stuff (TSM, IDE, TDISP) in addition to this but it is coming much later so there is no point in pushing this alone to older kernels. Thanks,
Signature · 1 line
Alexey
Kuppuswamy Sathyanarayanan
Reviewed-byQuoted 24 lines · Alexey Kardashevskiy
Quoted 21 lines · Sathyanarayanan Kuppuswamy Natarajan
Quoted 19 lines · Alexey Kardashevskiy
Quoted 10 lines · Kuppuswamy Sathyanarayanan
Quoted 5 lines · Alexey Kardashevskiy
PCIe r6.1, sec 6.30.1.1 defines a "DOE Discovery Version" field in the DOE Discovery Request Data Object Contents (3rd DW) as:
15:8 DOE Discovery Version – must be 02h if the Capability Version in the Data Object Exchange Extended Capability is 02h or greater.
Does this change fix any functional issue? If yes, please add Fixes:
tag and probably CC stable?The issue is that before this patch the DOE driver was following PCIe r6.0 and it was not working on a device with DOE cap v2 added in r6.1. Is it "fixes"?
Quoted 9 lines
Quoted 4 lines
Since you are enabling support for the newer spec version, I think it will not fall under bug fix. But it might be qualified for the stable branch. It depends on
whether you want to support this device in older(stable) kernels.I am going to need lot more stuff (TSM, IDE, TDISP) in addition to this but it is coming much later so there is no point in pushing this alone to older kernels. Thanks,
Got it.
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
Ping? Is this going anywhere? Thanks,
Quoted 40 lines · Kuppuswamy Sathyanarayanan
Quoted 24 lines · Alexey Kardashevskiy
Quoted 21 lines · Sathyanarayanan Kuppuswamy Natarajan
Quoted 19 lines · Alexey Kardashevskiy
Quoted 10 lines · Kuppuswamy Sathyanarayanan
Quoted 5 lines · Alexey Kardashevskiy
PCIe r6.1, sec 6.30.1.1 defines a "DOE Discovery Version" field in the DOE Discovery Request Data Object Contents (3rd DW) as:
15:8 DOE Discovery Version – must be 02h if the Capability Version in the Data Object Exchange Extended Capability is 02h or greater.
Does this change fix any functional issue? If yes, please add Fixes:
tag and probably CC stable?The issue is that before this patch the DOE driver was following PCIe r6.0 and it was not working on a device with DOE cap v2 added in r6.1. Is it "fixes"?
Quoted 9 lines
Quoted 4 lines
Since you are enabling support for the newer spec version, I think it will not fall under bug fix. But it might be qualified for the stable branch. It depends on
whether you want to support this device in older(stable) kernels.I am going to need lot more stuff (TSM, IDE, TDISP) in addition to this but it is coming much later so there is no point in pushing this alone to older kernels. Thanks,
Got it.
Reviewed-by Kuppuswamy Sathyanarayanan <[email protected]>
Signature · 1 line
Alexey
Quoted 9 lines · Alexey Kardashevskiy
PCIe r6.1, sec 6.30.1.1 defines a "DOE Discovery Version" field in the DOE Discovery Request Data Object Contents (3rd DW) as:
15:8 DOE Discovery Version – must be 02h if the Capability Version in the Data Object Exchange Extended Capability is 02h or greater.
Add support for the version on devices with the DOE v2 capability.
Signed-off-by Alexey Kardashevskiy <[email protected]>
Applied with Sathy's reviewed-by to pci/doe for v6.10, thanks!
Quoted 66 lines
---
Changes:
v3:
* updated subject line
* dropped "DISCOVER_" from the new field macrov2:
* added the section number to the commit log--- include/uapi/linux/pci_regs.h | 1 + drivers/pci/doe.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)include/uapi/linux/pci_regs.h +1
-0@@ -1144,6 +1144,7 @@#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff#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_NEXT_INDEX 0xff000000drivers/pci/doe.c +8
-3@@ -381,11 +381,13 @@ static void pci_doe_task_complete(struct pci_doe_task *task)complete (task->private); } -static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 *index,u16 *vid, +static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 capver,u8 *index,u16 *vid,u8 *protocol) {u32 request_pl =FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX , - *index); + *index) | +FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER , + (capver >=2 ) ?2 :0 );__le32 request_pl_le =cpu_to_le32 (request_pl);__le32 response_pl_le;u32 response_pl;@@ -419,13 +421,16 @@ static int pci_doe_cache_protocols(struct pci_doe_mb *doe_mb) {u8 index =0 ;u8 xa_idx =0 ; +u32 hdr =0 ; + +pci_read_config_dword (doe_mb->pdev, doe_mb->cap_offset, &hdr); do { int rc; u16 vid; u8 prot; - rc = pci_doe_discovery(doe_mb, &index, &vid, &prot); + rc = pci_doe_discovery(doe_mb, PCI_EXT_CAP_VER(hdr), &index, &vid, &prot); if (rc) return rc;Signature · 1 line
2.41.0