starlingx/integ
Code Issues Proposed changes

Merge "Upgrade pf-bb-config to 22.11"

Browse Source
This commit is contained in:
Zuul 2023-04-20 16:46:15 +00:00 committed by Gerrit Code Review
commit 633471f755
8 changed files with 13 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/pf-bb-config/debian/deb_folder/changelog
View File

@ -1,3 +1,9 @@
pf-bb-config (22.11) UNRELEASED; urgency=low
* Upversion to 22.11
-- Nidhi Shivashankara Belur <nidhi.shivashankara.belur@intel.com> Thu, 30 Mar 2023 17:50:13 +0000
pf-bb-config (22.07) UNRELEASED; urgency=low
* Upversion to 22.07

31
base/pf-bb-config/debian/deb_folder/patches/Customize-fpga_5gnr-config-for-1-VF.patch
View File

@ -1,31 +0,0 @@
From a362668ac7ca891974c3b5b50c983471e1dfab02 Mon Sep 17 00:00:00 2001
From: Douglas Henrique Koerich <douglashenrique.koerich@windriver.com>
Date: Wed, 18 Aug 2021 12:19:16 -0400
Subject: [PATCH] Customize fpga_5gnr config for 1 VF
Change distribution of UL/DL queues to be used by one VF only.
Signed-off-by: Douglas Henrique Koerich <douglashenrique.koerich@windriver.com>
---
fpga_5gnr/fpga_5gnr_config_vf.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fpga_5gnr/fpga_5gnr_config_vf.cfg b/fpga_5gnr/fpga_5gnr_config_vf.cfg
index 0a82f52..81aa3bb 100644
--- a/fpga_5gnr/fpga_5gnr_config_vf.cfg
+++ b/fpga_5gnr/fpga_5gnr_config_vf.cfg
@@ -7,9 +7,9 @@ pf_mode_en = 0
[UL]
bandwidth = 3
load_balance = 128
-vfqmap = 16,16,0,0,0,0,0,0
+vfqmap = 32,0,0,0,0,0,0,0
[DL]
bandwidth = 3
load_balance = 128
-vfqmap = 16,16,0,0,0,0,0,0
+vfqmap = 32,0,0,0,0,0,0,0
--
2.29.2

1
base/pf-bb-config/debian/deb_folder/patches/series
View File

@ -1,2 +1 @@
Customize-fpga_5gnr-config-for-1-VF.patch
Added-acc200_config_1vf_5g.cfg.patch

2
base/pf-bb-config/debian/deb_folder/pf-bb-config.install
View File

@ -3,5 +3,5 @@ usr/share/pf-bb-config/acc100/acc100_config_1vf_4g5g.cfg
usr/share/pf-bb-config/acc100/acc100_config_vf_5g.cfg
usr/share/pf-bb-config/acc200/acc200_config_16vf.cfg
usr/share/pf-bb-config/acc200/acc200_config_1vf_5g.cfg
usr/share/pf-bb-config/fpga_5gnr/fpga_5gnr_config_vf.cfg
usr/share/pf-bb-config/fpga_5gnr/fpga_5gnr_config_1vf.cfg
usr/share/pf-bb-config/README.md

2
base/pf-bb-config/debian/deb_folder/rules
View File

@ -35,6 +35,6 @@ override_dh_install:
install -p -D -m 600 acc100/acc100_config_vf_5g.cfg ${DEBIAN_DESTDIR}/usr/share/pf-bb-config/acc100/acc100_config_vf_5g.cfg
install -p -D -m 600 acc200/acc200_config_16vf.cfg ${DEBIAN_DESTDIR}/usr/share/pf-bb-config/acc200/acc200_config_16vf.cfg
install -p -D -m 600 acc200/acc200_config_1vf_5g.cfg ${DEBIAN_DESTDIR}/usr/share/pf-bb-config/acc200/acc200_config_1vf_5g.cfg
install -p -D -m 600 fpga_5gnr/fpga_5gnr_config_vf.cfg ${DEBIAN_DESTDIR}/usr/share/pf-bb-config/fpga_5gnr/fpga_5gnr_config_vf.cfg
install -p -D -m 600 fpga_5gnr/fpga_5gnr_config_1vf.cfg ${DEBIAN_DESTDIR}/usr/share/pf-bb-config/fpga_5gnr/fpga_5gnr_config_1vf.cfg
install -p -D -m 644 README.md ${DEBIAN_DESTDIR}/usr/share/pf-bb-config/README.md
dh_install

10
base/pf-bb-config/debian/meta_data.yaml
View File

@ -1,10 +1,10 @@
---
debver: 22.07
debver: 22.11
dl_path:
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
name: pf-bb-config-22.11.tar.gz
url: https://github.com/intel/pf-bb-config/archive/refs/tags/v22.11.tar.gz
md5sum: fc1daa9cc9d6ea864954fef95d465098
sha256sum: 28754ef96330a0640f13440bb3fb9a5b825900f03711bcdc0b9be58e01caa55e
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

37
base/pf-bb-config/debian/patches/0001-Fix-check-return-of-configure_device.patch
View File

@ -1,37 +0,0 @@
From b1b29494ab8b9395c36c1b5664af324c7f67245c Mon Sep 17 00:00:00 2001
From: Andre Kantek <andrefernandozanella.kantek@windriver.com>
Date: Wed, 23 Nov 2022 08:36:08 -0300
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: Andre Kantek <andrefernandozanella.kantek@windriver.com>
---
config_app.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/config_app.c b/config_app.c
index 4f72764..066fb55 100644
--- a/config_app.c
+++ b/config_app.c
@@ -431,11 +431,15 @@ 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);
ret = configure_device(&device);
+ if (ret != 0) {
+ break;
+ }
}
} else {
select_device(&device, found_devices, num_devices);
--
2.17.1

1
base/pf-bb-config/debian/patches/series
View File

@ -1 +0,0 @@
0001-Fix-check-return-of-configure_device.patch