diff --git a/base/pf-bb-config/debian/deb_folder/changelog b/base/pf-bb-config/debian/deb_folder/changelog index 40c46c557..268ea8e66 100644 --- a/base/pf-bb-config/debian/deb_folder/changelog +++ b/base/pf-bb-config/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +pf-bb-config (22.07) UNRELEASED; urgency=low + + * Upversion to 22.07 + + -- Teresa Ho Wed, 17 Oct 2022 10:30:12 +0000 + pf-bb-config (21.6) UNRELEASED; urgency=low * Initial release diff --git a/base/pf-bb-config/debian/deb_folder/patches/Fix-check-return-of-configure_device.patch b/base/pf-bb-config/debian/deb_folder/patches/Fix-check-return-of-configure_device.patch deleted file mode 100644 index 598e4a66a..000000000 --- a/base/pf-bb-config/debian/deb_folder/patches/Fix-check-return-of-configure_device.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9d2809308feb10bc74130cea0b677be0bbe3f2dd Mon Sep 17 00:00:00 2001 -From: Douglas Henrique Koerich -Date: Tue, 27 Jul 2021 12:31:45 -0400 -Subject: [PATCH] Fix: check return of configure_device() - -Takes the result of configure_device() as the return code of the -application, allowing any script running pf-bb-config to stop on -bad device configuration. - -Signed-off-by: Douglas Henrique Koerich ---- - config_app.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/config_app.c b/config_app.c -index f1aa52b..f6dab5e 100644 ---- a/config_app.c -+++ b/config_app.c -@@ -390,20 +390,24 @@ main(int argc, char *argv[]) - return -1; - } - -+ ret = 0; - if (device.config_all) { - for (i = 0; i < num_devices; i++) { - strncpy(device.pci_address, found_devices[i], - sizeof(device.pci_address) - NULL_PAD); -- configure_device(&device); -+ ret = configure_device(&device); -+ if (ret != 0) { -+ break; -+ } - } - } else { - select_device(&device, found_devices, num_devices); -- configure_device(&device); -+ ret = configure_device(&device); - } - - /* Free memory for stored PCI slots */ - for (i = 0; i < num_devices; i++) - free(found_devices[i]); - -- return 0; -+ return ret; - } --- -2.29.2 - diff --git a/base/pf-bb-config/debian/deb_folder/patches/Reject-device-configuration-if-not-enabled.patch b/base/pf-bb-config/debian/deb_folder/patches/Reject-device-configuration-if-not-enabled.patch deleted file mode 100644 index a9a1813ea..000000000 --- a/base/pf-bb-config/debian/deb_folder/patches/Reject-device-configuration-if-not-enabled.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8ac364315c153e546fbae9dd63c562b9a1e42d82 Mon Sep 17 00:00:00 2001 -From: Babak Sarashki -Date: Sun, 24 Jan 2021 13:46:20 -0500 -Subject: [PATCH] Reject device configuration if not enabled - -Signed-off-by: Babak Sarashki ---- - config_app.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/config_app.c b/config_app.c -index fdad259..f1aa52b 100644 ---- a/config_app.c -+++ b/config_app.c -@@ -114,6 +114,7 @@ static bool - get_device_id(hw_device *device, const char *location) - { - unsigned long vendor_id = -1, device_id = -1; -+ unsigned int device_enabled = 0; - struct dirent *dirent; - DIR *dir; - char pci_path[PATH_MAX]; -@@ -139,6 +140,12 @@ get_device_id(hw_device *device, const char *location) - snprintf(file_path, sizeof(file_path), "%s/%s", - pci_path, dirent->d_name); - -+ /* Is device enabled? */ -+ if (strncmp(dirent->d_name, "enable", -+ strlen(dirent->d_name)) == 0 && -+ dirent->d_type == DT_REG) -+ device_enabled = get_file_val(file_path); -+ - /* Get Device ID */ - if (strncmp(dirent->d_name, DEVICE_FILE, - strlen(dirent->d_name)) == 0 && -@@ -154,7 +161,8 @@ get_device_id(hw_device *device, const char *location) - - closedir(dir); - /* Check if device is found */ -- return (vendor_id == device->vendor_id && -+ return (device_enabled && -+ vendor_id == device->vendor_id && - device_id == device->device_id); - } - --- -2.29.2 - diff --git a/base/pf-bb-config/debian/deb_folder/patches/series b/base/pf-bb-config/debian/deb_folder/patches/series index 62568c9eb..d24e48207 100644 --- a/base/pf-bb-config/debian/deb_folder/patches/series +++ b/base/pf-bb-config/debian/deb_folder/patches/series @@ -1,3 +1 @@ -Reject-device-configuration-if-not-enabled.patch -Fix-check-return-of-configure_device.patch Customize-fpga_5gnr-config-for-1-VF.patch diff --git a/base/pf-bb-config/debian/meta_data.yaml b/base/pf-bb-config/debian/meta_data.yaml index ba5f224e4..4211abaff 100644 --- a/base/pf-bb-config/debian/meta_data.yaml +++ b/base/pf-bb-config/debian/meta_data.yaml @@ -1,10 +1,10 @@ --- -debver: 21.6 +debver: 22.07 dl_path: - name: pf-bb-config-21.6.tar.gz - url: https://github.com/intel/pf-bb-config/archive/refs/tags/v21.6.tar.gz - md5sum: c2269025d0060565147971cf86cdbb3c - sha256sum: 7a110f7d2171e68bfa9fc3fb13b382fb7dfb85ffcde228bbab219f06f278dde0 + name: pf-bb-config-22.07.tar.gz + url: https://github.com/intel/pf-bb-config/archive/refs/tags/v22.07.tar.gz + md5sum: 84bb65ac65dadd4b238be763c5a112f0 + sha256sum: cb390b31962918cea7ee1a2802e2e94c8ed39bc4326602646f06adfb5191dcf4 revision: dist: $STX_DIST PKG_GITREVCOUNT: true