pds_core driver
Subsystems (4)
v5 cover pds_core driver
Summary:
--------
This patchset implements a new driver for use with the AMD/Pensando Distributed Services Card (DSC), intended to provide core configuration services through the auxiliary_bus and through a couple of EXPORTed functions for use initially in VFio and vDPA feature specific drivers.
To keep this patchset to a manageable size, the pds_vdpa and pds_vfio drivers have been split out into their own patchsets to be reviewed separately.
Detail:
-------
AMD/Pensando is making available a new set of devices for supporting vDPA, VFio, and potentially other features in the Distributed Services Card (DSC). These features are implemented through a PF that serves as a Core device for controlling and configuring its VF devices. These VF devices have separate drivers that use the auxiliary_bus to work through the Core device as the control path.
Currently, the DSC supports standard ethernet operations using the ionic driver. This is not replaced by the Core-based devices - these new devices are in addition to the existing Ethernet device. Typical DSC configurations will include both PDS devices and Ionic Eth devices. However, there is a potential future path for ethernet services to come through this device as well.
The Core device is a new PCI PF/VF device managed by a new driver 'pds_core'. The PF device has access to an admin queue for configuring the services used by the VFs, and sets up auxiliary_bus devices for each vDPA VF for communicating with the drivers for the vDPA devices. The VFs may be for VFio or vDPA, and other services in the future; these VF types are selected as part of the DSC internal FW configurations, which is out of the scope of this patchset.
When the vDPA support set is enabled in the core PF through its devlink param, auxiliary_bus devices are created for each VF that supports the feature. The vDPA driver then connects to and uses this auxiliary_device to do control path configuration through the PF device. This can then be used with the vdpa kernel module to provide devices for virtio_vdpa kernel module for host interfaces, or vhost_vdpa kernel module for interfaces exported into your favorite VM.
A cheap ASCII diagram of a vDPA instance looks something like this:
,----------.
| vdpa |
'----------'
| ||
ctl data
| ||
.----------. ||
| pds_vdpa | ||
'----------' ||
| ||
pds_core.vDPA.1 ||
| ||
.---------------. ||
| pds_core | ||
'---------------' ||
|| || ||
09:00.0 09:00.1
== PCI ============================================
|| ||
.----------. .----------.
,------| PF |---| VF |-------,
| '----------' '----------' |
| DSC |
| |
------------------------------------------Changes:
v5:
- added devlink health reporter for FW issues
- removed asic_type, asic_rev, serial_num, fw_version from debugfs as they are available through other means
- trimed OS info in pdsc_identify(), we don't need to send that much info to the FW
- removed reg/unreg from auxbus client API, they are now in the core when VF is started
- removed need for pdsc definition in client by simplifying the padev to only carry struct pci_dev pointers rather than full struct pdsc to the pf and vf
- removed the unused pdsc argument in pdsc_notify()
- moved include/linux/pds/pds_core.h to driver/../pds_core/core.h
- restored a few pds_core_if.h interface values and structs that are shared with FW source
- moved final config_lock unlock to before tear down of timer and workqueue to be sure there are no deadlocks while waiting for any stragglers
- changed use of PAGE_SIZE to local PDS_PAGE_SIZE to keep with FW layout needs without regard to kernel PAGE_SIZE configuration
- removed the redundant *adminqcq argument from pdsc_adminq_post()
v4:
https://lore.kernel.org/netdev/[email protected]/
- reworked to attach to both Core PF and vDPA VF PCI devices
- now creates auxiliary_device as part of each VF PCI probe, removes them on PCI remove
- auxiliary devices now use simple unique id rather than PCI address for identifier
- replaced home-grown event publishing with kernel-based notifier service
- dropped live_migration parameter, not needed when not creating aux device for it
- replaced devm_* functions with traditional interfaces
- added MAINTAINERS entry
- removed lingering traces of set/get_vf attribute adminq commands
- trimmed some include lists
- cleaned a kernel test robot complaint about a stray unused variable
Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
v3:
https://lore.kernel.org/netdev/[email protected]/
- changed names from "pensando" to "amd" and updated copyright strings
- dropped the DEVLINK_PARAM_GENERIC_ID_FW_BANK for future development
- changed the auxiliary device creation to be triggered by the PCI bus event BOUND_DRIVER, and torn down at UNBIND_DRIVER in order to properly handle users using the sysfs bind/unbind functions
- dropped some noisy log messages
- rebased to current net-next
RFC to v2:
https://lore.kernel.org/netdev/[email protected]/
- added separate devlink param patches for DEVLINK_PARAM_GENERIC_ID_ENABLE_MIGRATION and DEVLINK_PARAM_GENERIC_ID_FW_BANK, and dropped the driver specific implementations
- updated descriptions for the new devlink parameters
- dropped netdev support
- dropped vDPA patches, will followup later
- separated fw update and fw bank select into their own patches
RFC:
https://lore.kernel.org/netdev/[email protected]/
Shannon Nelson (13):
pds_core: initial framework for pds_core PF driver
pds_core: add devcmd device interfaces
pds_core: health timer and workqueue
pds_core: set up device and adminq
pds_core: Add adminq processing and commands
pds_core: add FW update feature to devlink
pds_core: set up the VIF definitions and defaults
pds_core: add initial VF device handling
pds_core: add auxiliary_bus devices
pds_core: devlink params for enabling VIF support
pds_core: add the aux client API
pds_core: publish events to the clients
pds_core: Kconfig and pds_core.rst
.../device_drivers/ethernet/amd/pds_core.rst | 133 ++++ .../device_drivers/ethernet/index.rst | 1 + drivers/net/ethernet/amd/Kconfig | 12 + drivers/net/ethernet/amd/Makefile | 1 + drivers/net/ethernet/amd/pds_core/Makefile | 14 + drivers/net/ethernet/amd/pds_core/adminq.c | 283 ++++++++ drivers/net/ethernet/amd/pds_core/auxbus.c | 268 ++++++++ drivers/net/ethernet/amd/pds_core/core.c | 605 +++++++++++++++++ drivers/net/ethernet/amd/pds_core/debugfs.c | 243 +++++++ drivers/net/ethernet/amd/pds_core/dev.c | 353 ++++++++++ drivers/net/ethernet/amd/pds_core/devlink.c | 202 ++++++ drivers/net/ethernet/amd/pds_core/fw.c | 187 ++++++ drivers/net/ethernet/amd/pds_core/main.c | 442 ++++++++++++ include/linux/pds/pds_adminq.h | 635 ++++++++++++++++++ include/linux/pds/pds_auxbus.h | 58 ++ include/linux/pds/pds_common.h | 93 +++ include/linux/pds/pds_core.h | 320 +++++++++ include/linux/pds/pds_core_if.h | 406 +++++++++++ include/linux/pds/pds_intr.h | 161 +++++ 19 files changed, 4417 insertions(+) create mode 100644 Documentation/networking/device_drivers/ethernet/amd/pds_core.rst create mode 100644 drivers/net/ethernet/amd/pds_core/Makefile create mode 100644 drivers/net/ethernet/amd/pds_core/adminq.c create mode 100644 drivers/net/ethernet/amd/pds_core/auxbus.c create mode 100644 drivers/net/ethernet/amd/pds_core/core.c create mode 100644 drivers/net/ethernet/amd/pds_core/debugfs.c create mode 100644 drivers/net/ethernet/amd/pds_core/dev.c create mode 100644 drivers/net/ethernet/amd/pds_core/devlink.c create mode 100644 drivers/net/ethernet/amd/pds_core/fw.c create mode 100644 drivers/net/ethernet/amd/pds_core/main.c create mode 100644 include/linux/pds/pds_adminq.h create mode 100644 include/linux/pds/pds_auxbus.h create mode 100644 include/linux/pds/pds_common.h create mode 100644 include/linux/pds/pds_core.h create mode 100644 include/linux/pds/pds_core_if.h create mode 100644 include/linux/pds/pds_intr.h
Signature · 61 lines
2.17.1 *** BLURB HERE *** Shannon Nelson (14): pds_core: initial framework for pds_core PF driver pds_core: add devcmd device interfaces pds_core: health timer and workqueue pds_core: add devlink health facilities pds_core: set up device and adminq pds_core: Add adminq processing and commands pds_core: add FW update feature to devlink pds_core: set up the VIF definitions and defaults pds_core: add initial VF device handling pds_core: add auxiliary_bus devices pds_core: devlink params for enabling VIF support pds_core: add the aux client API pds_core: publish events to the clients pds_core: Kconfig and pds_core.rst .../device_drivers/ethernet/amd/pds_core.rst | 143 ++++ .../device_drivers/ethernet/index.rst | 1 + MAINTAINERS | 9 + drivers/net/ethernet/amd/Kconfig | 12 + drivers/net/ethernet/amd/Makefile | 1 + drivers/net/ethernet/amd/pds_core/Makefile | 14 + drivers/net/ethernet/amd/pds_core/adminq.c | 284 ++++++++ drivers/net/ethernet/amd/pds_core/auxbus.c | 266 ++++++++ drivers/net/ethernet/amd/pds_core/core.c | 607 ++++++++++++++++ drivers/net/ethernet/amd/pds_core/core.h | 321 +++++++++ drivers/net/ethernet/amd/pds_core/debugfs.c | 237 +++++++ drivers/net/ethernet/amd/pds_core/dev.c | 350 ++++++++++ drivers/net/ethernet/amd/pds_core/devlink.c | 262 +++++++ drivers/net/ethernet/amd/pds_core/fw.c | 187 +++++ drivers/net/ethernet/amd/pds_core/main.c | 446 ++++++++++++ include/linux/pds/pds_adminq.h | 645 ++++++++++++++++++ include/linux/pds/pds_auxbus.h | 44 ++ include/linux/pds/pds_common.h | 97 +++ include/linux/pds/pds_core_if.h | 540 +++++++++++++++ include/linux/pds/pds_intr.h | 161 +++++ 20 files changed, 4627 insertions(+) create mode 100644 Documentation/networking/device_drivers/ethernet/amd/pds_core.rst create mode 100644 drivers/net/ethernet/amd/pds_core/Makefile create mode 100644 drivers/net/ethernet/amd/pds_core/adminq.c create mode 100644 drivers/net/ethernet/amd/pds_core/auxbus.c create mode 100644 drivers/net/ethernet/amd/pds_core/core.c create mode 100644 drivers/net/ethernet/amd/pds_core/core.h create mode 100644 drivers/net/ethernet/amd/pds_core/debugfs.c create mode 100644 drivers/net/ethernet/amd/pds_core/dev.c create mode 100644 drivers/net/ethernet/amd/pds_core/devlink.c create mode 100644 drivers/net/ethernet/amd/pds_core/fw.c create mode 100644 drivers/net/ethernet/amd/pds_core/main.c create mode 100644 include/linux/pds/pds_adminq.h create mode 100644 include/linux/pds/pds_auxbus.h create mode 100644 include/linux/pds/pds_common.h create mode 100644 include/linux/pds/pds_core_if.h create mode 100644 include/linux/pds/pds_intr.h -- 2.17.1
PATCH v5 1/14 pds_core: initial framework for pds_core PF driver
This is the initial PCI driver framework for the new pds_core device driver and its family of devices. This does the very basics of registering for the new PF PCI device 1dd8:100c, setting up debugfs entries, and registering with devlink.
--- drivers/net/ethernet/amd/pds_core/Makefile | 9 + drivers/net/ethernet/amd/pds_core/core.h | 68 +++ drivers/net/ethernet/amd/pds_core/debugfs.c | 47 ++ drivers/net/ethernet/amd/pds_core/devlink.c | 51 ++ drivers/net/ethernet/amd/pds_core/main.c | 276 ++++++++++ include/linux/pds/pds_common.h | 14 + include/linux/pds/pds_core_if.h | 540 ++++++++++++++++++++ 7 files changed, 1005 insertions(+) create mode 100644 drivers/net/ethernet/amd/pds_core/Makefile create mode 100644 drivers/net/ethernet/amd/pds_core/core.h create mode 100644 drivers/net/ethernet/amd/pds_core/debugfs.c create mode 100644 drivers/net/ethernet/amd/pds_core/devlink.c create mode 100644 drivers/net/ethernet/amd/pds_core/main.c create mode 100644 include/linux/pds/pds_common.h create mode 100644 include/linux/pds/pds_core_if.h
drivers/net/ethernet/amd/pds_core/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2023 Advanced Micro Devices, Inc. + +obj-$(CONFIG_PDS_CORE) := pds_core.o + +pds_core-y := main.o \ + devlink.o + +pds_core-$(CONFIG_DEBUG_FS) += debugfs.o
drivers/net/ethernet/amd/pds_core/core.h new file +68 -0
68 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/debugfs.c new file +47 -0
47 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/devlink.c new file +51 -0
51 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/main.c new file +276 -0
276 lines not on this page · raw message
include/linux/pds/pds_common.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR Linux-OpenIB) OR BSD-2-Clause */ +/* Copyright(c) 2023 Advanced Micro Devices, Inc. */ + +#ifndef _PDS_COMMON_H_ +#define _PDS_COMMON_H_ + +#define PDS_CORE_DRV_NAME "pds_core" + +/* the device's internal addressing uses up to 52 bits */ +#define PDS_CORE_ADDR_LEN 52 +#define PDS_CORE_ADDR_MASK (BIT_ULL(PDS_ADDR_LEN) - 1) +#define PDS_PAGE_SIZE 4096 + +#endif /* _PDS_COMMON_H_ */
include/linux/pds/pds_core_if.h new file +540 -0
540 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v5 2/14 pds_core: add devcmd device interfaces
In reply to Shannon NelsonThe devcmd interface is the basic connection to the device through the PCI BAR for low level identification and command services. This does the early device initialization and finds the identity data, and adds devcmd routines to be used by later driver bits.
--- drivers/net/ethernet/amd/pds_core/Makefile | 4 +- drivers/net/ethernet/amd/pds_core/core.c | 36 ++ drivers/net/ethernet/amd/pds_core/core.h | 52 +++ drivers/net/ethernet/amd/pds_core/debugfs.c | 61 ++++ drivers/net/ethernet/amd/pds_core/dev.c | 347 ++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/main.c | 35 +- include/linux/pds/pds_common.h | 61 ++++ include/linux/pds/pds_intr.h | 161 +++++++++ 8 files changed, 753 insertions(+), 4 deletions(-) create mode 100644 drivers/net/ethernet/amd/pds_core/core.c create mode 100644 drivers/net/ethernet/amd/pds_core/dev.c create mode 100644 include/linux/pds/pds_intr.h
drivers/net/ethernet/amd/pds_core/Makefile +3 -1
@@ -4,6 +4,8 @@ obj-$(CONFIG_PDS_CORE) := pds_core.o pds_core-y := main.o \ - devlink.o + devlink.o \ + dev.o \ + core.o pds_core-$(CONFIG_DEBUG_FS) += debugfs.o
drivers/net/ethernet/amd/pds_core/core.c new file +36 -0
@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2023 Advanced Micro Devices, Inc */ + +#include "core.h" + +int pdsc_setup (struct pdsc *pdsc,bool init) +{ +int err =0 ; + +if (init) + err =pdsc_dev_init (pdsc); +else + err =pdsc_dev_reinit (pdsc); +if (err) +return err; + +clear_bit (PDSC_S_FW_DEAD , &pdsc->state); +return 0 ; +} + +void pdsc_teardown (struct pdsc *pdsc,bool removing) +{ +pdsc_devcmd_reset (pdsc); + +if (removing) { +kfree (pdsc->intr_info); + pdsc->intr_info =NULL ; + } + +if (pdsc->kern_dbpage) { +iounmap (pdsc->kern_dbpage); + pdsc->kern_dbpage =NULL ; + } + +set_bit (PDSC_S_FW_DEAD , &pdsc->state); +}
drivers/net/ethernet/amd/pds_core/core.h +52 -0
84 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/debugfs.c +61 -0
65 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/dev.c new file +347 -0
347 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/main.c +32 -3
@@ -153,13 +153,31 @@ static int pdsc_init_pf(struct pdsc *pdsc)if (err) goto err_out_release_regions; - err =pdsc_dl_register (pdsc); +mutex_init (&pdsc->devcmd_lock); +mutex_init (&pdsc->config_lock); + +mutex_lock (&pdsc->config_lock); +set_bit (PDSC_S_FW_DEAD , &pdsc->state); + + err =pdsc_setup (pdsc,PDSC_SETUP_INIT );if (err) goto err_out_unmap_bars; + err =pdsc_dl_register (pdsc); +if (err) + goto err_out_teardown; + +mutex_unlock (&pdsc->config_lock); +return 0 ; +err_out_teardown: +pdsc_teardown (pdsc,PDSC_TEARDOWN_REMOVING ); err_out_unmap_bars: +mutex_unlock (&pdsc->config_lock); +mutex_destroy (&pdsc->config_lock); +mutex_destroy (&pdsc->devcmd_lock); +pci_free_irq_vectors (pdsc->pdev);pdsc_unmap_bars (pdsc); err_out_release_regions:pci_release_regions (pdsc->pdev);
@@ -242,8 +260,19 @@ static void pdsc_remove(struct pci_dev *pdev)*/ pdsc_dl_unregister (pdsc); -pdsc_unmap_bars (pdsc); -pci_release_regions (pdev); +if (!pdev->is_virtfn) { +mutex_lock (&pdsc->config_lock); +set_bit (PDSC_S_STOPPING_DRIVER , &pdsc->state); + +pdsc_teardown (pdsc,PDSC_TEARDOWN_REMOVING ); +mutex_unlock (&pdsc->config_lock); +mutex_destroy (&pdsc->config_lock); +mutex_destroy (&pdsc->devcmd_lock); + +pci_free_irq_vectors (pdev); +pdsc_unmap_bars (pdsc); +pci_release_regions (pdev); + }pci_clear_master (pdev);pci_disable_device (pdev);
include/linux/pds/pds_common.h +61 -0
65 lines not on this page · raw message
include/linux/pds/pds_intr.h new file +161 -0
161 lines not on this page · raw message
Signature · 1 line
2.17.1
kernel test robot
build botRe: [PATCH v5 net-next 02/14] pds_core: add devcmd device interfaces
I love your patch! Perhaps something to improve:
Hi Shannon,
I love your patch! Perhaps something to improve:
[auto build test WARNING on net-next/main]
url: https://github.com/intel-lab-lkp/linux/commits/Shannon-Nelson/pds_core-initial-framework-for-pds_core-PF-driver/20230323-030131 patch link: https://lore.kernel.org/r/20230322185626.38758-3-shannon.nelson%40amd.com patch subject: [PATCH v5 net-next 02/14] pds_core: add devcmd device interfaces
reproduce:
make versioncheck
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
versioncheck warnings: (new ones prefixed by >>)
INFO PATH=/opt/cross/clang/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
/usr/bin/timeout -k 100 3h /usr/bin/make W=1 --keep-going HOSTCC=gcc-11 CC=gcc-11 -j32 ARCH=x86_64 versioncheck find ./* \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o \
-name '*.[hcS]' -type f -print | sort \
| xargs perl -w ./scripts/checkversion.pl
./drivers/accessibility/speakup/genmap.c: 13 linux/version.h not needed. ./drivers/accessibility/speakup/makemapdata.c: 13 linux/version.h not needed.
>> ./drivers/net/ethernet/amd/pds_core/dev.c: 4 linux/version.h not needed.
./drivers/soc/tegra/cbb/tegra-cbb.c: 19 linux/version.h not needed. ./drivers/soc/tegra/cbb/tegra194-cbb.c: 26 linux/version.h not needed. ./drivers/soc/tegra/cbb/tegra234-cbb.c: 27 linux/version.h not needed. ./drivers/staging/media/atomisp/include/linux/atomisp.h: 23 linux/version.h not needed. ./samples/trace_events/trace_custom_sched.c: 11 linux/version.h not needed. ./sound/soc/codecs/cs42l42.c: 14 linux/version.h not needed. ./tools/lib/bpf/bpf_helpers.h: 289: need linux/version.h ./tools/perf/tests/bpf-script-example.c: 60: need linux/version.h ./tools/perf/tests/bpf-script-test-kbuild.c: 21: need linux/version.h ./tools/perf/tests/bpf-script-test-prologue.c: 49: need linux/version.h ./tools/perf/tests/bpf-script-test-relocation.c: 51: need linux/version.h ./tools/testing/selftests/bpf/progs/dev_cgroup.c: 9 linux/version.h not needed. ./tools/testing/selftests/bpf/progs/netcnt_prog.c: 3 linux/version.h not needed. ./tools/testing/selftests/bpf/progs/test_map_lock.c: 4 linux/version.h not needed. ./tools/testing/selftests/bpf/progs/test_send_signal_kern.c: 4 linux/version.h not needed. ./tools/testing/selftests/bpf/progs/test_spin_lock.c: 4 linux/version.h not needed. ./tools/testing/selftests/bpf/progs/test_tcp_estats.c: 37 linux/version.h not needed. ./tools/testing/selftests/wireguard/qemu/init.c: 27 linux/version.h not needed.
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
PATCH v5 3/14 pds_core: health timer and workqueue
In reply to Shannon NelsonAdd in the periodic health check and the related workqueue, as well as the handlers for when a FW reset is seen.
--- drivers/net/ethernet/amd/pds_core/core.c | 60 ++++++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/core.h | 10 ++++ drivers/net/ethernet/amd/pds_core/dev.c | 3 ++ drivers/net/ethernet/amd/pds_core/main.c | 51 ++++++++++++++++++++ 4 files changed, 124 insertions(+)
drivers/net/ethernet/amd/pds_core/core.c +60 -0
@@ -34,3 +34,63 @@ void pdsc_teardown(struct pdsc *pdsc, bool removing)set_bit (PDSC_S_FW_DEAD , &pdsc->state); } + +static void pdsc_fw_down (struct pdsc *pdsc) +{ +mutex_lock (&pdsc->config_lock); + +if (test_and_set_bit (PDSC_S_FW_DEAD , &pdsc->state)) { +dev_err (pdsc->dev,"%s: already happening\n" , __func__); +mutex_unlock (&pdsc->config_lock); +return ; + } + +pdsc_teardown (pdsc,PDSC_TEARDOWN_RECOVERY ); + +mutex_unlock (&pdsc->config_lock); +} + +static void pdsc_fw_up (struct pdsc *pdsc) +{ +int err; + +mutex_lock (&pdsc->config_lock); + +if (!test_bit (PDSC_S_FW_DEAD , &pdsc->state)) { +dev_err (pdsc->dev,"%s: fw not dead\n" , __func__); +mutex_unlock (&pdsc->config_lock); +return ; + } + + err =pdsc_setup (pdsc,PDSC_SETUP_RECOVERY ); +if (err) + goto err_out; + +mutex_unlock (&pdsc->config_lock); + +return ; + +err_out: +pdsc_teardown (pdsc,PDSC_TEARDOWN_RECOVERY ); +mutex_unlock (&pdsc->config_lock); +} + +void pdsc_health_thread (struct work_struct *work) +{ + struct pdsc *pdsc = container_of(work, struct pdsc, health_work); +bool healthy; + + healthy =pdsc_is_fw_good (pdsc); +dev_dbg (pdsc->dev,"%s: health %d fw_status %#02x fw_heartbeat %d\n" , + __func__, healthy, pdsc->fw_status, pdsc->last_hb); + +if (test_bit (PDSC_S_FW_DEAD , &pdsc->state)) { +if (healthy) +pdsc_fw_up (pdsc); + }else { +if (!healthy) +pdsc_fw_down (pdsc); + } + + pdsc->fw_generation = pdsc->fw_status &PDS_CORE_FW_STS_F_GENERATION ; +}
drivers/net/ethernet/amd/pds_core/core.h +10 -0
@@ -12,6 +12,8 @@#include <linux/pds/pds_intr.h> #define PDSC_DRV_DESCRIPTION "AMD/Pensando Core Driver" + +#define PDSC_WATCHDOG_SECS 5#define PDSC_TEARDOWN_RECOVERY false#define PDSC_TEARDOWN_REMOVING true#define PDSC_SETUP_RECOVERY false
@@ -63,12 +65,17 @@ struct pdsc {u8 fw_generation;unsigned long last_fw_time;u32 last_hb; +struct timer_list wdtimer; +unsigned int wdtimer_period; +struct work_struct health_work;struct pdsc_devinfo dev_info;struct pds_core_dev_identity dev_ident;unsigned int nintrs;struct pdsc_intr_info *intr_info;/* array of nintrs elements */ +struct workqueue_struct *wq; +unsigned int devcmd_timeout;struct mutex devcmd_lock;/* lock for dev_cmd operations */ struct mutex config_lock;/* lock for configuration operations */
@@ -81,6 +88,8 @@ struct pdsc {u64 __iomem *kern_dbpage; }; +void pdsc_queue_health_check (struct pdsc *pdsc); +struct pdsc *pdsc_dl_alloc (struct device *dev,bool is_pf);void pdsc_dl_free (struct pdsc *pdsc);int pdsc_dl_register (struct pdsc *pdsc);
@@ -116,5 +125,6 @@ int pdsc_dev_init(struct pdsc *pdsc);int pdsc_setup (struct pdsc *pdsc,bool init);void pdsc_teardown (struct pdsc *pdsc,bool removing); +void pdsc_health_thread (struct work_struct *work);#endif /* _PDSC_H_ */
drivers/net/ethernet/amd/pds_core/dev.c +3 -0
@@ -177,6 +177,9 @@ int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, err =pdsc_devcmd_wait (pdsc, max_seconds);memcpy_fromio (comp, &pdsc->cmd_regs->comp,sizeof (*comp)); +if (err == -ENXIO || err == -ETIMEDOUT ) +pdsc_queue_health_check (pdsc); +return err; }
drivers/net/ethernet/amd/pds_core/main.c +51 -0
89 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v5 4/14 pds_core: add devlink health facilities
In reply to Shannon NelsonAdd devlink health reporting on top of our fw watchdog.
Example:
# devlink health show pci/0000:2b:00.0 reporter fw
pci/0000:2b:00.0:
reporter fw
state healthy error 0 recover 0--- drivers/net/ethernet/amd/pds_core/core.c | 6 ++ drivers/net/ethernet/amd/pds_core/core.h | 2 + drivers/net/ethernet/amd/pds_core/devlink.c | 61 +++++++++++++++++++++ 3 files changed, 69 insertions(+)
drivers/net/ethernet/amd/pds_core/core.c +6 -0
@@ -45,6 +45,8 @@ static void pdsc_fw_down(struct pdsc *pdsc)return ; } +devlink_health_report (pdsc->fw_reporter,"FW down reported" , pdsc); +pdsc_teardown (pdsc,PDSC_TEARDOWN_RECOVERY );mutex_unlock (&pdsc->config_lock);
@@ -68,6 +70,10 @@ static void pdsc_fw_up(struct pdsc *pdsc)mutex_unlock (&pdsc->config_lock); + pdsc->fw_recoveries++; +devlink_health_reporter_state_update (pdsc->fw_reporter, +DEVLINK_HEALTH_REPORTER_STATE_HEALTHY ); +return ; err_out:
drivers/net/ethernet/amd/pds_core/core.h +2 -0
@@ -68,6 +68,8 @@ struct pdsc {struct timer_list wdtimer;unsigned int wdtimer_period;struct work_struct health_work; +struct devlink_health_reporter *fw_reporter; +u32 fw_recoveries;struct pdsc_devinfo dev_info;struct pds_core_dev_identity dev_ident;
drivers/net/ethernet/amd/pds_core/devlink.c +61 -0
77 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v5 5/14 pds_core: set up device and adminq
In reply to Shannon NelsonSet up the basic adminq and notifyq services. These are used mostly by the client drivers for feature configuration.
--- drivers/net/ethernet/amd/pds_core/core.c | 443 +++++++++++++- drivers/net/ethernet/amd/pds_core/core.h | 150 +++++ drivers/net/ethernet/amd/pds_core/debugfs.c | 106 ++++ drivers/net/ethernet/amd/pds_core/devlink.c | 53 ++ drivers/net/ethernet/amd/pds_core/main.c | 16 +- include/linux/pds/pds_adminq.h | 637 ++++++++++++++++++++ 6 files changed, 1401 insertions(+), 4 deletions(-) create mode 100644 include/linux/pds/pds_adminq.h
drivers/net/ethernet/amd/pds_core/core.c +440 -3
@@ -1,10 +1,369 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2023 Advanced Micro Devices, Inc */ +#include <linux/pci.h> +#include "core.h" +void pdsc_work_thread (struct work_struct *work) +{ +/* stub */ +} + +irqreturn_t pdsc_adminq_isr (int irq,void *data) +{ +/* stub */ +return IRQ_HANDLED ; +} + +void pdsc_intr_free (struct pdsc *pdsc,int index) +{ +struct pdsc_intr_info *intr_info; + +if (index >= pdsc->nintrs || index <0 ) { +WARN (true,"bad intr index %d\n" , index); +return ; + } + + intr_info = &pdsc->intr_info[index]; +if (!intr_info->vector) +return ; +dev_dbg (pdsc->dev,"%s: idx %d vec %d name %s\n" , + __func__, index, intr_info->vector, intr_info->name); + +pds_core_intr_mask (&pdsc->intr_ctrl[index],PDS_CORE_INTR_MASK_SET ); +pds_core_intr_clean (&pdsc->intr_ctrl[index]); + +free_irq (intr_info->vector, intr_info->data); + +memset (intr_info,0 ,sizeof (*intr_info)); +} + +int pdsc_intr_alloc (struct pdsc *pdsc,char *name, +irq_handler_t handler,void *data) +{ +struct pdsc_intr_info *intr_info; +unsigned int index; +int err; + +/* Find the first available interrupt */ +for (index =0 ; index < pdsc->nintrs; index++) +if (!pdsc->intr_info[index].vector) +break ; +if (index >= pdsc->nintrs) { +dev_warn (pdsc->dev,"%s: no intr, index=%d nintrs=%d\n" , + __func__, index, pdsc->nintrs); +return -ENOSPC ; + } + +pds_core_intr_clean_flags (&pdsc->intr_ctrl[index], +PDS_CORE_INTR_CRED_RESET_COALESCE ); + + intr_info = &pdsc->intr_info[index]; + + intr_info->index = index; + intr_info->data = data; +strscpy (intr_info->name, name,sizeof (intr_info->name)); + +/* Get the OS vector number for the interrupt */ + err =pci_irq_vector (pdsc->pdev, index); +if (err <0 ) { +dev_err (pdsc->dev,"failed to get intr vector index %d: %pe\n" , + index,ERR_PTR (err)); + goto err_out_free_intr; + } + intr_info->vector = err; + +/* Init the device's intr mask */ +pds_core_intr_clean (&pdsc->intr_ctrl[index]); +pds_core_intr_mask_assert (&pdsc->intr_ctrl[index],1 ); +pds_core_intr_mask (&pdsc->intr_ctrl[index],PDS_CORE_INTR_MASK_SET ); + +/* Register the isr with a name */ + err =request_irq (intr_info->vector, handler,0 , intr_info->name, data); +if (err) { +dev_err (pdsc->dev,"failed to get intr irq vector %d: %pe\n" , + intr_info->vector,ERR_PTR (err)); + goto err_out_free_intr; + } + +return index; + +err_out_free_intr: +pdsc_intr_free (pdsc, index); +return err; +} + +static void pdsc_qcq_intr_free (struct pdsc *pdsc,struct pdsc_qcq *qcq) +{ +if (!(qcq->flags &PDS_CORE_QCQ_F_INTR ) || + qcq->intx ==PDS_CORE_INTR_INDEX_NOT_ASSIGNED ) +return ; + +pdsc_intr_free (pdsc, qcq->intx); + qcq->intx =PDS_CORE_INTR_INDEX_NOT_ASSIGNED ; +} + +static int pdsc_qcq_intr_alloc (struct pdsc *pdsc,struct pdsc_qcq *qcq) +{ +char name[PDSC_INTR_NAME_MAX_SZ ]; +int index; + +if (!(qcq->flags &PDS_CORE_QCQ_F_INTR )) { + qcq->intx =PDS_CORE_INTR_INDEX_NOT_ASSIGNED ; +return 0 ; + } + +snprintf (name,sizeof (name), +"%s-%d-%s" ,PDS_CORE_DRV_NAME , pdsc->pdev->bus->number, qcq->q.name); + index =pdsc_intr_alloc (pdsc, name, pdsc_adminq_isr, qcq); +if (index <0 ) +return index; + qcq->intx = index; + +return 0 ; +} + +void pdsc_qcq_free (struct pdsc *pdsc,struct pdsc_qcq *qcq) +{ +struct device *dev = pdsc->dev; + +if (!(qcq && qcq->pdsc)) +return ; + +pdsc_debugfs_del_qcq (qcq); + +pdsc_qcq_intr_free (pdsc, qcq); + +if (qcq->q_base) { +dma_free_coherent (dev, qcq->q_size, + qcq->q_base, qcq->q_base_pa); + qcq->q_base =NULL ; + qcq->q_base_pa =0 ; + } + +if (qcq->cq_base) { +dma_free_coherent (dev, qcq->cq_size, qcq->cq_base, qcq->cq_base_pa); + qcq->cq_base =NULL ; + qcq->cq_base_pa =0 ; + } + +if (qcq->cq.info) { +vfree (qcq->cq.info); + qcq->cq.info =NULL ; + } +if (qcq->q.info) { +vfree (qcq->q.info); + qcq->q.info =NULL ; + } + + qcq->pdsc =NULL ; +memset (&qcq->q,0 ,sizeof (qcq->q)); +memset (&qcq->cq,0 ,sizeof (qcq->cq)); +} + +static void pdsc_q_map (struct pdsc_queue *q,void *base,dma_addr_t base_pa) +{ +struct pdsc_q_info *cur; +unsigned int i; + + q->base = base; + q->base_pa = base_pa; + +for (i =0 , cur = q->info; i < q->num_descs; i++, cur++) + cur->desc = base + (i * q->desc_size); +} + +static void pdsc_cq_map (struct pdsc_cq *cq,void *base,dma_addr_t base_pa) +{ +struct pdsc_cq_info *cur; +unsigned int i; + + cq->base = base; + cq->base_pa = base_pa; + +for (i =0 , cur = cq->info; i < cq->num_descs; i++, cur++) + cur->comp = base + (i * cq->desc_size); +} + +int pdsc_qcq_alloc (struct pdsc *pdsc,unsigned int type,unsigned int index, +const char *name,unsigned int flags,unsigned int num_descs, +unsigned int desc_size,unsigned int cq_desc_size, +unsigned int pid,struct pdsc_qcq *qcq) +{ +struct device *dev = pdsc->dev; +dma_addr_t cq_base_pa =0 ; +dma_addr_t q_base_pa =0 ; +void *q_base, *cq_base; +int err; + + qcq->q.info =vzalloc (num_descs *sizeof (*qcq->q.info)); +if (!qcq->q.info) { +dev_err (dev,"Cannot allocate %s queue info\n" , name); + err = -ENOMEM ; + goto err_out; + } + + qcq->pdsc = pdsc; + qcq->flags = flags; +INIT_WORK (&qcq->work, pdsc_work_thread); + + qcq->q.type = type; + qcq->q.index = index; + qcq->q.num_descs = num_descs; + qcq->q.desc_size = desc_size; + qcq->q.tail_idx =0 ; + qcq->q.head_idx =0 ; + qcq->q.pid = pid; +snprintf (qcq->q.name,sizeof (qcq->q.name),"%s%u" , name, index); + + err =pdsc_qcq_intr_alloc (pdsc, qcq); +if (err) + goto err_out_free_q_info; + + qcq->cq.info =vzalloc (num_descs *sizeof (*qcq->cq.info)); +if (!qcq->cq.info) { +dev_err (dev,"Cannot allocate %s completion queue info\n" , name); + err = -ENOMEM ; + goto err_out_free_irq; + } + + qcq->cq.bound_intr = &pdsc->intr_info[qcq->intx]; + qcq->cq.num_descs = num_descs; + qcq->cq.desc_size = cq_desc_size; + qcq->cq.tail_idx =0 ; + qcq->cq.done_color =1 ; + +if (flags &PDS_CORE_QCQ_F_NOTIFYQ ) { +/* q & cq need to be contiguous in case of notifyq */ + qcq->q_size =PDS_PAGE_SIZE +ALIGN (num_descs * desc_size,PDS_PAGE_SIZE ) + +ALIGN (num_descs * cq_desc_size,PDS_PAGE_SIZE ); + qcq->q_base =dma_alloc_coherent (dev, qcq->q_size + qcq->cq_size, + &qcq->q_base_pa, +GFP_KERNEL ); +if (!qcq->q_base) { +dev_err (dev,"Cannot allocate %s qcq DMA memory\n" , name); + err = -ENOMEM ; + goto err_out_free_cq_info; + } + q_base =PTR_ALIGN (qcq->q_base,PDS_PAGE_SIZE ); + q_base_pa =ALIGN (qcq->q_base_pa,PDS_PAGE_SIZE ); +pdsc_q_map (&qcq->q, q_base, q_base_pa); + + cq_base =PTR_ALIGN (q_base + +ALIGN (num_descs * desc_size,PDS_PAGE_SIZE ),PDS_PAGE_SIZE ); + cq_base_pa =ALIGN (qcq->q_base_pa + +ALIGN (num_descs * desc_size,PDS_PAGE_SIZE ),PDS_PAGE_SIZE ); + + }else { +/* q DMA descriptors */ + qcq->q_size =PDS_PAGE_SIZE + (num_descs * desc_size); + qcq->q_base =dma_alloc_coherent (dev, qcq->q_size, + &qcq->q_base_pa, +GFP_KERNEL ); +if (!qcq->q_base) { +dev_err (dev,"Cannot allocate %s queue DMA memory\n" , name); + err = -ENOMEM ; + goto err_out_free_cq_info; + } + q_base =PTR_ALIGN (qcq->q_base,PDS_PAGE_SIZE ); + q_base_pa =ALIGN (qcq->q_base_pa,PDS_PAGE_SIZE ); +pdsc_q_map (&qcq->q, q_base, q_base_pa); + +/* cq DMA descriptors */ + qcq->cq_size =PDS_PAGE_SIZE + (num_descs * cq_desc_size); + qcq->cq_base =dma_alloc_coherent (dev, qcq->cq_size, + &qcq->cq_base_pa, +GFP_KERNEL ); +if (!qcq->cq_base) { +dev_err (dev,"Cannot allocate %s cq DMA memory\n" , name); + err = -ENOMEM ; + goto err_out_free_q; + } + cq_base =PTR_ALIGN (qcq->cq_base,PDS_PAGE_SIZE ); + cq_base_pa =ALIGN (qcq->cq_base_pa,PDS_PAGE_SIZE ); + } + +pdsc_cq_map (&qcq->cq, cq_base, cq_base_pa); + qcq->cq.bound_q = &qcq->q; + +pdsc_debugfs_add_qcq (pdsc, qcq); + +return 0 ; + +err_out_free_q: +dma_free_coherent (dev, qcq->q_size, qcq->q_base, qcq->q_base_pa); +err_out_free_cq_info: +vfree (qcq->cq.info); +err_out_free_irq: +pdsc_qcq_intr_free (pdsc, qcq); +err_out_free_q_info: +vfree (qcq->q.info); +memset (qcq,0 ,sizeof (*qcq)); +err_out: +dev_err (dev,"qcq alloc of %s%d failed %d\n" , name, index, err); +return err; +} + +static int pdsc_core_init (struct pdsc *pdsc) +{ +union pds_core_dev_comp comp = {0 }; +union pds_core_dev_cmd cmd = { + .init.opcode =PDS_CORE_CMD_INIT , + }; +struct pds_core_dev_init_data_out cido; +struct pds_core_dev_init_data_in cidi; +u32 dbid_count; +u32 dbpage_num; +size_t sz; +int err; + + cidi.adminq_q_base =cpu_to_le64 (pdsc->adminqcq.q_base_pa); + cidi.adminq_cq_base =cpu_to_le64 (pdsc->adminqcq.cq_base_pa); + cidi.notifyq_cq_base =cpu_to_le64 (pdsc->notifyqcq.cq.base_pa); + cidi.flags =cpu_to_le32 (PDS_CORE_QINIT_F_IRQ |PDS_CORE_QINIT_F_ENA ); + cidi.intr_index =cpu_to_le16 (pdsc->adminqcq.intx); + cidi.adminq_ring_size =ilog2 (pdsc->adminqcq.q.num_descs); + cidi.notifyq_ring_size =ilog2 (pdsc->notifyqcq.q.num_descs); + +mutex_lock (&pdsc->devcmd_lock); + + sz =min_t (size_t,sizeof (cidi),sizeof (pdsc->cmd_regs->data)); +memcpy_toio (&pdsc->cmd_regs->data, &cidi, sz); + + err =pdsc_devcmd_locked (pdsc, &cmd, &comp, pdsc->devcmd_timeout); + + sz =min_t (size_t,sizeof (cido),sizeof (pdsc->cmd_regs->data)); +memcpy_fromio (&cido, &pdsc->cmd_regs->data, sz); + +mutex_unlock (&pdsc->devcmd_lock); + + pdsc->hw_index =le32_to_cpu (cido.core_hw_index); + + dbid_count =le32_to_cpu (pdsc->dev_ident.ndbpgs_per_lif); + dbpage_num = pdsc->hw_index * dbid_count; + pdsc->kern_dbpage =pdsc_map_dbpage (pdsc, dbpage_num); +if (!pdsc->kern_dbpage) { +dev_err (pdsc->dev,"Cannot map dbpage, aborting\n" ); +return -ENOMEM ; + } + + pdsc->adminqcq.q.hw_type = cido.adminq_hw_type; + pdsc->adminqcq.q.hw_index =le32_to_cpu (cido.adminq_hw_index); + pdsc->adminqcq.q.dbval =PDS_CORE_DBELL_QID (pdsc->adminqcq.q.hw_index); + + pdsc->notifyqcq.q.hw_type = cido.notifyq_hw_type; + pdsc->notifyqcq.q.hw_index =le32_to_cpu (cido.notifyq_hw_index); + pdsc->notifyqcq.q.dbval =PDS_CORE_DBELL_QID (pdsc->notifyqcq.q.hw_index); + + pdsc->last_eid =0 ; + +return err; +} +int pdsc_setup (struct pdsc *pdsc,bool init) { +int numdescs;int err =0 ;if (init)
@@ -14,17 +373,60 @@ int pdsc_setup(struct pdsc *pdsc, bool init)if (err)return err; +/* Scale the descriptor ring length based on number of CPUs and VFs */ + numdescs =max_t (int,PDSC_ADMINQ_MIN_LENGTH ,num_online_cpus ()); + numdescs +=2 *pci_sriov_get_totalvfs (pdsc->pdev); + numdescs =roundup_pow_of_two (numdescs); + err =pdsc_qcq_alloc (pdsc,PDS_CORE_QTYPE_ADMINQ ,0 ,"adminq" , +PDS_CORE_QCQ_F_CORE |PDS_CORE_QCQ_F_INTR , + numdescs, +sizeof (union pds_core_adminq_cmd ), +sizeof (union pds_core_adminq_comp ), +0 , &pdsc->adminqcq); +if (err) + goto err_out_teardown; + + err =pdsc_qcq_alloc (pdsc,PDS_CORE_QTYPE_NOTIFYQ ,0 ,"notifyq" , +PDS_CORE_QCQ_F_NOTIFYQ , +PDSC_NOTIFYQ_LENGTH , +sizeof (struct pds_core_notifyq_cmd ), +sizeof (union pds_core_notifyq_comp ), +0 , &pdsc->notifyqcq); +if (err) + goto err_out_teardown; + +/* NotifyQ rides on the AdminQ interrupt */ + pdsc->notifyqcq.intx = pdsc->adminqcq.intx; + +/* Set up the Core with the AdminQ and NotifyQ info */ + err =pdsc_core_init (pdsc); +if (err) + goto err_out_teardown; +clear_bit (PDSC_S_FW_DEAD , &pdsc->state);return 0 ; + +err_out_teardown: +pdsc_teardown (pdsc, init); +return err; }void pdsc_teardown (struct pdsc *pdsc,bool removing) { +int i; +pdsc_devcmd_reset (pdsc); +pdsc_qcq_free (pdsc, &pdsc->notifyqcq); +pdsc_qcq_free (pdsc, &pdsc->adminqcq); -if (removing) { -kfree (pdsc->intr_info); - pdsc->intr_info =NULL ; +if (pdsc->intr_info) { +for (i =0 ; i < pdsc->nintrs; i++) +pdsc_intr_free (pdsc, i); + +if (removing) { +kfree (pdsc->intr_info); + pdsc->intr_info =NULL ; + } }if (pdsc->kern_dbpage) {
@@ -35,6 +437,36 @@ void pdsc_teardown(struct pdsc *pdsc, bool removing)set_bit (PDSC_S_FW_DEAD , &pdsc->state); } +int pdsc_start (struct pdsc *pdsc) +{ +pds_core_intr_mask (&pdsc->intr_ctrl[pdsc->adminqcq.intx], +PDS_CORE_INTR_MASK_CLEAR ); + +return 0 ; +} + +static void pdsc_mask_interrupts (struct pdsc *pdsc) +{ +int i; + +if (!pdsc->intr_info) +return ; + +/* Mask interrupts that are in use */ +for (i =0 ; i < pdsc->nintrs; i++) +if (pdsc->intr_info[i].vector) +pds_core_intr_mask (&pdsc->intr_ctrl[i], +PDS_CORE_INTR_MASK_SET ); +} + +void pdsc_stop (struct pdsc *pdsc) +{ +if (pdsc->wq) +flush_workqueue (pdsc->wq); + +pdsc_mask_interrupts (pdsc); +} +static void pdsc_fw_down (struct pdsc *pdsc) {mutex_lock (&pdsc->config_lock);
@@ -47,6 +479,7 @@ static void pdsc_fw_down(struct pdsc *pdsc)devlink_health_report (pdsc->fw_reporter,"FW down reported" , pdsc); +pdsc_mask_interrupts (pdsc);pdsc_teardown (pdsc,PDSC_TEARDOWN_RECOVERY );mutex_unlock (&pdsc->config_lock);
@@ -68,6 +501,10 @@ static void pdsc_fw_up(struct pdsc *pdsc)if (err) goto err_out; + err =pdsc_start (pdsc); +if (err) + goto err_out; +mutex_unlock (&pdsc->config_lock); pdsc->fw_recoveries++;
drivers/net/ethernet/amd/pds_core/core.h +150 -0
208 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/debugfs.c +106 -0
110 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/devlink.c +53 -0
60 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/main.c +15 -1
@@ -157,6 +157,13 @@ static int pdsc_map_bars(struct pdsc *pdsc)return err; } +void __iomem *pdsc_map_dbpage (struct pdsc *pdsc,int page_num) +{ +return pci_iomap_range (pdsc->pdev, + pdsc->bars[PDS_CORE_PCI_BAR_DBELL ].res_index, + (u64 )page_num <<PAGE_SHIFT ,PAGE_SIZE ); +} +static int pdsc_init_vf (struct pdsc *vf) {return -1 ;
@@ -190,6 +197,7 @@ static int pdsc_init_pf(struct pdsc *pdsc)mutex_init (&pdsc->devcmd_lock);mutex_init (&pdsc->config_lock); +spin_lock_init (&pdsc->adminq_lock);mutex_lock (&pdsc->config_lock);set_bit (PDSC_S_FW_DEAD , &pdsc->state);
@@ -197,10 +205,13 @@ static int pdsc_init_pf(struct pdsc *pdsc) err =pdsc_setup (pdsc,PDSC_SETUP_INIT );if (err) goto err_out_unmap_bars; + err =pdsc_start (pdsc); +if (err) + goto err_out_teardown; err =pdsc_dl_register (pdsc);if (err) - goto err_out_teardown; + goto err_out_stop;mutex_unlock (&pdsc->config_lock);
@@ -209,6 +220,8 @@ static int pdsc_init_pf(struct pdsc *pdsc)return 0 ; +err_out_stop: +pdsc_stop (pdsc); err_out_teardown:pdsc_teardown (pdsc,PDSC_TEARDOWN_REMOVING ); err_out_unmap_bars:
@@ -315,6 +328,7 @@ static void pdsc_remove(struct pci_dev *pdev)mutex_lock (&pdsc->config_lock);set_bit (PDSC_S_STOPPING_DRIVER , &pdsc->state); +pdsc_stop (pdsc);pdsc_teardown (pdsc,PDSC_TEARDOWN_REMOVING );mutex_unlock (&pdsc->config_lock);mutex_destroy (&pdsc->config_lock);
include/linux/pds/pds_adminq.h new file +637 -0
637 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v5 6/14 pds_core: Add adminq processing and commands
In reply to Shannon NelsonAdd the service routines for submitting and processing the adminq messages and for handling notifyq events.
--- drivers/net/ethernet/amd/pds_core/Makefile | 1 + drivers/net/ethernet/amd/pds_core/adminq.c | 282 +++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/core.c | 11 - drivers/net/ethernet/amd/pds_core/core.h | 5 + include/linux/pds/pds_adminq.h | 8 + 5 files changed, 296 insertions(+), 11 deletions(-) create mode 100644 drivers/net/ethernet/amd/pds_core/adminq.c
drivers/net/ethernet/amd/pds_core/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_PDS_CORE) := pds_core.o pds_core-y := main.o \ devlink.o \ dev.o \ + adminq.o \ core.o pds_core-$(CONFIG_DEBUG_FS) += debugfs.o
drivers/net/ethernet/amd/pds_core/adminq.c new file +282 -0
282 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/core.c +0 -11
@@ -5,17 +5,6 @@#include "core.h" -void pdsc_work_thread (struct work_struct *work) -{ -/* stub */ -} - -irqreturn_t pdsc_adminq_isr (int irq,void *data) -{ -/* stub */ -return IRQ_HANDLED ; -} -void pdsc_intr_free (struct pdsc *pdsc,int index) {struct pdsc_intr_info *intr_info;
drivers/net/ethernet/amd/pds_core/core.h +5 -0
@@ -261,6 +261,11 @@ int pdsc_devcmd_reset(struct pdsc *pdsc);int pdsc_dev_reinit (struct pdsc *pdsc);int pdsc_dev_init (struct pdsc *pdsc); +int pdsc_adminq_post (void *pdsc_void, +union pds_core_adminq_cmd *cmd, +union pds_core_adminq_comp *comp, +bool fast_poll); +int pdsc_intr_alloc (struct pdsc *pdsc,char *name,irq_handler_t handler,void *data);void pdsc_intr_free (struct pdsc *pdsc,int index);
include/linux/pds/pds_adminq.h +8 -0
@@ -4,6 +4,8 @@#ifndef _PDS_CORE_ADMINQ_H_#define _PDS_CORE_ADMINQ_H_ +#define PDSC_ADMINQ_MAX_POLL_INTERVAL 256 +enum pds_core_adminq_flags {PDS_AQ_FLAG_FASTPOLL =BIT (1 ),/* poll for completion at 1ms intervals */ };
@@ -634,4 +636,10 @@ static inline u8 pdsc_color_match(u8 color, u8 done_color) {return (!!(color &PDS_COMP_COLOR_MASK )) == done_color; } + +int pdsc_adminq_post (void *pdsc, +union pds_core_adminq_cmd *cmd, +union pds_core_adminq_comp *comp, +bool fast_poll); +#endif /* _PDS_CORE_ADMINQ_H_ */
Signature · 1 line
2.17.1
PATCH v5 7/14 pds_core: add FW update feature to devlink
In reply to Shannon NelsonAdd in the support for doing firmware updates. Of the two main banks available, a and b, this updates the one not in use and then selects it for the next boot.
--- drivers/net/ethernet/amd/pds_core/Makefile | 3 +- drivers/net/ethernet/amd/pds_core/core.h | 3 + drivers/net/ethernet/amd/pds_core/devlink.c | 10 ++ drivers/net/ethernet/amd/pds_core/fw.c | 187 ++++++++++++++++++++ 4 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/amd/pds_core/fw.c
drivers/net/ethernet/amd/pds_core/Makefile +2 -1
@@ -7,6 +7,7 @@ pds_core-y := main.o \ devlink.o \ dev.o \ adminq.o \ - core.o + core.o \ + fw.o pds_core-$(CONFIG_DEBUG_FS) += debugfs.o
drivers/net/ethernet/amd/pds_core/core.h +3 -0
@@ -284,4 +284,7 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq);void pdsc_work_thread (struct work_struct *work);irqreturn_t pdsc_adminq_isr (int irq,void *data); +int pdsc_firmware_update (struct pdsc *pdsc,const struct firmware *fw, +struct netlink_ext_ack *extack); +#endif /* _PDSC_H_ */
drivers/net/ethernet/amd/pds_core/devlink.c +10 -0
@@ -8,6 +8,15 @@#include "core.h" +static int pdsc_dl_flash_update (struct devlink *dl, +struct devlink_flash_update_params *params, +struct netlink_ext_ack *extack) +{ +struct pdsc *pdsc =devlink_priv (dl); + +return pdsc_firmware_update (pdsc, params->fw, extack); +} +static int pdsc_dl_info_get (struct devlink *dl,struct devlink_info_req *req,struct netlink_ext_ack *extack) {
@@ -62,6 +71,7 @@ static int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req,static const struct devlink_ops pdsc_dl_ops = { .info_get = pdsc_dl_info_get, + .flash_update = pdsc_dl_flash_update, };static const struct devlink_ops pdsc_dl_vf_ops = {
drivers/net/ethernet/amd/pds_core/fw.c new file +187 -0
187 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v5 8/14 pds_core: set up the VIF definitions and defaults
In reply to Shannon NelsonThe Virtual Interfaces (VIFs) supported by the DSC's configuration (VFio Live Migration, vDPA, etc) are reported in the dev_ident struct.
--- drivers/net/ethernet/amd/pds_core/core.c | 47 +++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/core.h | 13 ++++++ drivers/net/ethernet/amd/pds_core/debugfs.c | 23 ++++++++++ include/linux/pds/pds_common.h | 19 +++++++++ 4 files changed, 102 insertions(+)
drivers/net/ethernet/amd/pds_core/core.c +47 -0
@@ -350,6 +350,42 @@ static int pdsc_core_init(struct pdsc *pdsc)return err; } +static struct pdsc_viftype pdsc_viftype_defaults[] = { + [PDS_DEV_TYPE_VDPA ] = { .name =PDS_DEV_TYPE_VDPA_STR , + .vif_id =PDS_DEV_TYPE_VDPA , + .dl_id =DEVLINK_PARAM_GENERIC_ID_ENABLE_VNET }, + [PDS_DEV_TYPE_MAX ] = {0 } +}; + +static int pdsc_viftypes_init (struct pdsc *pdsc) +{ +enum pds_core_vif_types vt; + + pdsc->viftype_status =kzalloc (sizeof (pdsc_viftype_defaults),GFP_KERNEL ); +if (!pdsc->viftype_status) +return -ENOMEM ; + +for (vt =0 ; vt <PDS_DEV_TYPE_MAX ; vt++) { +bool vt_support; + +if (!pdsc_viftype_defaults[vt].name) +continue ; + +/* Grab the defaults */ + pdsc->viftype_status[vt] = pdsc_viftype_defaults[vt]; + +/* See what the Core device has for support */ + vt_support = !!le16_to_cpu (pdsc->dev_ident.vif_types[vt]); +dev_dbg (pdsc->dev,"VIF %s is %ssupported\n" , + pdsc->viftype_status[vt].name, + vt_support ?"" :"not " ); + + pdsc->viftype_status[vt].supported = vt_support; + } + +return 0 ; +} +int pdsc_setup (struct pdsc *pdsc,bool init) {int numdescs;
@@ -392,6 +428,14 @@ int pdsc_setup(struct pdsc *pdsc, bool init)if (err) goto err_out_teardown; +/* Set up the VIFs */ + err =pdsc_viftypes_init (pdsc); +if (err) + goto err_out_teardown; + +if (init) +pdsc_debugfs_add_viftype (pdsc); +clear_bit (PDSC_S_FW_DEAD , &pdsc->state);return 0 ;
@@ -408,6 +452,9 @@ void pdsc_teardown(struct pdsc *pdsc, bool removing)pdsc_qcq_free (pdsc, &pdsc->notifyqcq);pdsc_qcq_free (pdsc, &pdsc->adminqcq); +kfree (pdsc->viftype_status); + pdsc->viftype_status =NULL ; +if (pdsc->intr_info) {for (i =0 ; i < pdsc->nintrs; i++)pdsc_intr_free (pdsc, i);
drivers/net/ethernet/amd/pds_core/core.h +13 -0
@@ -123,6 +123,15 @@ struct pdsc_qcq {struct dentry *dentry; }; +struct pdsc_viftype { +char *name; +bool supported; +bool enabled; +int dl_id; +int vif_id; +struct pds_auxiliary_dev *padev; +}; +/* No state flags set means we are in a steady running state */ enum pdsc_state_flags {PDSC_S_FW_DEAD ,/* fw stopped, waiting for startup or recovery */
@@ -174,6 +183,7 @@ struct pdsc {struct pdsc_qcq adminqcq;struct pdsc_qcq notifyqcq;u64 last_eid; +struct pdsc_viftype *viftype_status; };/** enum pds_core_dbell_bits - bitwise composition of dbell values.
@@ -228,6 +238,7 @@ struct pdsc *pdsc_dl_alloc(struct device *dev, bool is_pf);void pdsc_dl_free (struct pdsc *pdsc);int pdsc_dl_register (struct pdsc *pdsc);void pdsc_dl_unregister (struct pdsc *pdsc); +int pdsc_dl_vif_add (struct pdsc *pdsc,enum pds_core_vif_types vt,const char *name);#ifdef CONFIG_DEBUG_FS void pdsc_debugfs_create (void );
@@ -235,6 +246,7 @@ void pdsc_debugfs_destroy(void);void pdsc_debugfs_add_dev (struct pdsc *pdsc);void pdsc_debugfs_del_dev (struct pdsc *pdsc);void pdsc_debugfs_add_ident (struct pdsc *pdsc); +void pdsc_debugfs_add_viftype (struct pdsc *pdsc);void pdsc_debugfs_add_irqs (struct pdsc *pdsc);void pdsc_debugfs_add_qcq (struct pdsc *pdsc,struct pdsc_qcq *qcq);void pdsc_debugfs_del_qcq (struct pdsc_qcq *qcq);
@@ -244,6 +256,7 @@ static inline void pdsc_debugfs_destroy(void) { }static inline void pdsc_debugfs_add_dev (struct pdsc *pdsc) { }static inline void pdsc_debugfs_del_dev (struct pdsc *pdsc) { }static inline void pdsc_debugfs_add_ident (struct pdsc *pdsc) { } +static inline void pdsc_debugfs_add_viftype (struct pdsc *pdsc) { }static inline void pdsc_debugfs_add_irqs (struct pdsc *pdsc) { }static inline void pdsc_debugfs_add_qcq (struct pdsc *pdsc,struct pdsc_qcq *qcq) { }static inline void pdsc_debugfs_del_qcq (struct pdsc_qcq *qcq) { }
drivers/net/ethernet/amd/pds_core/debugfs.c +23 -0
@@ -76,6 +76,29 @@ void pdsc_debugfs_add_ident(struct pdsc *pdsc)debugfs_create_file ("identity" ,0400 , pdsc->dentry, pdsc, &identity_fops); } +static int viftype_show (struct seq_file *seq,void *v) +{ +struct pdsc *pdsc = seq->private; +int vt; + +for (vt =0 ; vt <PDS_DEV_TYPE_MAX ; vt++) { +if (!pdsc->viftype_status[vt].name) +continue ; + +seq_printf (seq,"%s\t%d supported %d enabled\n" , + pdsc->viftype_status[vt].name, + pdsc->viftype_status[vt].supported, + pdsc->viftype_status[vt].enabled); + } +return 0 ; +} +DEFINE_SHOW_ATTRIBUTE (viftype); + +void pdsc_debugfs_add_viftype (struct pdsc *pdsc) +{ +debugfs_create_file ("viftypes" ,0400 , pdsc->dentry, pdsc, &viftype_fops); +} +static int irqs_show (struct seq_file *seq,void *v) {struct pdsc *pdsc = seq->private;
include/linux/pds/pds_common.h +19 -0
@@ -51,6 +51,25 @@ enum pds_core_driver_type { PDS_DRIVER_ESXI = 6, }; +enum pds_core_vif_types { +PDS_DEV_TYPE_CORE =0 , +PDS_DEV_TYPE_VDPA =1 , +PDS_DEV_TYPE_VFIO =2 , +PDS_DEV_TYPE_ETH =3 , +PDS_DEV_TYPE_RDMA =4 , +PDS_DEV_TYPE_LM =5 , + +/* new ones added before this line */ +PDS_DEV_TYPE_MAX =16 /* don't change - used in struct size */ +}; + +#define PDS_DEV_TYPE_CORE_STR "Core" +#define PDS_DEV_TYPE_VDPA_STR "vDPA" +#define PDS_DEV_TYPE_VFIO_STR "VFio" +#define PDS_DEV_TYPE_ETH_STR "Eth" +#define PDS_DEV_TYPE_RDMA_STR "RDMA" +#define PDS_DEV_TYPE_LM_STR "LM" +#define PDS_CORE_IFNAMSIZ 16/**
Signature · 1 line
2.17.1
PATCH v5 9/14 pds_core: add initial VF device handling
In reply to Shannon NelsonThis is the initial VF PCI driver framework for the new pds_vdpa VF device, which will work in conjunction with an auxiliary_bus client of the pds_core driver. This does the very basics of registering for the new VF device, setting up debugfs entries, and registering with devlink.
--- drivers/net/ethernet/amd/pds_core/core.h | 10 +++++- drivers/net/ethernet/amd/pds_core/main.c | 45 +++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-)
drivers/net/ethernet/amd/pds_core/core.h +9 -1
@@ -30,6 +30,12 @@ struct pdsc_dev_bar {int res_index; }; +struct pdsc_vf { +struct pds_auxiliary_dev *padev; +u16 index; +__le16 vif_types[PDS_DEV_TYPE_MAX ]; +}; +struct pdsc_devinfo {u8 asic_type;u8 asic_rev;
@@ -147,6 +153,9 @@ struct pdsc {struct dentry *dentry;struct device *dev;struct pdsc_dev_bar bars[PDS_CORE_BARS_MAX ]; +struct pdsc_vf *vfs; +int num_vfs; +int vf_id;int hw_index;int id;
@@ -299,5 +308,4 @@ irqreturn_t pdsc_adminq_isr(int irq, void *data);int pdsc_firmware_update (struct pdsc *pdsc,const struct firmware *fw,struct netlink_ext_ack *extack); -#endif /* _PDSC_H_ */
drivers/net/ethernet/amd/pds_core/main.c +44 -1
71 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v5 10/14 pds_core: add auxiliary_bus devices
In reply to Shannon NelsonAn auxiliary_bus device is created for each VF at VF probe and destroyed at VF remove. The VFs are always removed on PF remove, so there should be no issues with VFs trying to access missing PF structures.
--- drivers/net/ethernet/amd/pds_core/Makefile | 1 + drivers/net/ethernet/amd/pds_core/auxbus.c | 137 +++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/core.h | 7 ++ drivers/net/ethernet/amd/pds_core/main.c | 37 +++++- include/linux/pds/pds_auxbus.h | 16 +++ include/linux/pds/pds_common.h | 1 + 6 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 drivers/net/ethernet/amd/pds_core/auxbus.c create mode 100644 include/linux/pds/pds_auxbus.h
drivers/net/ethernet/amd/pds_core/Makefile +1 -0
@@ -5,6 +5,7 @@ obj-$(CONFIG_PDS_CORE) := pds_core.o pds_core-y := main.o \ devlink.o \ + auxbus.o \ dev.o \ adminq.o \ core.o \
drivers/net/ethernet/amd/pds_core/auxbus.c new file +137 -0
137 lines not on this page · raw message
drivers/net/ethernet/amd/pds_core/core.h +7 -0
@@ -30,8 +30,11 @@ struct pdsc_dev_bar {int res_index; }; +struct pdsc ; +struct pdsc_vf {struct pds_auxiliary_dev *padev; +struct pdsc *vf;u16 index;__le16 vif_types[PDS_DEV_TYPE_MAX ]; };
@@ -240,6 +243,7 @@ static inline void pds_core_dbell_ring(u64 __iomem *db_page,writeq (val, &db_page[qtype]); } +void *pdsc_get_pf_struct (struct pci_dev *vf_pdev);void pdsc_queue_health_check (struct pdsc *pdsc);void __iomem *pdsc_map_dbpage (struct pdsc *pdsc,int page_num);
@@ -302,6 +306,9 @@ int pdsc_start(struct pdsc *pdsc);void pdsc_stop (struct pdsc *pdsc);void pdsc_health_thread (struct work_struct *work); +int pdsc_auxbus_dev_add_vf (struct pdsc *vf,struct pdsc *pf); +int pdsc_auxbus_dev_del_vf (struct pdsc *vf,struct pdsc *pf); +void pdsc_process_adminq (struct pdsc_qcq *qcq);void pdsc_work_thread (struct work_struct *work);irqreturn_t pdsc_adminq_isr (int irq,void *data);
drivers/net/ethernet/amd/pds_core/main.c +35 -2
@@ -198,15 +198,36 @@ static int pdsc_sriov_configure(struct pci_dev *pdev, int num_vfs)static int pdsc_init_vf (struct pdsc *vf) { +struct pdsc *pf;int err; + pf =pdsc_get_pf_struct (vf->pdev); +if (IS_ERR_OR_NULL (pf)) +return PTR_ERR (pf) ?:-1 ; + vf->vf_id =pci_iov_vf_id (vf->pdev); err =pdsc_dl_register (vf);if (err)return err; -return 0 ; + pf->vfs[vf->vf_id].vf = vf; + err =pdsc_auxbus_dev_add_vf (vf, pf); +if (err) +pdsc_dl_unregister (vf); + +return err; +} + +static void pdsc_del_vf (struct pdsc *vf) +{ +struct pdsc *pf; + + pf =pdsc_get_pf_struct (vf->pdev); +if (IS_ERR (pf)) +return ; +pdsc_auxbus_dev_del_vf (vf, pf); + pf->vfs[vf->vf_id].vf =NULL ; }#define PDSC_WQ_NAME_LEN 24
@@ -357,7 +378,13 @@ static void pdsc_remove(struct pci_dev *pdev)*/ pdsc_dl_unregister (pdsc); -if (!pdev->is_virtfn) { +if (pdev->is_virtfn) { +pdsc_del_vf (pdsc); + }else { +/* Remove the VFs and their aux_bus connections before other +* cleanup so that the clients can use the AdminQ to cleanly +* shut themselves down. +*/ pdsc_sriov_configure (pdev,0 );del_timer_sync (&pdsc->wdtimer);
@@ -397,6 +424,12 @@ static struct pci_driver pdsc_driver = { .sriov_configure = pdsc_sriov_configure, }; +void *pdsc_get_pf_struct (struct pci_dev *vf_pdev) +{ +return pci_iov_get_pf_drvdata (vf_pdev, &pdsc_driver); +} +EXPORT_SYMBOL_GPL (pdsc_get_pf_struct); +static int __init pdsc_init_module (void ) {pdsc_debugfs_create ();
include/linux/pds/pds_auxbus.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright(c) 2023 Advanced Micro Devices, Inc */ + +#ifndef _PDSC_AUXBUS_H_ +#define _PDSC_AUXBUS_H_ + +#include <linux/auxiliary_bus.h> + +struct pds_auxiliary_dev { +struct auxiliary_device aux_dev; +struct pci_dev *vf_pdev; +struct pci_dev *pf_pdev; +u16 client_id; +void *priv; +}; +#endif /* _PDSC_AUXBUS_H_ */
include/linux/pds/pds_common.h +1 -0
@@ -91,4 +91,5 @@ enum pds_core_logical_qtype {PDS_CORE_QTYPE_MAX =16 /* don't change - used in struct size */ }; +void *pdsc_get_pf_struct (struct pci_dev *vf_pdev);#endif /* _PDS_COMMON_H_ */
Signature · 1 line
2.17.1
PATCH v5 11/14 pds_core: devlink params for enabling VIF support
In reply to Shannon NelsonAdd the devlink parameter switches so the user can enable the features supported by the VFs.
--- drivers/net/ethernet/amd/pds_core/devlink.c | 89 ++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-)
drivers/net/ethernet/amd/pds_core/devlink.c +88 -1
@@ -7,6 +7,86 @@#include <linux/pci.h> #include "core.h" +#include <linux/pds/pds_auxbus.h> + +static struct pdsc_viftype *pdsc_dl_find_viftype_by_id (struct pdsc *pdsc, +enum devlink_param_type dl_id) +{ +int vt; + +for (vt =0 ; vt <PDS_DEV_TYPE_MAX ; vt++) { +if (pdsc->viftype_status[vt].dl_id == dl_id) +return &pdsc->viftype_status[vt]; + } + +return NULL ; +} + +static int pdsc_dl_enable_get (struct devlink *dl,u32 id, +struct devlink_param_gset_ctx *ctx) +{ +struct pdsc *pdsc =devlink_priv (dl); +struct pdsc_viftype *vt_entry; + + vt_entry =pdsc_dl_find_viftype_by_id (pdsc, id); +if (!vt_entry) +return -ENOENT ; + + ctx->val.vbool = vt_entry->enabled; + +return 0 ; +} + +static int pdsc_dl_enable_set (struct devlink *dl,u32 id, +struct devlink_param_gset_ctx *ctx) +{ +struct pdsc *pdsc =devlink_priv (dl); +struct pdsc_viftype *vt_entry; +int err =0 ; +int vf_id; + + vt_entry =pdsc_dl_find_viftype_by_id (pdsc, id); +if (!vt_entry || !vt_entry->supported) +return -EOPNOTSUPP ; + +if (vt_entry->enabled == ctx->val.vbool) +return 0 ; + + vt_entry->enabled = ctx->val.vbool; +for (vf_id =0 ; vf_id < pdsc->num_vfs; vf_id++) { +struct pdsc *vf = pdsc->vfs[vf_id].vf; + + err = ctx->val.vbool ?pdsc_auxbus_dev_add_vf (vf, pdsc) : +pdsc_auxbus_dev_del_vf (vf, pdsc); + } + +return err; +} + +static int pdsc_dl_enable_validate (struct devlink *dl,u32 id, +union devlink_param_value val, +struct netlink_ext_ack *extack) +{ +struct pdsc *pdsc =devlink_priv (dl); +struct pdsc_viftype *vt_entry; + + vt_entry =pdsc_dl_find_viftype_by_id (pdsc, id); +if (!vt_entry || !vt_entry->supported) +return -EOPNOTSUPP ; + +if (!pdsc->viftype_status[vt_entry->vif_id].supported) +return -ENODEV ; + +return 0 ; +} + +static const struct devlink_param pdsc_dl_params[] = { +DEVLINK_PARAM_GENERIC (ENABLE_VNET , +BIT (DEVLINK_PARAM_CMODE_RUNTIME ), + pdsc_dl_enable_get, + pdsc_dl_enable_set, + pdsc_dl_enable_validate), +}; static int pdsc_dl_flash_update(struct devlink *dl, struct devlink_flash_update_params *params,
@@ -157,9 +237,16 @@ void pdsc_dl_free(struct pdsc *pdsc)int pdsc_dl_register (struct pdsc *pdsc) {struct devlink *dl =priv_to_devlink (pdsc); +int err; + +if (!pdsc->pdev->is_virtfn) { + err =devlink_params_register (dl, pdsc_dl_params, +ARRAY_SIZE (pdsc_dl_params)); +if (err) +return err; -if (!pdsc->pdev->is_virtfn)pdsc_dl_reporters_create (pdsc); + }devlink_register (dl);
Signature · 1 line
2.17.1
PATCH v5 12/14 pds_core: add the aux client API
In reply to Shannon NelsonAdd the client API operations for running adminq commands. The core registers the client with the FW, then the client has a context for requesting adminq services. We expect to add additional operations for other clients, including requesting additional private adminqs and IRQs, but don't have the need yet,
--- drivers/net/ethernet/amd/pds_core/auxbus.c | 133 ++++++++++++++++++++- include/linux/pds/pds_auxbus.h | 28 +++++ 2 files changed, 159 insertions(+), 2 deletions(-)
drivers/net/ethernet/amd/pds_core/auxbus.c +131 -2
@@ -6,6 +6,112 @@#include "core.h" #include <linux/pds/pds_auxbus.h> +static int pds_client_register (struct pdsc *vf,struct pdsc *pf,char *name) +{ +union pds_core_adminq_comp comp = {0 }; +union pds_core_adminq_cmd cmd = {0 }; +int err; +u16 ci; + +if (pf->state) +return -ENXIO ; + + cmd.client_reg.opcode =PDS_AQ_CMD_CLIENT_REG ; +snprintf (cmd.client_reg.devname,sizeof (cmd.client_reg.devname), +"%s.%s.%d" ,PDS_CORE_DRV_NAME , name, vf->id); + + err =pdsc_adminq_post (pf, &cmd, &comp, false); +if (err) { +dev_info (pf->dev,"register dev_name %s with DSC failed, status %d: %pe\n" , + name, comp.status,ERR_PTR (err)); +return err; + } + + ci =le16_to_cpu (comp.client_reg.client_id); +if (!ci) { +dev_err (pf->dev,"%s: device returned null client_id\n" , __func__); +return -EIO ; + } + +dev_dbg (pf->dev,"%s: device returned client_id %d for %s\n" , + __func__, ci, cmd.client_reg.devname); + +return ci; +} + +static int pds_client_unregister (struct pdsc *pf,u16 client_id) +{ +union pds_core_adminq_comp comp = {0 }; +union pds_core_adminq_cmd cmd = {0 }; +int err; + +if (pf->state) +return -ENXIO ; + + cmd.client_unreg.opcode =PDS_AQ_CMD_CLIENT_UNREG ; + cmd.client_unreg.client_id =cpu_to_le16 (client_id); + + err =pdsc_adminq_post (pf, &cmd, &comp, false); +if (err) +dev_info (pf->dev,"unregister client_id %d failed, status %d: %pe\n" , + client_id, comp.status,ERR_PTR (err)); + +return err; +} + +/** +* pds_client_adminq_cmd - Process an adminq request for the client +* @padev: ptr to the client device +* @req: ptr to buffer with request +* @req_len: length of actual struct used for request +* @resp: ptr to buffer where answer is to be copied +* @flags: optional flags from pds_core_adminq_flags +* +* Return: 0 on success, or +* negative for error +* +* Client sends pointers to request and response buffers +* Core copies request data into pds_core_client_request_cmd +* Core sets other fields as needed +* Core posts to AdminQ +* Core copies completion data into response buffer +*/ +static int pds_client_adminq_cmd (struct pds_auxiliary_dev *padev, +union pds_core_adminq_cmd *req, +size_t req_len, +union pds_core_adminq_comp *resp, +u64 flags) +{ +union pds_core_adminq_cmd cmd = {0 }; +struct pdsc *pf; +size_t cp_len; +int err; + + pf =pci_get_drvdata (padev->pf_pdev); + +dev_dbg (pf->dev,"%s: %s opcode %d\n" , + __func__,dev_name (&padev->aux_dev.dev), req->opcode); + +if (pf->state) +return -ENXIO ; + +/* Wrap the client's request */ + cmd.client_request.opcode =PDS_AQ_CMD_CLIENT_CMD ; + cmd.client_request.client_id =cpu_to_le16 (padev->client_id); + cp_len =min_t (size_t, req_len,sizeof (cmd.client_request.client_cmd)); +memcpy (cmd.client_request.client_cmd, req, cp_len); + + err =pdsc_adminq_post (pf, &cmd, resp, !!(flags &PDS_AQ_FLAG_FASTPOLL )); +if (err && err != -EAGAIN ) +dev_info (pf->dev,"client admin cmd failed: %pe\n" ,ERR_PTR (err)); + +return err; +} + +static struct pds_core_ops pds_core_ops = { + .adminq_cmd = pds_client_adminq_cmd, +}; +static void pdsc_auxbus_dev_release (struct device *dev) { struct pds_auxiliary_dev *padev =
@@ -16,7 +122,9 @@ static void pdsc_auxbus_dev_release(struct device *dev)static struct pds_auxiliary_dev *pdsc_auxbus_dev_register (struct pdsc *vf,struct pdsc *pf, -char *name) +u16 client_id, +char *name, +struct pds_core_ops *ops) {struct auxiliary_device *aux_dev;struct pds_auxiliary_dev *padev;
@@ -28,6 +136,8 @@ static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *vf, padev->vf_pdev = vf->pdev; padev->pf_pdev = pf->pdev; + padev->ops = ops; + padev->client_id = client_id; aux_dev = &padev->aux_dev; aux_dev->name = name;
@@ -77,6 +187,8 @@ int pdsc_auxbus_dev_del_vf(struct pdsc *vf, struct pdsc *pf) padev = pf->vfs[vf->vf_id].padev;if (padev) { +pds_client_unregister (pf, padev->client_id); + padev->client_id =0 ;auxiliary_device_delete (&padev->aux_dev);auxiliary_device_uninit (&padev->aux_dev); }
@@ -91,6 +203,7 @@ int pdsc_auxbus_dev_add_vf(struct pdsc *vf, struct pdsc *pf) {struct pds_auxiliary_dev *padev;enum pds_core_vif_types vt; +int client_id;int err =0 ;mutex_lock (&pf->config_lock);
@@ -124,7 +237,23 @@ int pdsc_auxbus_dev_add_vf(struct pdsc *vf, struct pdsc *pf) pf->viftype_status[vt].enabled))continue ; - padev =pdsc_auxbus_dev_register (vf, pf, pf->viftype_status[vt].name); +/* need to register with FW and get the client_id before +* creating the aux device so that the aux client can run +* adminq commands as part its probe +*/ + client_id =pds_client_register (vf, pf, pf->viftype_status[vt].name); +if (client_id <0 ) { + err = client_id; + goto out_unlock; + } + + padev =pdsc_auxbus_dev_register (vf, pf, client_id, + pf->viftype_status[vt].name, + &pds_core_ops); +if (!padev) { +pds_client_unregister (pf, client_id); + goto out_unlock; + } pf->vfs[vf->vf_id].padev = padev;/* We only support a single type per VF, so jump out here */
include/linux/pds/pds_auxbus.h +28 -0
@@ -10,7 +10,35 @@ struct pds_auxiliary_dev {struct auxiliary_device aux_dev;struct pci_dev *vf_pdev;struct pci_dev *pf_pdev; +struct pds_core_ops *ops;u16 client_id; void *priv; }; + +/* +* ptrs to functions to be used by the client for core services +*/ +struct pds_core_ops { +/* .adminq_cmd() - process an adminq request for the client +* padev: ptr to the client device +* req: ptr to buffer with request +* req_len: length of actual struct used for request +* resp: ptr to buffer where answer is to be copied +* flags: optional flags defined by enum pds_core_adminq_flags +* and used for more flexible adminq behvior +* +* returns 0 on success, or +* negative for error +* Client sends pointers to request and response buffers +* Core copies request data into pds_core_client_request_cmd +* Core sets other fields as needed +* Core posts to AdminQ +* Core copies completion data into response buffer +*/ +int (*adminq_cmd)(struct pds_auxiliary_dev *padev, +union pds_core_adminq_cmd *req, +size_t req_len, +union pds_core_adminq_comp *resp, +u64 flags); +};#endif /* _PDSC_AUXBUS_H_ */
Signature · 1 line
2.17.1
PATCH v5 13/14 pds_core: publish events to the clients
In reply to Shannon NelsonWhen the Core device gets an event from the device, or notices the device FW to be up or down, it needs to send those events on to the clients that have an event handler. Add the code to pass along the events to the clients.
--- drivers/net/ethernet/amd/pds_core/adminq.c | 2 ++ drivers/net/ethernet/amd/pds_core/core.c | 32 ++++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/core.h | 3 ++ include/linux/pds/pds_common.h | 2 ++ 4 files changed, 39 insertions(+)
drivers/net/ethernet/amd/pds_core/adminq.c +2 -0
@@ -27,11 +27,13 @@ static int pdsc_process_notifyq(struct pdsc_qcq *qcq)case PDS_EVENT_LINK_CHANGE :dev_info (pdsc->dev,"NotifyQ LINK_CHANGE ecode %d eid %lld\n" , ecode, eid); +pdsc_notify (PDS_EVENT_LINK_CHANGE , comp);break ;case PDS_EVENT_RESET :dev_info (pdsc->dev,"NotifyQ RESET ecode %d eid %lld\n" , ecode, eid); +pdsc_notify (PDS_EVENT_RESET , comp);break ;case PDS_EVENT_XCVR :
drivers/net/ethernet/amd/pds_core/core.c +32 -0
@@ -5,6 +5,25 @@#include "core.h" +static BLOCKING_NOTIFIER_HEAD (pds_notify_chain); + +int pdsc_register_notify (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&pds_notify_chain, nb); +} +EXPORT_SYMBOL_GPL (pdsc_register_notify); + +void pdsc_unregister_notify (struct notifier_block *nb) +{ +blocking_notifier_chain_unregister (&pds_notify_chain, nb); +} +EXPORT_SYMBOL_GPL (pdsc_unregister_notify); + +void pdsc_notify (unsigned long event,void *data) +{ +blocking_notifier_call_chain (&pds_notify_chain, event, data); +} +void pdsc_intr_free (struct pdsc *pdsc,int index) {struct pdsc_intr_info *intr_info;
@@ -505,6 +524,11 @@ void pdsc_stop(struct pdsc *pdsc)static void pdsc_fw_down (struct pdsc *pdsc) { +union pds_core_notifyq_comp reset_event = { + .reset.ecode =cpu_to_le16 (PDS_EVENT_RESET ), + .reset.state =0 , + }; +mutex_lock (&pdsc->config_lock);if (test_and_set_bit (PDSC_S_FW_DEAD , &pdsc->state)) {
@@ -513,7 +537,9 @@ static void pdsc_fw_down(struct pdsc *pdsc)return ; } +/* Notify clients of fw_down */ devlink_health_report (pdsc->fw_reporter,"FW down reported" , pdsc); +pdsc_notify (PDS_EVENT_RESET , &reset_event);pdsc_mask_interrupts (pdsc);pdsc_teardown (pdsc,PDSC_TEARDOWN_RECOVERY );
@@ -523,6 +549,10 @@ static void pdsc_fw_down(struct pdsc *pdsc)static void pdsc_fw_up (struct pdsc *pdsc) { +union pds_core_notifyq_comp reset_event = { + .reset.ecode =cpu_to_le16 (PDS_EVENT_RESET ), + .reset.state =1 , + };int err;mutex_lock (&pdsc->config_lock);
@@ -543,9 +573,11 @@ static void pdsc_fw_up(struct pdsc *pdsc)mutex_unlock (&pdsc->config_lock); +/* Notify clients of fw_up */ pdsc->fw_recoveries++;devlink_health_reporter_state_update (pdsc->fw_reporter,DEVLINK_HEALTH_REPORTER_STATE_HEALTHY ); +pdsc_notify (PDS_EVENT_RESET , &reset_event);return ;
drivers/net/ethernet/amd/pds_core/core.h +3 -0
@@ -306,6 +306,9 @@ int pdsc_start(struct pdsc *pdsc);void pdsc_stop (struct pdsc *pdsc);void pdsc_health_thread (struct work_struct *work); +int pdsc_register_notify (struct notifier_block *nb); +void pdsc_unregister_notify (struct notifier_block *nb); +void pdsc_notify (unsigned long event,void *data);int pdsc_auxbus_dev_add_vf (struct pdsc *vf,struct pdsc *pf);int pdsc_auxbus_dev_del_vf (struct pdsc *vf,struct pdsc *pf);
include/linux/pds/pds_common.h +2 -0
@@ -91,5 +91,7 @@ enum pds_core_logical_qtype {PDS_CORE_QTYPE_MAX =16 /* don't change - used in struct size */ }; +int pdsc_register_notify (struct notifier_block *nb); +void pdsc_unregister_notify (struct notifier_block *nb);void *pdsc_get_pf_struct (struct pci_dev *vf_pdev);#endif /* _PDS_COMMON_H_ */
Signature · 1 line
2.17.1
PATCH v5 14/14 pds_core: Kconfig and pds_core.rst
In reply to Shannon NelsonDocumentation and Kconfig hook for building the driver.
--- .../device_drivers/ethernet/amd/pds_core.rst | 143 ++++++++++++++++++ .../device_drivers/ethernet/index.rst | 1 + MAINTAINERS | 9 ++ drivers/net/ethernet/amd/Kconfig | 12 ++ drivers/net/ethernet/amd/Makefile | 1 + 5 files changed, 166 insertions(+) create mode 100644 Documentation/networking/device_drivers/ethernet/amd/pds_core.rst
Documentation/networking/device_drivers/ethernet/amd/pds_core.rst new file +143 -0
@@ -0,0 +1,143 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +======================================================== +Linux Driver for the AMD/Pensando(R) DSC adapter family +======================================================== + +Copyright(c) 2023 Advanced Micro Devices, Inc + +Identifying the Adapter +======================= + +To find if one or more AMD/Pensando PCI Core devices are installed on the +host, check for the PCI devices:: + + # lspci -d 1dd8:100c + b5:00.0 Processing accelerators: Pensando Systems Device 100c + b6:00.0 Processing accelerators: Pensando Systems Device 100c + +If such devices are listed as above, then the pds_core.ko driver should find +and configure them for use. There should be log entries in the kernel +messages such as these:: + + $ dmesg | grep pds_core + pds_core 0000:b5:00.0: 252.048 Gb/s available PCIe bandwidth (16.0 GT/s PCIe x16 link) + pds_core 0000:b5:00.0: FW: 1.60.0-73 + pds_core 0000:b6:00.0: 252.048 Gb/s available PCIe bandwidth (16.0 GT/s PCIe x16 link) + pds_core 0000:b6:00.0: FW: 1.60.0-73 + +Driver and firmware version information can be gathered with devlink:: + + $ devlink dev info pci/0000:b5:00.0 + pci/0000:b5:00.0: + driver pds_core + serial_number FLM18420073 + versions: + fixed: + asic.id 0x0 + asic.rev 0x0 + running: + fw 1.51.0-73 + stored: + fw.goldfw 1.15.9-C-22 + fw.mainfwa 1.60.0-73 + fw.mainfwb 1.60.0-57 + + +Info versions +============= + +The ``pds_core`` driver reports the following versions + +.. list-table:: devlink info versions implemented + :widths: 5 5 90 + + * - Name + - Type + - Description + * - ``fw`` + - running + - Version of firmware running on the device + * - ``fw.goldfw`` + - stored + - Version of firmware stored in the goldfw slot + * - ``fw.mainfwa`` + - stored + - Version of firmware stored in the mainfwa slot + * - ``fw.mainfwb`` + - stored + - Version of firmware stored in the mainfwb slot + * - ``asic.id`` + - fixed + - The ASIC type for this device + * - ``asic.rev`` + - fixed + - The revision of the ASIC for this device + + +Parameters +========== + +The ``pds_core`` driver implements the following generic +parameters for controlling the functionality to be made available +as auxiliary_bus devices. + +.. list-table:: Generic parameters implemented + :widths: 5 5 8 82 + + * - Name + - Mode + - Type + - Description + * - ``enable_vnet`` + - runtime + - Boolean + - Enables vDPA functionality through an auxiliary_bus device + + +Firmware Management +=================== + +The ``flash`` command can update a the DSC firmware. The downloaded firmware +will be saved into either of firmware bank 1 or bank 2, whichever is not +currrently in use, and that bank will be then selected for the next boot. + +Health Reporters +================ + +The driver supports a devlink health reporter for FW status:: + + # devlink health show pci/0000:2b:00.0 reporter fw + pci/0000:2b:00.0: + reporter fw + state healthy error 0 recover 0 + + +Enabling the driver +=================== + +The driver is enabled via the standard kernel configuration system, +using the make command:: + + make oldconfig/menuconfig/etc. + +The driver is located in the menu structure at: + + -> Device Drivers + -> Network device support (NETDEVICES [=y]) + -> Ethernet driver support + -> AMD devices + -> AMD/Pensando Ethernet PDS_CORE Support + +Support +======= + +For general Linux networking support, please use the netdev mailing +list, which is monitored by AMD/Pensando personnel:: + + [email protected] + +For more specific support needs, please use the AMD/Pensando driver support +email:: + + [email protected]
Documentation/networking/device_drivers/ethernet/index.rst +1 -0
@@ -13,6 +13,7 @@ Contents: 3com/3c509 3com/vortex amazon/ena + amd/pds_core altera/altera_tse aquantia/atlantic chelsio/cxgb
MAINTAINERS +9 -0
@@ -1041,6 +1041,15 @@ F: drivers/gpu/drm/amd/include/vi_structs.h F: include/uapi/linux/kfd_ioctl.h F: include/uapi/linux/kfd_sysfs.h +AMD PDS CORE DRIVER +M: Shannon Nelson <[email protected]> +M: Brett Creeley <[email protected]> +M: [email protected] +L: [email protected] +S: Supported +F: Documentation/networking/device_drivers/ethernet/amd/pds_core.rst +F: drivers/net/ethernet/amd/pds_core/ + AMD SPI DRIVER M: Sanjay R Mehta <[email protected]> S: Maintained
drivers/net/ethernet/amd/Kconfig +12 -0
@@ -186,4 +186,16 @@ config AMD_XGBE_HAVE_ECC bool default n +config PDS_CORE + tristate "AMD/Pensando Data Systems Core Device Support" + depends on 64BIT && PCI + help + This enables the support for the AMD/Pensando Core device family of + adapters. More specific information on this driver can be + found in + <file:Documentation/networking/device_drivers/ethernet/amd/pds_core.rst>. + + To compile this driver as a module, choose M here. The module + will be called pds_core. + endif # NET_VENDOR_AMD
drivers/net/ethernet/amd/Makefile +1 -0
@@ -17,3 +17,4 @@ obj-$(CONFIG_PCNET32) += pcnet32.o obj-$(CONFIG_SUN3LANCE) += sun3lance.o obj-$(CONFIG_SUNLANCE) += sunlance.o obj-$(CONFIG_AMD_XGBE) += xgbe/ +obj-$(CONFIG_PDS_CORE) += pds_core/
Signature · 1 line
2.17.1