CXL ACPI tables for object creation
Alison Schofield
maintainerv2 cover CXL ACPI tables for object creation
Changes since v1 [1]:
- open code the cfmws restrictions to decode flags work (Dan)
- add range info on error messages when adding a decoder fails (Dan)
- make find_dport_by_dev() static (Dan)
- add linux-acpi to cc list (Dan)
[1] https://lore.kernel.org/linux-cxl/[email protected]/
Parse the ACPI CXL Early Discovery Table (CEDT) and use the CHBS & CFMWS when creating port and decoder objects.
CHBS: CXL Host Bridge Structure - Patch 1
CFMWS: CXL Fixed Memory Window Structure - Patch 2
Alison Schofield (2):
cxl/acpi: Add the Host Bridge base address to CXL port objects cxl/acpi: Use the ACPI CFMWS to create static decoder objects
drivers/cxl/acpi.c | 219 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 213 insertions(+), 6 deletions(-)
base-commit: 195d5a63f0f9a47aa128a5050fe4ad7f5d27a901
Signature · 1 line
2.26.2
Alison Schofield
maintainerPATCH v2 1/2 cxl/acpi: Add the Host Bridge base address to CXL port objects
The base address for the Host Bridge port component registers is located in the CXL Host Bridge Structure (CHBS) of the ACPI CXL Early Discovery Table (CEDT). Retrieve the CHBS for each Host Bridge (ACPI0016 device) and include that base address in the port object.
--- drivers/cxl/acpi.c | 105 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 99 insertions(+), 6 deletions(-)
drivers/cxl/acpi.c +99 -6
@@ -8,6 +8,61 @@#include <linux/pci.h> #include "cxl.h" +static struct acpi_table_header *cedt_table; + +static struct acpi_cedt_chbs *cxl_acpi_match_chbs (struct device *dev,u32 uid) +{ +struct acpi_cedt_chbs *chbs, *chbs_match =NULL ; +acpi_size len, cur =0 ; +void *cedt_base; +int rc =0 ; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ; + +while (cur < len) { +struct acpi_cedt_header *c = cedt_base + cur; + +if (c->type !=ACPI_CEDT_TYPE_CHBS ) { + cur += c->length; +continue ; + } + + chbs = cedt_base + cur; + +if (chbs->header.length <sizeof (*chbs)) { +dev_err (dev,"Invalid CHBS header length: %u\n" , + chbs->header.length); + rc = -EINVAL ; +break ; + } + +if (chbs->uid == uid && !chbs_match) { + chbs_match = chbs; + cur += c->length; +continue ; + } + +if (chbs->uid == uid && chbs_match) { +dev_err (dev,"Duplicate CHBS UIDs %u\n" , uid); + rc = -EINVAL ; +break ; + } + cur += c->length; + } +if (!chbs_match) + rc = -EINVAL ; +if (rc) +return ERR_PTR (rc); + +return chbs_match; +} + +static resource_size_t get_chbcr (struct acpi_cedt_chbs *chbs) +{ +return IS_ERR (chbs) ?CXL_RESOURCE_NONE : chbs->base; +} +struct cxl_walk_context {struct device *dev;struct pci_bus *root;
@@ -50,6 +105,21 @@ static int match_add_root_ports(struct pci_dev *pdev, void *data)return 0 ; } +static struct cxl_dport *find_dport_by_dev (struct cxl_port *port,struct device *dev) +{ +struct cxl_dport *dport; + +device_lock (&port->dev); +list_for_each_entry (dport, &port->dports, list) +if (dport->dport == dev) { +device_unlock (&port->dev); +return dport; + } + +device_unlock (&port->dev); +return NULL ; +} +static struct acpi_device *to_cxl_host_bridge (struct device *dev) {struct acpi_device *adev =to_acpi_device (dev);
@@ -71,6 +141,7 @@ static int add_host_bridge_uport(struct device *match, void *arg)struct acpi_pci_root *pci_root;struct cxl_walk_context ctx;struct cxl_decoder *cxld; +struct cxl_dport *dport;struct cxl_port *port;if (!bridge)
@@ -80,8 +151,15 @@ static int add_host_bridge_uport(struct device *match, void *arg)if (!pci_root)return -ENXIO ; -/* TODO: fold in CEDT.CHBS retrieval */ - port =devm_cxl_add_port (host, match,CXL_RESOURCE_NONE , root_port); + dport =find_dport_by_dev (root_port, match); +if (!dport) { +dev_dbg (host,"host bridge expected and not found\n" ); +return -ENODEV ; + } + + port =devm_cxl_add_port (host, match, dport->component_reg_phys, + root_port); +if (IS_ERR (port))return PTR_ERR (port);dev_dbg (host,"%s: add: %s\n" ,dev_name (match),dev_name (&port->dev));
@@ -120,6 +198,7 @@ static int add_host_bridge_dport(struct device *match, void *arg)int rc;acpi_status status;unsigned long long uid; +struct acpi_cedt_chbs *chbs;struct cxl_port *root_port = arg;struct device *host = root_port->dev.parent;struct acpi_device *bridge =to_cxl_host_bridge (match);
@@ -135,7 +214,12 @@ static int add_host_bridge_dport(struct device *match, void *arg)return -ENODEV ; } - rc =cxl_add_dport (root_port, match, uid,CXL_RESOURCE_NONE ); + chbs =cxl_acpi_match_chbs (host, uid); +if (IS_ERR (chbs)) +dev_dbg (host,"No CHBS found for Host Bridge: %s\n" , +dev_name (match)); + + rc =cxl_add_dport (root_port, match, uid,get_chbcr (chbs));if (rc) {dev_err (host,"failed to add downstream port: %s\n" ,dev_name (match));
@@ -148,6 +232,7 @@ static int add_host_bridge_dport(struct device *match, void *arg)static int cxl_acpi_probe (struct platform_device *pdev) {int rc; +acpi_status status;struct cxl_port *root_port;struct device *host = &pdev->dev;struct acpi_device *adev =ACPI_COMPANION (host);
@@ -157,17 +242,25 @@ static int cxl_acpi_probe(struct platform_device *pdev)return PTR_ERR (root_port);dev_dbg (host,"add: %s\n" ,dev_name (&root_port->dev)); + status =acpi_get_table (ACPI_SIG_CEDT ,0 , &cedt_table); +if (ACPI_FAILURE (status)) +return -ENXIO ; + rc =bus_for_each_dev (adev->dev.bus,NULL , root_port, add_host_bridge_dport);if (rc) -return rc; + goto out;/* * Root level scanned with host-bridge as dports, now scan host-bridges * for their role as CXL uports to their CXL-capable PCIe Root Ports. */ -return bus_for_each_dev (adev->dev.bus,NULL , root_port, - add_host_bridge_uport); + rc =bus_for_each_dev (adev->dev.bus,NULL , root_port, + add_host_bridge_uport); + +out: +acpi_put_table (cedt_table); +return rc; }static const struct acpi_device_id cxl_acpi_ids[] = {
Signature · 1 line
2.26.2
Re: [PATCH v2 1/2] cxl/acpi: Add the Host Bridge base address to CXL port objects
Quoted 17 lines · Alison Schofield
The base address for the Host Bridge port component registers is located in the CXL Host Bridge Structure (CHBS) of the ACPI CXL Early Discovery Table (CEDT). Retrieve the CHBS for each Host Bridge (ACPI0016 device) and include that base address in the port object.
Co-developed-by Vishal Verma <[email protected]>Signed-off-by Vishal Verma <[email protected]>Signed-off-by Alison Schofield <[email protected]>--- drivers/cxl/acpi.c | 105 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 99 insertions(+), 6 deletions(-)drivers/cxl/acpi.c +0
-0
drivers/cxl/acpi.c line 11
Quoted 4 lines
drivers/cxl/acpi.c +1
-0@@ -8,6 +8,61 @@#include <linux/pci.h> #include "cxl.h" +static struct acpi_table_header *cedt_table;
cedt_header would really be a better name. "Table" is redundant as the 't' in CEDT is table.
drivers/cxl/acpi.c line 17
Quoted 6 lines
drivers/cxl/acpi.c +6
-0+ +static struct acpi_cedt_chbs *cxl_acpi_match_chbs (struct device *dev,u32 uid) +{ +struct acpi_cedt_chbs *chbs, *chbs_match =NULL ; +acpi_size len, cur =0 ; +void *cedt_base;
maybe "cedt_body", or "cedt_subtables"
drivers/cxl/acpi.c line 21
Quoted 4 lines
drivers/cxl/acpi.c +4
-0+int rc =0 ; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ;
As per naming recommendation above, this looks really funny...
drivers/cxl/acpi.c line 24
Quoted 3 lines
drivers/cxl/acpi.c +3
-0+ +while (cur < len) { +struct acpi_cedt_header *c = cedt_base + cur;
Okay, now I see why you may have not called the previous thing a header.
Quoted 4 lines
drivers/cxl/acpi.c +4
-0+ +if (c->type !=ACPI_CEDT_TYPE_CHBS ) { + cur += c->length; +continue ;
drivers/cxl/acpi.c line 38
Quoted 10 lines
drivers/cxl/acpi.c +10
-0+ } + + chbs = cedt_base + cur; + +if (chbs->header.length <sizeof (*chbs)) { +dev_err (dev,"Invalid CHBS header length: %u\n" , + chbs->header.length); + rc = -EINVAL ; +break ; + }
I'd just continue here. Maybe there will be another chbs with the correct size.
drivers/cxl/acpi.c line 50
Quoted 12 lines
drivers/cxl/acpi.c +12
-0+ +if (chbs->uid == uid && !chbs_match) { + chbs_match = chbs; + cur += c->length; +continue ; + } + +if (chbs->uid == uid && chbs_match) { +dev_err (dev,"Duplicate CHBS UIDs %u\n" , uid); + rc = -EINVAL ; +break ; + }
I'd also just continue here. I think if we have a match, we can just use it and ignore BIOS bugs. I'd probably write it like this:
if (chbs->uid == uid) {
dev_WARN_ONCE(dev, chbs_match, "Duplicate CHBS UIDs %u\n", uid);
chbs_match = chbs; /* last one wins */
cur += c->length;
continue;
}Up to you how you actually write it, but do consider not failing here.
drivers/cxl/acpi.c line 54
Quoted 4 lines
drivers/cxl/acpi.c +4
-0+ cur += c->length; + } +if (!chbs_match) + rc = -EINVAL ;
Maybe ENODEV or something like it is more appropriate?
Quoted 124 lines
drivers/cxl/acpi.c +55
-6+if (rc) +return ERR_PTR (rc); + +return chbs_match; +} + +static resource_size_t get_chbcr (struct acpi_cedt_chbs *chbs) +{ +return IS_ERR (chbs) ?CXL_RESOURCE_NONE : chbs->base; +} +struct cxl_walk_context {struct device *dev;struct pci_bus *root;@@ -50,6 +105,21 @@ static int match_add_root_ports(struct pci_dev *pdev, void *data)return 0 ; } +static struct cxl_dport *find_dport_by_dev (struct cxl_port *port,struct device *dev) +{ +struct cxl_dport *dport; + +device_lock (&port->dev); +list_for_each_entry (dport, &port->dports, list) +if (dport->dport == dev) { +device_unlock (&port->dev); +return dport; + } + +device_unlock (&port->dev); +return NULL ; +} +static struct acpi_device *to_cxl_host_bridge (struct device *dev) {struct acpi_device *adev =to_acpi_device (dev);@@ -71,6 +141,7 @@ static int add_host_bridge_uport(struct device *match, void *arg)struct acpi_pci_root *pci_root;struct cxl_walk_context ctx;struct cxl_decoder *cxld; +struct cxl_dport *dport;struct cxl_port *port;if (!bridge)@@ -80,8 +151,15 @@ static int add_host_bridge_uport(struct device *match, void *arg)if (!pci_root)return -ENXIO ; -/* TODO: fold in CEDT.CHBS retrieval */ - port =devm_cxl_add_port (host, match,CXL_RESOURCE_NONE , root_port); + dport =find_dport_by_dev (root_port, match); +if (!dport) { +dev_dbg (host,"host bridge expected and not found\n" ); +return -ENODEV ; + } + + port =devm_cxl_add_port (host, match, dport->component_reg_phys, + root_port); +if (IS_ERR (port))return PTR_ERR (port);dev_dbg (host,"%s: add: %s\n" ,dev_name (match),dev_name (&port->dev));@@ -120,6 +198,7 @@ static int add_host_bridge_dport(struct device *match, void *arg)int rc;acpi_status status;unsigned long long uid; +struct acpi_cedt_chbs *chbs;struct cxl_port *root_port = arg;struct device *host = root_port->dev.parent;struct acpi_device *bridge =to_cxl_host_bridge (match);@@ -135,7 +214,12 @@ static int add_host_bridge_dport(struct device *match, void *arg)return -ENODEV ; } - rc =cxl_add_dport (root_port, match, uid,CXL_RESOURCE_NONE ); + chbs =cxl_acpi_match_chbs (host, uid); +if (IS_ERR (chbs)) +dev_dbg (host,"No CHBS found for Host Bridge: %s\n" , +dev_name (match)); + + rc =cxl_add_dport (root_port, match, uid,get_chbcr (chbs));if (rc) {dev_err (host,"failed to add downstream port: %s\n" ,dev_name (match));@@ -148,6 +232,7 @@ static int add_host_bridge_dport(struct device *match, void *arg)static int cxl_acpi_probe (struct platform_device *pdev) {int rc; +acpi_status status;struct cxl_port *root_port;struct device *host = &pdev->dev;struct acpi_device *adev =ACPI_COMPANION (host);@@ -157,17 +242,25 @@ static int cxl_acpi_probe(struct platform_device *pdev)return PTR_ERR (root_port);dev_dbg (host,"add: %s\n" ,dev_name (&root_port->dev)); + status =acpi_get_table (ACPI_SIG_CEDT ,0 , &cedt_table); +if (ACPI_FAILURE (status)) +return -ENXIO ; + rc =bus_for_each_dev (adev->dev.bus,NULL , root_port, add_host_bridge_dport);if (rc) -return rc; + goto out;/* * Root level scanned with host-bridge as dports, now scan host-bridges * for their role as CXL uports to their CXL-capable PCIe Root Ports. */ -return bus_for_each_dev (adev->dev.bus,NULL , root_port, - add_host_bridge_uport); + rc =bus_for_each_dev (adev->dev.bus,NULL , root_port, + add_host_bridge_uport); + +out: +acpi_put_table (cedt_table); +return rc; }static const struct acpi_device_id cxl_acpi_ids[] = {Signature · 1 line
2.26.2
Alison Schofield
maintainerRe: [PATCH v2 1/2] cxl/acpi: Add the Host Bridge base address to CXL port objects
Thanks for the review Ben -
Quoted 21 lines · Ben Widawsky
Quoted 20 lines · Alison Schofield
The base address for the Host Bridge port component registers is located in the CXL Host Bridge Structure (CHBS) of the ACPI CXL Early Discovery Table (CEDT). Retrieve the CHBS for each Host Bridge (ACPI0016 device) and include that base address in the port object.
Co-developed-by Vishal Verma <[email protected]>Signed-off-by Vishal Verma <[email protected]>Signed-off-by Alison Schofield <[email protected]>--- drivers/cxl/acpi.c | 105 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 99 insertions(+), 6 deletions(-)drivers/cxl/acpi.c +0
-0@@ -8,6 +8,61 @@#include <linux/pci.h> #include "cxl.h"
Quoted 5 lines
drivers/cxl/acpi.c line 11
Quoted 1 line
drivers/cxl/acpi.c +1
-0+static struct acpi_table_header *cedt_table;
cedt_headerwould really be a better name. "Table" is redundant as the 't' in CEDT is table.
Agree. Renamed to acpi_cedt in v3. See if you like.
Quoted 8 lines
drivers/cxl/acpi.c line 17
Quoted 6 lines
drivers/cxl/acpi.c +6
-0+ +static struct acpi_cedt_chbs *cxl_acpi_match_chbs (struct device *dev,u32 uid) +{ +struct acpi_cedt_chbs *chbs, *chbs_match =NULL ; +acpi_size len, cur =0 ; +void *cedt_base;maybe "
cedt_body", or "cedt_subtables"
got it in v3.
Quoted 8 lines
drivers/cxl/acpi.c line 21
Quoted 5 lines
drivers/cxl/acpi.c +4
-0+int rc =0 ; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ;As per naming recommendation above, this looks really funny...
:)
Quoted 6 lines
drivers/cxl/acpi.c line 24
Quoted 3 lines
drivers/cxl/acpi.c +3
-0+ +while (cur < len) { +struct acpi_cedt_header *c = cedt_base + cur;Okay, now I see why you may have not called the previous thing a header.
Quoted 17 lines
Quoted 4 lines
drivers/cxl/acpi.c +4
-0+ +if (c->type !=ACPI_CEDT_TYPE_CHBS ) { + cur += c->length; +continue ;drivers/cxl/acpi.c line 38
Quoted 10 lines
drivers/cxl/acpi.c +10
-0+ } + + chbs = cedt_base + cur; + +if (chbs->header.length <sizeof (*chbs)) { +dev_err (dev,"Invalid CHBS header length: %u\n" , + chbs->header.length); + rc = -EINVAL ; +break ; + }I'd just continue here. Maybe there will be another chbs with the correct size.
Got it.
Quoted 16 lines
drivers/cxl/acpi.c line 50
Quoted 12 lines
drivers/cxl/acpi.c +12
-0+ +if (chbs->uid == uid && !chbs_match) { + chbs_match = chbs; + cur += c->length; +continue ; + } + +if (chbs->uid == uid && chbs_match) { +dev_err (dev,"Duplicate CHBS UIDs %u\n" , uid); + rc = -EINVAL ; +break ; + }I'd also just continue here. I think if we have a match, we can just use it and ignore BIOS bugs. I'd probably write it like this:
Quoted 9 lines
if (chbs->uid == uid) { dev_WARN_ONCE(dev, chbs_match, "Duplicate CHBS UIDs %u\n", uid); chbs_match = chbs; /* last one wins */ cur += c->length; continue; }Up to you how you actually write it, but do consider not failing here.
Thanks for the snippet. I added the dev_WARN_ONCE to both the length mismatch and duplicate cases.
Quoted 6 lines
drivers/cxl/acpi.c line 54
Quoted 4 lines
drivers/cxl/acpi.c +4
-0+ cur += c->length; + } +if (!chbs_match) + rc = -EINVAL ;Maybe ENODEV or something like it is more appropriate?
Got it.
Quoted 1 line
snip
Re: [PATCH v2 1/2] cxl/acpi: Add the Host Bridge base address to CXL port objects
In reply to Alison SchofieldQuoted 8 lines · On Tue, 15 Jun 2021 17:20:38 -0700 Alison Schofield…
The base address for the Host Bridge port component registers is located in the CXL Host Bridge Structure (CHBS) of the ACPI CXL Early Discovery Table (CEDT). Retrieve the CHBS for each Host Bridge (ACPI0016 device) and include that base address in the port object.
Co-developed-by Vishal Verma <[email protected]>Signed-off-by Vishal Verma <[email protected]>Signed-off-by Alison Schofield <[email protected]>
Hi Alison,
A few small suggestions from me.
Quoted 28 lines
--- drivers/cxl/acpi.c | 105 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 99 insertions(+), 6 deletions(-)drivers/cxl/acpi.c +16
-0@@ -8,6 +8,61 @@#include <linux/pci.h> #include "cxl.h" +static struct acpi_table_header *cedt_table; + +static struct acpi_cedt_chbs *cxl_acpi_match_chbs (struct device *dev,u32 uid) +{ +struct acpi_cedt_chbs *chbs, *chbs_match =NULL ; +acpi_size len, cur =0 ; +void *cedt_base; +int rc =0 ; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ; + +while (cur < len) { +struct acpi_cedt_header *c = cedt_base + cur; + +if (c->type !=ACPI_CEDT_TYPE_CHBS ) {
drivers/cxl/acpi.c line 36
Quoted 10 lines
drivers/cxl/acpi.c +10
-0+ cur += c->length; +continue ; + } + + chbs = cedt_base + cur; + +if (chbs->header.length <sizeof (*chbs)) { +dev_err (dev,"Invalid CHBS header length: %u\n" , + chbs->header.length); + rc = -EINVAL ;
As below, direct return would be more obvious to my eyes.
drivers/cxl/acpi.c line 47
Quoted 11 lines
drivers/cxl/acpi.c +11
-0+break ; + } + +if (chbs->uid == uid && !chbs_match) { + chbs_match = chbs; + cur += c->length; +continue ; + } + +if (chbs->uid == uid && chbs_match) { +dev_err (dev,"Duplicate CHBS UIDs %u\n" , uid);
Do we actually care, or should we just drop out on first match? I don't think think there is any obligation to catch broken tables.
drivers/cxl/acpi.c line 48
Quoted 1 line
drivers/cxl/acpi.c +1
-0+ rc = -EINVAL ;
Direct return might be easier to follow.
return ERR_PTR(-EINVAL);
drivers/cxl/acpi.c line 50
Quoted 2 lines
drivers/cxl/acpi.c +2
-0+break ; + }
Maybe more readable as (your option is fine if you prefer it).
if (chbs->uuid != uid) {
cur += c->length;
continue;
}
if (chbs_match) {
dev_err(dev, "D...");
return ERR_PTR(-EINVAL);
}
chbs_match = chbs;drivers/cxl/acpi.c line 54
Quoted 4 lines
drivers/cxl/acpi.c +4
-0+ cur += c->length; + } +if (!chbs_match) + rc = -EINVAL ;
return ERR_PTR(-EINVAL);
Quoted 49 lines
drivers/cxl/acpi.c +27
-1+if (rc) +return ERR_PTR (rc); + +return chbs_match; +} + +static resource_size_t get_chbcr (struct acpi_cedt_chbs *chbs) +{ +return IS_ERR (chbs) ?CXL_RESOURCE_NONE : chbs->base; +} +struct cxl_walk_context {struct device *dev;struct pci_bus *root;@@ -50,6 +105,21 @@ static int match_add_root_ports(struct pci_dev *pdev, void *data)return 0 ; } +static struct cxl_dport *find_dport_by_dev (struct cxl_port *port,struct device *dev) +{ +struct cxl_dport *dport; + +device_lock (&port->dev); +list_for_each_entry (dport, &port->dports, list) +if (dport->dport == dev) { +device_unlock (&port->dev); +return dport; + } + +device_unlock (&port->dev); +return NULL ; +} +static struct acpi_device *to_cxl_host_bridge (struct device *dev) {struct acpi_device *adev =to_acpi_device (dev);@@ -71,6 +141,7 @@ static int add_host_bridge_uport(struct device *match, void *arg)struct acpi_pci_root *pci_root;struct cxl_walk_context ctx;struct cxl_decoder *cxld; +struct cxl_dport *dport;struct cxl_port *port;if (!bridge)@@ -80,8 +151,15 @@ static int add_host_bridge_uport(struct device *match, void *arg)if (!pci_root)return -ENXIO ; -/* TODO: fold in CEDT.CHBS retrieval */
drivers/cxl/acpi.c static int add_host_bridge_uport(struct device *match, void *arg) · line 162
Quoted 10 lines
drivers/cxl/acpi.c +9
-1- port =devm_cxl_add_port (host, match,CXL_RESOURCE_NONE , root_port); + dport =find_dport_by_dev (root_port, match); +if (!dport) { +dev_dbg (host,"host bridge expected and not found\n" ); +return -ENODEV ; + } + + port =devm_cxl_add_port (host, match, dport->component_reg_phys, + root_port); +
Nitpick, no blank line before error handling block.
Quoted 62 lines
drivers/cxl/acpi.c +19
-4if (IS_ERR (port))return PTR_ERR (port);dev_dbg (host,"%s: add: %s\n" ,dev_name (match),dev_name (&port->dev));@@ -120,6 +198,7 @@ static int add_host_bridge_dport(struct device *match, void *arg)int rc;acpi_status status;unsigned long long uid; +struct acpi_cedt_chbs *chbs;struct cxl_port *root_port = arg;struct device *host = root_port->dev.parent;struct acpi_device *bridge =to_cxl_host_bridge (match);@@ -135,7 +214,12 @@ static int add_host_bridge_dport(struct device *match, void *arg)return -ENODEV ; } - rc =cxl_add_dport (root_port, match, uid,CXL_RESOURCE_NONE ); + chbs =cxl_acpi_match_chbs (host, uid); +if (IS_ERR (chbs)) +dev_dbg (host,"No CHBS found for Host Bridge: %s\n" , +dev_name (match)); + + rc =cxl_add_dport (root_port, match, uid,get_chbcr (chbs));if (rc) {dev_err (host,"failed to add downstream port: %s\n" ,dev_name (match));@@ -148,6 +232,7 @@ static int add_host_bridge_dport(struct device *match, void *arg)static int cxl_acpi_probe (struct platform_device *pdev) {int rc; +acpi_status status;struct cxl_port *root_port;struct device *host = &pdev->dev;struct acpi_device *adev =ACPI_COMPANION (host);@@ -157,17 +242,25 @@ static int cxl_acpi_probe(struct platform_device *pdev)return PTR_ERR (root_port);dev_dbg (host,"add: %s\n" ,dev_name (&root_port->dev)); + status =acpi_get_table (ACPI_SIG_CEDT ,0 , &cedt_table); +if (ACPI_FAILURE (status)) +return -ENXIO ; + rc =bus_for_each_dev (adev->dev.bus,NULL , root_port, add_host_bridge_dport);if (rc) -return rc; + goto out;/* * Root level scanned with host-bridge as dports, now scan host-bridges * for their role as CXL uports to their CXL-capable PCIe Root Ports. */ -return bus_for_each_dev (adev->dev.bus,NULL , root_port, - add_host_bridge_uport); + rc =bus_for_each_dev (adev->dev.bus,NULL , root_port, + add_host_bridge_uport); + +out: +acpi_put_table (cedt_table); +return rc; }static const struct acpi_device_id cxl_acpi_ids[] = {
Alison Schofield
maintainerRe: [PATCH v2 1/2] cxl/acpi: Add the Host Bridge base address to CXL port objects
Thanks for the review Jonathan -
Quoted 48 lines · Jonathan Cameron
Quoted 8 lines · On Tue, 15 Jun 2021 17:20:38 -0700 Alison Schofield…
The base address for the Host Bridge port component registers is located in the CXL Host Bridge Structure (CHBS) of the ACPI CXL Early Discovery Table (CEDT). Retrieve the CHBS for each Host Bridge (ACPI0016 device) and include that base address in the port object.
Co-developed-by Vishal Verma <[email protected]>Signed-off-by Vishal Verma <[email protected]>Signed-off-by Alison Schofield <[email protected]>Hi Alison,
A few small suggestions from me.
Quoted 32 lines
--- drivers/cxl/acpi.c | 105 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 99 insertions(+), 6 deletions(-)drivers/cxl/acpi.c +20
-0@@ -8,6 +8,61 @@#include <linux/pci.h> #include "cxl.h" +static struct acpi_table_header *cedt_table; + +static struct acpi_cedt_chbs *cxl_acpi_match_chbs (struct device *dev,u32 uid) +{ +struct acpi_cedt_chbs *chbs, *chbs_match =NULL ; +acpi_size len, cur =0 ; +void *cedt_base; +int rc =0 ; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ; + +while (cur < len) { +struct acpi_cedt_header *c = cedt_base + cur; + +if (c->type !=ACPI_CEDT_TYPE_CHBS ) { + cur += c->length; +continue ; + } +
Quoted 9 lines
drivers/cxl/acpi.c line 36
Quoted 6 lines
drivers/cxl/acpi.c +6
-0+ chbs = cedt_base + cur; + +if (chbs->header.length <sizeof (*chbs)) { +dev_err (dev,"Invalid CHBS header length: %u\n" , + chbs->header.length); + rc = -EINVAL ;As below, direct return would be more obvious to my eyes.
Well....I decided to warn & continue on this case. See the updated flow in v3.
Quoted 6 lines
Quoted 6 lines
drivers/cxl/acpi.c +6
-0+break ; + } + +if (chbs->uid == uid && !chbs_match) { + chbs_match = chbs; + cur += c->length;
Quoted 9 lines
drivers/cxl/acpi.c line 47
Quoted 5 lines
drivers/cxl/acpi.c +5
-0+continue ; + } + +if (chbs->uid == uid && chbs_match) { +dev_err (dev,"Duplicate CHBS UIDs %u\n" , uid);Do we actually care, or should we just drop out on first match? I don't think think there is any obligation to catch broken tables.
Agree on the obligation part, but if things go wrong, this would be nice to know. I left it in as a dev warn once. If you think that's too strong - let me know.
Quoted 10 lines
drivers/cxl/acpi.c line 48
Quoted 1 line
drivers/cxl/acpi.c +1
-0+ rc = -EINVAL ;Direct return might be easier to follow.
return ERR_PTR(-EINVAL);drivers/cxl/acpi.c line 50
Quoted 2 lines
drivers/cxl/acpi.c +2
-0+break ; + }Maybe more readable as (your option is fine if you prefer it).
Quoted 13 lines
if (chbs->uuid != uid) {
cur += c->length;
continue;
}
if (chbs_match) {
dev_err(dev, "D...");
return ERR_PTR(-EINVAL);
}
chbs_match = chbs;Thanks, I reworked the flow along these lines.
snip
Quoted 7 lines
drivers/cxl/acpi.c static int add_host_bridge_uport(struct device *match, void *arg) · line 162
Quoted 4 lines
drivers/cxl/acpi.c +4
-0+ + port =devm_cxl_add_port (host, match, dport->component_reg_phys, + root_port); +Nitpick, no blank line before error handling block.
Got it. Thanks!
snip
Re: [PATCH v2 1/2] cxl/acpi: Add the Host Bridge base address to CXL port objects
Quoted 82 lines · Alison Schofield
Thanks for the review Jonathan -
Quoted 48 lines · Jonathan Cameron
Quoted 8 lines · On Tue, 15 Jun 2021 17:20:38 -0700 Alison Schofield…
The base address for the Host Bridge port component registers is located in the CXL Host Bridge Structure (CHBS) of the ACPI CXL Early Discovery Table (CEDT). Retrieve the CHBS for each Host Bridge (ACPI0016 device) and include that base address in the port object.
Co-developed-by Vishal Verma <[email protected]>Signed-off-by Vishal Verma <[email protected]>Signed-off-by Alison Schofield <[email protected]>Hi Alison,
A few small suggestions from me.
Quoted 32 lines
--- drivers/cxl/acpi.c | 105 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 99 insertions(+), 6 deletions(-)drivers/cxl/acpi.c +20
-0@@ -8,6 +8,61 @@#include <linux/pci.h> #include "cxl.h" +static struct acpi_table_header *cedt_table; + +static struct acpi_cedt_chbs *cxl_acpi_match_chbs (struct device *dev,u32 uid) +{ +struct acpi_cedt_chbs *chbs, *chbs_match =NULL ; +acpi_size len, cur =0 ; +void *cedt_base; +int rc =0 ; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ; + +while (cur < len) { +struct acpi_cedt_header *c = cedt_base + cur; + +if (c->type !=ACPI_CEDT_TYPE_CHBS ) { + cur += c->length; +continue ; + } +Quoted 9 lines
drivers/cxl/acpi.c line 36
Quoted 6 lines
drivers/cxl/acpi.c +6
-0+ chbs = cedt_base + cur; + +if (chbs->header.length <sizeof (*chbs)) { +dev_err (dev,"Invalid CHBS header length: %u\n" , + chbs->header.length); + rc = -EINVAL ;As below, direct return would be more obvious to my eyes.
Well....I decided to warn & continue on this case. See the updated flow in v3.
Quoted 6 lines
Quoted 6 lines
drivers/cxl/acpi.c +6
-0+break ; + } + +if (chbs->uid == uid && !chbs_match) { + chbs_match = chbs; + cur += c->length;Quoted 9 lines
drivers/cxl/acpi.c line 47
Quoted 5 lines
drivers/cxl/acpi.c +5
-0+continue ; + } + +if (chbs->uid == uid && chbs_match) { +dev_err (dev,"Duplicate CHBS UIDs %u\n" , uid);Do we actually care, or should we just drop out on first match? I don't think think there is any obligation to catch broken tables.
Quoted 3 lines
Agree on the obligation part, but if things go wrong, this would be nice to know. I left it in as a dev warn once. If you think that's too strong - let me know.
I do think the driver should care about duplicate UID, but only if "version, base, or length" mismatch. If the BIOS gives us ambiguous answers about where the registers are located, the user should be warned that the driver might be picking the "wrong" one by accident. If they are identical, the BIOS is being repetitive, but no real harm that the driver would care about. A dev_warn_once() sounds good as the first duplicate should be sufficient to say something fishy is afoot, but it's not an error. The warn_once will also re-trigger when / if the module is reloaded.
Alison Schofield
maintainerPATCH v2 2/2 cxl/acpi: Use the ACPI CFMWS to create static decoder objects
In reply to Alison SchofieldThe ACPI CXL Early Discovery Table (CEDT) includes a list of CXL memory resources in CXL Fixed Memory Window Structures (CFMWS). Retrieve each CFMWS in the CEDT and add a cxl_decoder object to the root port (root0) for each memory resource.
--- drivers/cxl/acpi.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+)
drivers/cxl/acpi.c +114 -0
@@ -8,8 +8,120 @@#include <linux/pci.h> #include "cxl.h" +/* Encode defined in CXL 2.0 8.2.5.12.7 HDM Decoder Control Register */ +#define CFMWS_INTERLEAVE_WAYS (x) (1 << (x)->interleave_ways) +#define CFMWS_INTERLEAVE_GRANULARITY (x) ((x)->granularity + 8) +static struct acpi_table_header *cedt_table; +static unsigned long cfmws_to_decoder_flags (int restrictions) +{ +unsigned long flags =0 ; + +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE2 ) + flags |=CXL_DECODER_F_TYPE2 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE3 ) + flags |=CXL_DECODER_F_TYPE3 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_VOLATILE ) + flags |=CXL_DECODER_F_RAM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_PMEM ) + flags |=CXL_DECODER_F_PMEM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_FIXED ) + flags |=CXL_DECODER_F_LOCK ; + +return flags; +} + +static int cxl_acpi_cfmws_verify (struct device *dev, +struct acpi_cedt_cfmws *cfmws) +{ +int expected_len; + +if (cfmws->interleave_arithmetic !=ACPI_CEDT_CFMWS_ARITHMETIC_MODULO ) { +dev_err (dev,"CFMWS Unsupported Interleave Arithmetic\n" ); +return -EINVAL ; + } + +if (!IS_ALIGNED (cfmws->base_hpa,SZ_256M )) { +dev_err (dev,"CFMWS Base HPA not 256MB aligned\n" ); +return -EINVAL ; + } + +if (!IS_ALIGNED (cfmws->window_size,SZ_256M )) { +dev_err (dev,"CFMWS Window Size not 256MB aligned\n" ); +return -EINVAL ; + } + + expected_len =struct_size ((cfmws), interleave_targets, +CFMWS_INTERLEAVE_WAYS (cfmws)); + +if (expected_len != cfmws->header.length) { +dev_err (dev,"CFMWS interleave ways and targets mismatch\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static void cxl_add_cfmws_decoders (struct device *dev, +struct cxl_port *root_port) +{ +struct acpi_cedt_cfmws *cfmws; +struct cxl_decoder *cxld; +acpi_size len, cur =0 ; +void *cedt_base; +int rc; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ; + +while (cur < len) { +struct acpi_cedt_header *c = cedt_base + cur; + +if (c->type !=ACPI_CEDT_TYPE_CFMWS ) { + cur += c->length; +continue ; + } + + cfmws = cedt_base + cur; + +if (cfmws->header.length <sizeof (*cfmws)) { +dev_err (dev,"Invalid CFMWS header length %u\n" , + cfmws->header.length); +dev_err (dev,"Failed to add decoders\n" ); +return ; + } + + rc =cxl_acpi_cfmws_verify (dev, cfmws); +if (rc) { +dev_err (dev,"CFMWS range %#llx-%#llx not registered\n" , + cfmws->base_hpa, cfmws->base_hpa + + cfmws->window_size -1 ); + cur += c->length; +continue ; + } + + cxld =devm_cxl_add_decoder (dev, root_port, +CFMWS_INTERLEAVE_WAYS (cfmws), + cfmws->base_hpa, cfmws->window_size, +CFMWS_INTERLEAVE_WAYS (cfmws), +CFMWS_INTERLEAVE_GRANULARITY (cfmws), +CXL_DECODER_EXPANDER , +cfmws_to_decoder_flags (cfmws->restrictions)); + +if (IS_ERR (cxld)) { +dev_err (dev,"Failed to add decoder for %#llx-%#llx\n" , + cfmws->base_hpa, cfmws->base_hpa + + cfmws->window_size -1 ); + }else { +dev_dbg (dev,"add: %s range %#llx-%#llx\n" , +dev_name (&cxld->dev), cfmws->base_hpa, + cfmws->base_hpa + cfmws->window_size -1 ); + } + cur += c->length; + } +} +static struct acpi_cedt_chbs *cxl_acpi_match_chbs (struct device *dev,u32 uid) {struct acpi_cedt_chbs *chbs, *chbs_match =NULL ;
@@ -251,6 +363,8 @@ static int cxl_acpi_probe(struct platform_device *pdev)if (rc) goto out; +cxl_add_cfmws_decoders (host, root_port); +/* * Root level scanned with host-bridge as dports, now scan host-bridges * for their role as CXL uports to their CXL-capable PCIe Root Ports.
Signature · 1 line
2.26.2
Re: [PATCH v2 2/2] cxl/acpi: Use the ACPI CFMWS to create static decoder objects
Quoted 31 lines · Alison Schofield
The ACPI CXL Early Discovery Table (CEDT) includes a list of CXL memory resources in CXL Fixed Memory Window Structures (CFMWS). Retrieve each CFMWS in the CEDT and add a
cxl_decoderobject to the root port (root0) for each memory resource.Signed-off-by Alison Schofield <[email protected]>--- drivers/cxl/acpi.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+)drivers/cxl/acpi.c +11
-0@@ -8,8 +8,120 @@#include <linux/pci.h> #include "cxl.h" +/* Encode defined in CXL 2.0 8.2.5.12.7 HDM Decoder Control Register */ +#define CFMWS_INTERLEAVE_WAYS (x) (1 << (x)->interleave_ways) +#define CFMWS_INTERLEAVE_GRANULARITY (x) ((x)->granularity + 8) +static struct acpi_table_header *cedt_table; +static unsigned long cfmws_to_decoder_flags (int restrictions) +{ +unsigned long flags =0 ; + +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE2 ) + flags |=CXL_DECODER_F_TYPE2 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE3 )
drivers/cxl/acpi.c line 33
Quoted 10 lines
drivers/cxl/acpi.c +10
-0+ flags |=CXL_DECODER_F_TYPE3 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_VOLATILE ) + flags |=CXL_DECODER_F_RAM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_PMEM ) + flags |=CXL_DECODER_F_PMEM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_FIXED ) + flags |=CXL_DECODER_F_LOCK ; + +return flags; +}
I know these flags aren't introduced by this patch, but I'm wondering if it makes sense to not just use the spec definitions rather than defining our own. It doesn't do much harm, but it's extra typing everytime the spec adds new flags and I don't really see the upside.
Quoted 15 lines
drivers/cxl/acpi.c +15
-0+ +static int cxl_acpi_cfmws_verify (struct device *dev, +struct acpi_cedt_cfmws *cfmws) +{ +int expected_len; + +if (cfmws->interleave_arithmetic !=ACPI_CEDT_CFMWS_ARITHMETIC_MODULO ) { +dev_err (dev,"CFMWS Unsupported Interleave Arithmetic\n" ); +return -EINVAL ; + } + +if (!IS_ALIGNED (cfmws->base_hpa,SZ_256M )) { +dev_err (dev,"CFMWS Base HPA not 256MB aligned\n" ); +return -EINVAL ; + }
drivers/cxl/acpi.c line 58
Quoted 10 lines
drivers/cxl/acpi.c +10
-0+ +if (!IS_ALIGNED (cfmws->window_size,SZ_256M )) { +dev_err (dev,"CFMWS Window Size not 256MB aligned\n" ); +return -EINVAL ; + } + + expected_len =struct_size ((cfmws), interleave_targets, +CFMWS_INTERLEAVE_WAYS (cfmws)); + +if (expected_len != cfmws->header.length) {
I'd switch this to:
if (expected_len < cfmws->header.length)
If it's too big, just print a dev_dbg.
Quoted 8 lines
drivers/cxl/acpi.c +8
-0+dev_err (dev,"CFMWS interleave ways and targets mismatch\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static void cxl_add_cfmws_decoders(struct device *dev,
drivers/cxl/acpi.c line 76
Quoted 10 lines
drivers/cxl/acpi.c +10
-0+ struct cxl_port *root_port) +{ +struct acpi_cedt_cfmws *cfmws; +struct cxl_decoder *cxld; +acpi_size len, cur =0 ; +void *cedt_base; +int rc; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ;
naming suggestions per previous patch... up to you though.
Quoted 21 lines
drivers/cxl/acpi.c +21
-0+ +while (cur < len) { +struct acpi_cedt_header *c = cedt_base + cur; + +if (c->type !=ACPI_CEDT_TYPE_CFMWS ) { + cur += c->length; +continue ; + } + + cfmws = cedt_base + cur; + +if (cfmws->header.length <sizeof (*cfmws)) { +dev_err (dev,"Invalid CFMWS header length %u\n" , + cfmws->header.length); +dev_err (dev,"Failed to add decoders\n" ); +return ; + } + + rc =cxl_acpi_cfmws_verify (dev, cfmws); +if (rc) { + dev_err(dev, "CFMWS range %#llx-%#llx not registered\n",
drivers/cxl/acpi.c line 107
Quoted 10 lines
drivers/cxl/acpi.c +10
-0+ cfmws->base_hpa, cfmws->base_hpa + + cfmws->window_size - 1); + cur += c->length; +continue ; + } + + cxld = devm_cxl_add_decoder(dev, root_port, + CFMWS_INTERLEAVE_WAYS(cfmws), + cfmws->base_hpa, cfmws->window_size, + CFMWS_INTERLEAVE_WAYS(cfmws),
Interesting... this made me question, how can we have a different number of targets and ways?
Quoted 32 lines
drivers/cxl/acpi.c +19
-0+CFMWS_INTERLEAVE_GRANULARITY (cfmws), +CXL_DECODER_EXPANDER , + cfmws_to_decoder_flags(cfmws->restrictions)); + +if (IS_ERR (cxld)) { +dev_err (dev,"Failed to add decoder for %#llx-%#llx\n" , + cfmws->base_hpa, cfmws->base_hpa + + cfmws->window_size -1 ); + }else { +dev_dbg (dev,"add: %s range %#llx-%#llx\n" , +dev_name (&cxld->dev), cfmws->base_hpa, + cfmws->base_hpa + cfmws->window_size -1 ); + } + cur += c->length; + } +} +static struct acpi_cedt_chbs *cxl_acpi_match_chbs (struct device *dev,u32 uid) {struct acpi_cedt_chbs *chbs, *chbs_match =NULL ;@@ -251,6 +363,8 @@ static int cxl_acpi_probe(struct platform_device *pdev)if (rc) goto out; +cxl_add_cfmws_decoders (host, root_port); +/* * Root level scanned with host-bridge as dports, now scan host-bridges * for their role as CXL uports to their CXL-capable PCIe Root Ports. Signature · 1 line
2.26.2
Re: [PATCH v2 2/2] cxl/acpi: Use the ACPI CFMWS to create static decoder objects
Quoted 40 lines · Ben Widawsky
Quoted 38 lines · Alison Schofield
The ACPI CXL Early Discovery Table (CEDT) includes a list of CXL memory resources in CXL Fixed Memory Window Structures (CFMWS). Retrieve each CFMWS in the CEDT and add a
cxl_decoderobject to the root port (root0) for each memory resource.Signed-off-by Alison Schofield <[email protected]>--- drivers/cxl/acpi.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+)drivers/cxl/acpi.c +18
-0@@ -8,8 +8,120 @@#include <linux/pci.h> #include "cxl.h" +/* Encode defined in CXL 2.0 8.2.5.12.7 HDM Decoder Control Register */ +#define CFMWS_INTERLEAVE_WAYS (x) (1 << (x)->interleave_ways) +#define CFMWS_INTERLEAVE_GRANULARITY (x) ((x)->granularity + 8) +static struct acpi_table_header *cedt_table; +static unsigned long cfmws_to_decoder_flags (int restrictions) +{ +unsigned long flags =0 ; + +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE2 ) + flags |=CXL_DECODER_F_TYPE2 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE3 ) + flags |=CXL_DECODER_F_TYPE3 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_VOLATILE ) + flags |=CXL_DECODER_F_RAM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_PMEM ) + flags |=CXL_DECODER_F_PMEM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_FIXED ) + flags |=CXL_DECODER_F_LOCK ;
Quoted 8 lines
drivers/cxl/acpi.c line 33
Quoted 3 lines
drivers/cxl/acpi.c +3
-0+ +return flags; +}I know these flags aren't introduced by this patch, but I'm wondering if it makes sense to not just use the spec definitions rather than defining our own. It doesn't do much harm, but it's extra typing everytime the spec adds new flags and I don't really see the upside.
The flags are bounded by what's in HDM decoders, I don't see them moving so fast that the kernel can not keep up. The rationale for the split is the same as the split between ACPI NFIT and the LIBNVDIMM core. The ACPI specifics are just one way to convey a common platform attribute to the core.
In fact this was one of the main feedbacks of the initial "ND" subsystem which eventually became LIBNVDIMM [1]. ND stood for "NFIT Defined" and the arch split between ACPI specific and Linux translation has paid off over the years.
[1]: https://lore.kernel.org/lkml/[email protected]/
Quoted 30 lines
Quoted 16 lines
drivers/cxl/acpi.c +15
-0+ +static int cxl_acpi_cfmws_verify (struct device *dev, +struct acpi_cedt_cfmws *cfmws) +{ +int expected_len; + +if (cfmws->interleave_arithmetic !=ACPI_CEDT_CFMWS_ARITHMETIC_MODULO ) { +dev_err (dev,"CFMWS Unsupported Interleave Arithmetic\n" ); +return -EINVAL ; + } + +if (!IS_ALIGNED (cfmws->base_hpa,SZ_256M )) { +dev_err (dev,"CFMWS Base HPA not 256MB aligned\n" ); +return -EINVAL ; + }drivers/cxl/acpi.c line 58
Quoted 10 lines
drivers/cxl/acpi.c +10
-0+ +if (!IS_ALIGNED (cfmws->window_size,SZ_256M )) { +dev_err (dev,"CFMWS Window Size not 256MB aligned\n" ); +return -EINVAL ; + } + + expected_len =struct_size ((cfmws), interleave_targets, +CFMWS_INTERLEAVE_WAYS (cfmws)); + +if (expected_len != cfmws->header.length) {I'd switch this to:
if (expected_len<cfmws->header.length)
Quoted 1 line
If it's too big, just print a
dev_dbg.
Maybe call it min_len then?
[..]
Quoted 8 lines
drivers/cxl/acpi.c line 107
Quoted 5 lines
drivers/cxl/acpi.c +5
-0+ + cxld = devm_cxl_add_decoder(dev, root_port, + CFMWS_INTERLEAVE_WAYS(cfmws), + cfmws->base_hpa, cfmws->window_size, + CFMWS_INTERLEAVE_WAYS(cfmws),Interesting... this made me question, how can we have a different number of targets and ways?
These settings can be changed later on a switch-level decoder, for a root-level decoder these initial values are fixed.
Alison Schofield
maintainerRe: [PATCH v2 2/2] cxl/acpi: Use the ACPI CFMWS to create static decoder objects
In reply to Ben WidawskyThanks for the review Ben -
Quoted 1 line · Ben Widawsky
On 21-06-15 17:20:39, Alison Schofield wrote:
snip
Quoted 14 lines
Quoted 14 lines
drivers/cxl/acpi.c +14
-0+static unsigned long cfmws_to_decoder_flags (int restrictions) +{ +unsigned long flags =0 ; + +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE2 ) + flags |=CXL_DECODER_F_TYPE2 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE3 ) + flags |=CXL_DECODER_F_TYPE3 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_VOLATILE ) + flags |=CXL_DECODER_F_RAM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_PMEM ) + flags |=CXL_DECODER_F_PMEM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_FIXED ) + flags |=CXL_DECODER_F_LOCK ;
Quoted 9 lines
drivers/cxl/acpi.c line 33
Quoted 3 lines
drivers/cxl/acpi.c +3
-0+ +return flags; +}I know these flags aren't introduced by this patch, but I'm wondering if it makes sense to not just use the spec definitions rather than defining our own. It doesn't do much harm, but it's extra typing everytime the spec adds new flags and I don't really see the upside.
I think Dan's email in this thread covered this.
snip
Quoted 4 lines
Quoted 4 lines
drivers/cxl/acpi.c +4
-0+ +static int cxl_acpi_cfmws_verify (struct device *dev, +struct acpi_cedt_cfmws *cfmws) +{
snip
Quoted 10 lines
drivers/cxl/acpi.c line 58
Quoted 6 lines
drivers/cxl/acpi.c +6
-0+ + + expected_len =struct_size ((cfmws), interleave_targets, +CFMWS_INTERLEAVE_WAYS (cfmws)); + +if (expected_len != cfmws->header.length) {I'd switch this to:
if (expected_len<cfmws->header.length)
Quoted 2 lines
If it's too big, just print a
dev_dbg.
Got it.
snip
Quoted 8 lines
drivers/cxl/acpi.c line 76
Quoted 5 lines
drivers/cxl/acpi.c +5
-0+void *cedt_base; +int rc; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ;naming suggestions per previous patch... up to you though.
Ditto w previous patch.
snip
Quoted 11 lines
drivers/cxl/acpi.c line 107
Quoted 7 lines
drivers/cxl/acpi.c +7
-0+ + } + + cxld = devm_cxl_add_decoder(dev, root_port, + CFMWS_INTERLEAVE_WAYS(cfmws), + cfmws->base_hpa, cfmws->window_size, + CFMWS_INTERLEAVE_WAYS(cfmws),Interesting... this made me question, how can we have a different number of targets and ways?
Dan explained this previously:
"nr_targets is the number of possible targets that this decoder can target. For CFMWS it just equals interleave_ways because the target list can't be changed. A switch on the other hand could support up to 16 possible targets, but be dynamically configured to only do a 1-way interleave. So this is an artifact of 'struct cxl_decoder' representing both fixed CFMWS entries and dynamically programmable switch entries. nr_targets tells devm_cxl_add_decoder() how much memory to allocate for its target list, interleave_ways tells devm_cxl_add_decoder() what the decoder is currently programmed to decode."
Quoted 1 line
snip
Quoted 1 line
Re: [PATCH v2 2/2] cxl/acpi: Use the ACPI CFMWS to create static decoder objects
In reply to Alison SchofieldQuoted 6 lines · On Tue, 15 Jun 2021 17:20:39 -0700 Alison Schofield…
The ACPI CXL Early Discovery Table (CEDT) includes a list of CXL memory resources in CXL Fixed Memory Window Structures (CFMWS). Retrieve each CFMWS in the CEDT and add a
cxl_decoderobject to the root port (root0) for each memory resource.Signed-off-by Alison Schofield <[email protected]>
LGTM
Quoted 138 lines
--- drivers/cxl/acpi.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+)drivers/cxl/acpi.c +114
-0@@ -8,8 +8,120 @@#include <linux/pci.h> #include "cxl.h" +/* Encode defined in CXL 2.0 8.2.5.12.7 HDM Decoder Control Register */ +#define CFMWS_INTERLEAVE_WAYS (x) (1 << (x)->interleave_ways) +#define CFMWS_INTERLEAVE_GRANULARITY (x) ((x)->granularity + 8) +static struct acpi_table_header *cedt_table; +static unsigned long cfmws_to_decoder_flags (int restrictions) +{ +unsigned long flags =0 ; + +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE2 ) + flags |=CXL_DECODER_F_TYPE2 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE3 ) + flags |=CXL_DECODER_F_TYPE3 ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_VOLATILE ) + flags |=CXL_DECODER_F_RAM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_PMEM ) + flags |=CXL_DECODER_F_PMEM ; +if (restrictions &ACPI_CEDT_CFMWS_RESTRICT_FIXED ) + flags |=CXL_DECODER_F_LOCK ; + +return flags; +} + +static int cxl_acpi_cfmws_verify (struct device *dev, +struct acpi_cedt_cfmws *cfmws) +{ +int expected_len; + +if (cfmws->interleave_arithmetic !=ACPI_CEDT_CFMWS_ARITHMETIC_MODULO ) { +dev_err (dev,"CFMWS Unsupported Interleave Arithmetic\n" ); +return -EINVAL ; + } + +if (!IS_ALIGNED (cfmws->base_hpa,SZ_256M )) { +dev_err (dev,"CFMWS Base HPA not 256MB aligned\n" ); +return -EINVAL ; + } + +if (!IS_ALIGNED (cfmws->window_size,SZ_256M )) { +dev_err (dev,"CFMWS Window Size not 256MB aligned\n" ); +return -EINVAL ; + } + + expected_len =struct_size ((cfmws), interleave_targets, +CFMWS_INTERLEAVE_WAYS (cfmws)); + +if (expected_len != cfmws->header.length) { +dev_err (dev,"CFMWS interleave ways and targets mismatch\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static void cxl_add_cfmws_decoders (struct device *dev, +struct cxl_port *root_port) +{ +struct acpi_cedt_cfmws *cfmws; +struct cxl_decoder *cxld; +acpi_size len, cur =0 ; +void *cedt_base; +int rc; + + len = cedt_table->length -sizeof (*cedt_table); + cedt_base = cedt_table +1 ; + +while (cur < len) { +struct acpi_cedt_header *c = cedt_base + cur; + +if (c->type !=ACPI_CEDT_TYPE_CFMWS ) { + cur += c->length; +continue ; + } + + cfmws = cedt_base + cur; + +if (cfmws->header.length <sizeof (*cfmws)) { +dev_err (dev,"Invalid CFMWS header length %u\n" , + cfmws->header.length); +dev_err (dev,"Failed to add decoders\n" ); +return ; + } + + rc =cxl_acpi_cfmws_verify (dev, cfmws); +if (rc) { +dev_err (dev,"CFMWS range %#llx-%#llx not registered\n" , + cfmws->base_hpa, cfmws->base_hpa + + cfmws->window_size -1 ); + cur += c->length; +continue ; + } + + cxld =devm_cxl_add_decoder (dev, root_port, +CFMWS_INTERLEAVE_WAYS (cfmws), + cfmws->base_hpa, cfmws->window_size, +CFMWS_INTERLEAVE_WAYS (cfmws), +CFMWS_INTERLEAVE_GRANULARITY (cfmws), +CXL_DECODER_EXPANDER , +cfmws_to_decoder_flags (cfmws->restrictions)); + +if (IS_ERR (cxld)) { +dev_err (dev,"Failed to add decoder for %#llx-%#llx\n" , + cfmws->base_hpa, cfmws->base_hpa + + cfmws->window_size -1 ); + }else { +dev_dbg (dev,"add: %s range %#llx-%#llx\n" , +dev_name (&cxld->dev), cfmws->base_hpa, + cfmws->base_hpa + cfmws->window_size -1 ); + } + cur += c->length; + } +} +static struct acpi_cedt_chbs *cxl_acpi_match_chbs (struct device *dev,u32 uid) {struct acpi_cedt_chbs *chbs, *chbs_match =NULL ;@@ -251,6 +363,8 @@ static int cxl_acpi_probe(struct platform_device *pdev)if (rc) goto out; +cxl_add_cfmws_decoders (host, root_port); +/* * Root level scanned with host-bridge as dports, now scan host-bridges * for their role as CXL uports to their CXL-capable PCIe Root Ports.