| Message ID | 20250205151950.25268-3-alucerop@amd.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | cxl: add type2 device basic support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
On 05/02/2025 15:19, alucerop@amd.com wrote: > From: Alejandro Lucero <alucerop@amd.com> > > Create a cxl_memdev_state with CXL_DEVTYPE_DEVMEM, aka CXL Type2 memory > device. > > Make sfc CXL initialization dependent on kernel CXL configuration. > > Signed-off-by: Alejandro Lucero <alucerop@amd.com> Acked-by: Edward Cree <ecree.xilinx@gmail.com>
On Wed, Feb 05, 2025 at 03:19:26PM +0000, alucerop@amd.com wrote: > From: Alejandro Lucero <alucerop@amd.com> > > Create a cxl_memdev_state with CXL_DEVTYPE_DEVMEM, aka CXL Type2 memory > device. > > Make sfc CXL initialization dependent on kernel CXL configuration. > > Signed-off-by: Alejandro Lucero <alucerop@amd.com> ... > diff --git a/drivers/net/ethernet/sfc/efx_cxl.c b/drivers/net/ethernet/sfc/efx_cxl.c > new file mode 100644 > index 000000000000..69feffd4aec3 > --- /dev/null > +++ b/drivers/net/ethernet/sfc/efx_cxl.c > @@ -0,0 +1,60 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/**************************************************************************** > + * > + * Driver for AMD network controllers and boards > + * Copyright (C) 2024, Advanced Micro Devices, Inc. > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2 as published > + * by the Free Software Foundation, incorporated herein by reference. > + */ > + > +#include <cxl/pci.h> > +#include <cxl/cxl.h> > +#include <linux/pci.h> > + > +#include "net_driver.h" > +#include "efx_cxl.h" > + > +#define EFX_CTPIO_BUFFER_SIZE SZ_256M > + > +int efx_cxl_init(struct efx_probe_data *probe_data) > +{ > + struct efx_nic *efx = &probe_data->efx; > + struct pci_dev *pci_dev = efx->pci_dev; > + struct efx_cxl *cxl; > + u16 dvsec; > + > + probe_data->cxl_pio_initialised = false; > + > + dvsec = pci_find_dvsec_capability(pci_dev, PCI_VENDOR_ID_CXL, > + CXL_DVSEC_PCIE_DEVICE); > + if (!dvsec) > + return 0; > + > + pci_dbg(pci_dev, "CXL_DVSEC_PCIE_DEVICE capability found\n"); > + > + cxl = kzalloc(sizeof(*cxl), GFP_KERNEL); > + if (!cxl) > + return -ENOMEM; > + > + cxl->cxlmds = cxl_memdev_state_create(&pci_dev->dev, pci_dev->dev.id, > + dvsec, CXL_DEVTYPE_DEVMEM); > + > + if (IS_ERR(cxl->cxlmds)) { > + kfree(cxl); Hi Alejandro, cxl is freed on the line above but dereferenced on the line below. > + return PTR_ERR(cxl->cxlmds); > + } > + > + probe_data->cxl = cxl; > + > + return 0; > +} ...
On Wed, Feb 05, 2025 at 03:19:26PM +0000, alucerop@amd.com wrote: > From: Alejandro Lucero <alucerop@amd.com> > > Create a cxl_memdev_state with CXL_DEVTYPE_DEVMEM, aka CXL Type2 memory > device. > > Make sfc CXL initialization dependent on kernel CXL configuration. > > Signed-off-by: Alejandro Lucero <alucerop@amd.com> > --- > drivers/net/ethernet/sfc/Kconfig | 5 +++ > drivers/net/ethernet/sfc/Makefile | 1 + > drivers/net/ethernet/sfc/efx.c | 16 ++++++- > drivers/net/ethernet/sfc/efx_cxl.c | 60 +++++++++++++++++++++++++++ > drivers/net/ethernet/sfc/efx_cxl.h | 40 ++++++++++++++++++ > drivers/net/ethernet/sfc/net_driver.h | 10 +++++ > 6 files changed, 131 insertions(+), 1 deletion(-) > create mode 100644 drivers/net/ethernet/sfc/efx_cxl.c > create mode 100644 drivers/net/ethernet/sfc/efx_cxl.h > > diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig > index 3eb55dcfa8a6..0ce4a9cd5590 100644 > --- a/drivers/net/ethernet/sfc/Kconfig > +++ b/drivers/net/ethernet/sfc/Kconfig > @@ -65,6 +65,11 @@ config SFC_MCDI_LOGGING > Driver-Interface) commands and responses, allowing debugging of > driver/firmware interaction. The tracing is actually enabled by > a sysfs file 'mcdi_logging' under the PCI device. > +config SFC_CXL > + bool "Solarflare SFC9100-family CXL support" > + depends on SFC && CXL_BUS && !(SFC=y && CXL_BUS=m) > + depends on CXL_BUS >= CXL_BUS Hi Alejandro, I'm confused by the intent of the line above. Could you clarify? > + default SFC > > source "drivers/net/ethernet/sfc/falcon/Kconfig" > source "drivers/net/ethernet/sfc/siena/Kconfig" ...
On 2/7/25 12:48, Simon Horman wrote: > On Wed, Feb 05, 2025 at 03:19:26PM +0000, alucerop@amd.com wrote: >> From: Alejandro Lucero <alucerop@amd.com> >> >> Create a cxl_memdev_state with CXL_DEVTYPE_DEVMEM, aka CXL Type2 memory >> device. >> >> Make sfc CXL initialization dependent on kernel CXL configuration. >> >> Signed-off-by: Alejandro Lucero <alucerop@amd.com> > ... > >> diff --git a/drivers/net/ethernet/sfc/efx_cxl.c b/drivers/net/ethernet/sfc/efx_cxl.c >> new file mode 100644 >> index 000000000000..69feffd4aec3 >> --- /dev/null >> +++ b/drivers/net/ethernet/sfc/efx_cxl.c >> @@ -0,0 +1,60 @@ >> +// SPDX-License-Identifier: GPL-2.0-only >> +/**************************************************************************** >> + * >> + * Driver for AMD network controllers and boards >> + * Copyright (C) 2024, Advanced Micro Devices, Inc. >> + * >> + * This program is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License version 2 as published >> + * by the Free Software Foundation, incorporated herein by reference. >> + */ >> + >> +#include <cxl/pci.h> >> +#include <cxl/cxl.h> >> +#include <linux/pci.h> >> + >> +#include "net_driver.h" >> +#include "efx_cxl.h" >> + >> +#define EFX_CTPIO_BUFFER_SIZE SZ_256M >> + >> +int efx_cxl_init(struct efx_probe_data *probe_data) >> +{ >> + struct efx_nic *efx = &probe_data->efx; >> + struct pci_dev *pci_dev = efx->pci_dev; >> + struct efx_cxl *cxl; >> + u16 dvsec; >> + >> + probe_data->cxl_pio_initialised = false; >> + >> + dvsec = pci_find_dvsec_capability(pci_dev, PCI_VENDOR_ID_CXL, >> + CXL_DVSEC_PCIE_DEVICE); >> + if (!dvsec) >> + return 0; >> + >> + pci_dbg(pci_dev, "CXL_DVSEC_PCIE_DEVICE capability found\n"); >> + >> + cxl = kzalloc(sizeof(*cxl), GFP_KERNEL); >> + if (!cxl) >> + return -ENOMEM; >> + >> + cxl->cxlmds = cxl_memdev_state_create(&pci_dev->dev, pci_dev->dev.id, >> + dvsec, CXL_DEVTYPE_DEVMEM); >> + >> + if (IS_ERR(cxl->cxlmds)) { >> + kfree(cxl); > Hi Alejandro, > > cxl is freed on the line above but dereferenced on the line below. Right. I'll fix it. Thanks >> + return PTR_ERR(cxl->cxlmds); >> + } >> + >> + probe_data->cxl = cxl; >> + >> + return 0; >> +} > ...
On 2/7/25 13:03, Simon Horman wrote: > On Wed, Feb 05, 2025 at 03:19:26PM +0000, alucerop@amd.com wrote: >> From: Alejandro Lucero <alucerop@amd.com> >> >> Create a cxl_memdev_state with CXL_DEVTYPE_DEVMEM, aka CXL Type2 memory >> device. >> >> Make sfc CXL initialization dependent on kernel CXL configuration. >> >> Signed-off-by: Alejandro Lucero <alucerop@amd.com> >> --- >> drivers/net/ethernet/sfc/Kconfig | 5 +++ >> drivers/net/ethernet/sfc/Makefile | 1 + >> drivers/net/ethernet/sfc/efx.c | 16 ++++++- >> drivers/net/ethernet/sfc/efx_cxl.c | 60 +++++++++++++++++++++++++++ >> drivers/net/ethernet/sfc/efx_cxl.h | 40 ++++++++++++++++++ >> drivers/net/ethernet/sfc/net_driver.h | 10 +++++ >> 6 files changed, 131 insertions(+), 1 deletion(-) >> create mode 100644 drivers/net/ethernet/sfc/efx_cxl.c >> create mode 100644 drivers/net/ethernet/sfc/efx_cxl.h >> >> diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig >> index 3eb55dcfa8a6..0ce4a9cd5590 100644 >> --- a/drivers/net/ethernet/sfc/Kconfig >> +++ b/drivers/net/ethernet/sfc/Kconfig >> @@ -65,6 +65,11 @@ config SFC_MCDI_LOGGING >> Driver-Interface) commands and responses, allowing debugging of >> driver/firmware interaction. The tracing is actually enabled by >> a sysfs file 'mcdi_logging' under the PCI device. >> +config SFC_CXL >> + bool "Solarflare SFC9100-family CXL support" >> + depends on SFC && CXL_BUS && !(SFC=y && CXL_BUS=m) >> + depends on CXL_BUS >= CXL_BUS > Hi Alejandro, > > I'm confused by the intent of the line above. > Could you clarify? Dan original comments will do: https://lore.kernel.org/all/677ddb432dafe_2aff429488@dwillia2-xfh.jf.intel.com.notmuch/ >> + default SFC >> >> source "drivers/net/ethernet/sfc/falcon/Kconfig" >> source "drivers/net/ethernet/sfc/siena/Kconfig" > ...
On Mon, Feb 17, 2025 at 01:11:41PM +0000, Alejandro Lucero Palau wrote: > > On 2/7/25 13:03, Simon Horman wrote: > > On Wed, Feb 05, 2025 at 03:19:26PM +0000, alucerop@amd.com wrote: > > > From: Alejandro Lucero <alucerop@amd.com> > > > > > > Create a cxl_memdev_state with CXL_DEVTYPE_DEVMEM, aka CXL Type2 memory > > > device. > > > > > > Make sfc CXL initialization dependent on kernel CXL configuration. > > > > > > Signed-off-by: Alejandro Lucero <alucerop@amd.com> > > > --- > > > drivers/net/ethernet/sfc/Kconfig | 5 +++ > > > drivers/net/ethernet/sfc/Makefile | 1 + > > > drivers/net/ethernet/sfc/efx.c | 16 ++++++- > > > drivers/net/ethernet/sfc/efx_cxl.c | 60 +++++++++++++++++++++++++++ > > > drivers/net/ethernet/sfc/efx_cxl.h | 40 ++++++++++++++++++ > > > drivers/net/ethernet/sfc/net_driver.h | 10 +++++ > > > 6 files changed, 131 insertions(+), 1 deletion(-) > > > create mode 100644 drivers/net/ethernet/sfc/efx_cxl.c > > > create mode 100644 drivers/net/ethernet/sfc/efx_cxl.h > > > > > > diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig > > > index 3eb55dcfa8a6..0ce4a9cd5590 100644 > > > --- a/drivers/net/ethernet/sfc/Kconfig > > > +++ b/drivers/net/ethernet/sfc/Kconfig > > > @@ -65,6 +65,11 @@ config SFC_MCDI_LOGGING > > > Driver-Interface) commands and responses, allowing debugging of > > > driver/firmware interaction. The tracing is actually enabled by > > > a sysfs file 'mcdi_logging' under the PCI device. > > > +config SFC_CXL > > > + bool "Solarflare SFC9100-family CXL support" > > > + depends on SFC && CXL_BUS && !(SFC=y && CXL_BUS=m) > > > + depends on CXL_BUS >= CXL_BUS > > Hi Alejandro, > > > > I'm confused by the intent of the line above. > > Could you clarify? > > > Dan original comments will do: > > https://lore.kernel.org/all/677ddb432dafe_2aff429488@dwillia2-xfh.jf.intel.com.notmuch/ Thanks, that makes things a bit clearer. But do you mean: depends on CXL_BUS >= SFC Rather than: depends on CXL_BUS >= CXL_BUS Because the line above appears to be a truism. > > > > > + default SFC > > > source "drivers/net/ethernet/sfc/falcon/Kconfig" > > > source "drivers/net/ethernet/sfc/siena/Kconfig" > > ... >
diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig index 3eb55dcfa8a6..0ce4a9cd5590 100644 --- a/drivers/net/ethernet/sfc/Kconfig +++ b/drivers/net/ethernet/sfc/Kconfig @@ -65,6 +65,11 @@ config SFC_MCDI_LOGGING Driver-Interface) commands and responses, allowing debugging of driver/firmware interaction. The tracing is actually enabled by a sysfs file 'mcdi_logging' under the PCI device. +config SFC_CXL + bool "Solarflare SFC9100-family CXL support" + depends on SFC && CXL_BUS && !(SFC=y && CXL_BUS=m) + depends on CXL_BUS >= CXL_BUS + default SFC source "drivers/net/ethernet/sfc/falcon/Kconfig" source "drivers/net/ethernet/sfc/siena/Kconfig" diff --git a/drivers/net/ethernet/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile index 8f446b9bd5ee..e909cafd5908 100644 --- a/drivers/net/ethernet/sfc/Makefile +++ b/drivers/net/ethernet/sfc/Makefile @@ -13,6 +13,7 @@ sfc-$(CONFIG_SFC_SRIOV) += sriov.o ef10_sriov.o ef100_sriov.o ef100_rep.o \ mae.o tc.o tc_bindings.o tc_counters.o \ tc_encap_actions.o tc_conntrack.o +sfc-$(CONFIG_SFC_CXL) += efx_cxl.o obj-$(CONFIG_SFC) += sfc.o obj-$(CONFIG_SFC_FALCON) += falcon/ diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 650136dfc642..d34d136c3650 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -34,6 +34,7 @@ #include "selftest.h" #include "sriov.h" #include "efx_devlink.h" +#include "efx_cxl.h" #include "mcdi_port_common.h" #include "mcdi_pcol.h" @@ -1004,12 +1005,16 @@ static void efx_pci_remove(struct pci_dev *pci_dev) efx_pci_remove_main(efx); efx_fini_io(efx); + + probe_data = container_of(efx, struct efx_probe_data, efx); + + efx_cxl_exit(probe_data); + pci_dbg(efx->pci_dev, "shutdown successful\n"); efx_fini_devlink_and_unlock(efx); efx_fini_struct(efx); free_netdev(efx->net_dev); - probe_data = container_of(efx, struct efx_probe_data, efx); kfree(probe_data); }; @@ -1214,6 +1219,15 @@ static int efx_pci_probe(struct pci_dev *pci_dev, if (rc) goto fail2; + /* A successful cxl initialization implies a CXL region created to be + * used for PIO buffers. If there is no CXL support, or initialization + * fails, efx_cxl_pio_initialised wll be false and legacy PIO buffers + * defined at specific PCI BAR regions will be used. + */ + rc = efx_cxl_init(probe_data); + if (rc) + pci_err(pci_dev, "CXL initialization failed with error %d\n", rc); + rc = efx_pci_probe_post_io(efx); if (rc) { /* On failure, retry once immediately. diff --git a/drivers/net/ethernet/sfc/efx_cxl.c b/drivers/net/ethernet/sfc/efx_cxl.c new file mode 100644 index 000000000000..69feffd4aec3 --- /dev/null +++ b/drivers/net/ethernet/sfc/efx_cxl.c @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0-only +/**************************************************************************** + * + * Driver for AMD network controllers and boards + * Copyright (C) 2024, Advanced Micro Devices, Inc. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation, incorporated herein by reference. + */ + +#include <cxl/pci.h> +#include <cxl/cxl.h> +#include <linux/pci.h> + +#include "net_driver.h" +#include "efx_cxl.h" + +#define EFX_CTPIO_BUFFER_SIZE SZ_256M + +int efx_cxl_init(struct efx_probe_data *probe_data) +{ + struct efx_nic *efx = &probe_data->efx; + struct pci_dev *pci_dev = efx->pci_dev; + struct efx_cxl *cxl; + u16 dvsec; + + probe_data->cxl_pio_initialised = false; + + dvsec = pci_find_dvsec_capability(pci_dev, PCI_VENDOR_ID_CXL, + CXL_DVSEC_PCIE_DEVICE); + if (!dvsec) + return 0; + + pci_dbg(pci_dev, "CXL_DVSEC_PCIE_DEVICE capability found\n"); + + cxl = kzalloc(sizeof(*cxl), GFP_KERNEL); + if (!cxl) + return -ENOMEM; + + cxl->cxlmds = cxl_memdev_state_create(&pci_dev->dev, pci_dev->dev.id, + dvsec, CXL_DEVTYPE_DEVMEM); + + if (IS_ERR(cxl->cxlmds)) { + kfree(cxl); + return PTR_ERR(cxl->cxlmds); + } + + probe_data->cxl = cxl; + + return 0; +} + +void efx_cxl_exit(struct efx_probe_data *probe_data) +{ + if (probe_data->cxl) + kfree(probe_data->cxl); +} + +MODULE_IMPORT_NS("CXL"); diff --git a/drivers/net/ethernet/sfc/efx_cxl.h b/drivers/net/ethernet/sfc/efx_cxl.h new file mode 100644 index 000000000000..b9e4ef4559c4 --- /dev/null +++ b/drivers/net/ethernet/sfc/efx_cxl.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/**************************************************************************** + * Driver for AMD network controllers and boards + * Copyright (C) 2024, Advanced Micro Devices, Inc. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation, incorporated herein by reference. + */ + +#ifndef EFX_CXL_H +#define EFX_CXL_H + +#ifdef CONFIG_SFC_CXL + +struct cxl_memdev_state; +struct cxl_memdev; +struct cxl_root_decoder; +struct cxl_port; +struct cxl_endpoint_decoder; +struct cxl_region; +struct efx_probe_data; + +struct efx_cxl { + struct cxl_memdev_state *cxlmds; + struct cxl_memdev *cxlmd; + struct cxl_root_decoder *cxlrd; + struct cxl_port *endpoint; + struct cxl_endpoint_decoder *cxled; + struct cxl_region *efx_region; + void __iomem *ctpio_cxl; +}; + +int efx_cxl_init(struct efx_probe_data *probe_data); +void efx_cxl_exit(struct efx_probe_data *probe_data); +#else +inline int efx_cxl_init(struct efx_probe_data *probe_data) { return 0; } +inline void efx_cxl_exit(struct efx_probe_data *probe_data) {} +#endif +#endif diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index f70a7b7d6345..a2626bcd6a41 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h @@ -1201,14 +1201,24 @@ struct efx_nic { atomic_t n_rx_noskb_drops; }; +#ifdef CONFIG_SFC_CXL +struct efx_cxl; +#endif + /** * struct efx_probe_data - State after hardware probe * @pci_dev: The PCI device * @efx: Efx NIC details + * @cxl: details of related cxl objects + * @cxl_pio_initialised: cxl initialization outcome. */ struct efx_probe_data { struct pci_dev *pci_dev; struct efx_nic efx; +#ifdef CONFIG_SFC_CXL + struct efx_cxl *cxl; + bool cxl_pio_initialised; +#endif }; static inline struct efx_nic *efx_netdev_priv(struct net_device *dev)