From b0107e8cf62f0dc034e3bfd7ebfed83ea50e0455 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Tue, 14 Feb 2023 15:29:19 +0100 Subject: [PATCH] scripts/get-pmr: Use pci_bus_cache[@] There's no point to depend on the nvme driver here, just fetch nvme devices directly from the pci bus. Signed-off-by: Michal Berger Change-Id: If0300a538c24802287bb7c1bb2e2cba66943043f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16775 Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Reviewed-by: Konrad Sztyber Tested-by: SPDK CI Jenkins --- scripts/get-pmr | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/get-pmr b/scripts/get-pmr index 900f996a1..7b7a0deaf 100755 --- a/scripts/get-pmr +++ b/scripts/get-pmr @@ -11,6 +11,9 @@ shopt -s nullglob # Use MSR instead? [[ $(< /sys/class/dmi/id/chassis_vendor) == QEMU ]] || exit 0 +curdir=$(readlink -f "$(dirname "$0")") +source "$curdir/common.sh" + get_bar() { echo "0x$(setpci -s "$1" "$2.${3:-L}")" } @@ -47,8 +50,7 @@ info() { print_info() { local bar=$1 base_addr=$2 bar_type=$3 - printf '%s:%s:%s:%s:%s:%s\n' \ - "${nvme##*/}" \ + printf '%s:%s:%s:%s:%s\n' \ "$dev" \ "64-bit" \ "${pref[bar & 1 << 3 ? 1 : 0]}" \ @@ -86,8 +88,9 @@ info() { } missing_buf=0 -for nvme in /sys/class/nvme/nvme*; do - pci=$(readlink -f "$nvme/device") pci=${pci##*/} +cache_pci_bus + +for pci in ${pci_bus_cache[0x010802]}; do info "$pci" || ((++missing_buf)) done ((missing_buf == 0))