Update zesDevicePciGetBars API to report correct count of bars

This change does the following:
 - As per latest spec, update zesDevicePciGetBars API to report
   correct number of bars.
 - Cleanup to remove environment variable check while creating
   temperature handles.

Change-Id: I4f86210093e3d142183a01bef89417ef9d9fde9b
Signed-off-by: Jitendra Sharma <jitendra.sharma@intel.com>

Author: jitendrasharma1989

level_zero/tools/source/sysman/pci/pci_imp.cpp

@@ -48,12 +48,13 @@ ze_result_t PciImp::pciStaticProperties(zes_pci_properties_t *pProperties) {
 }
 
 ze_result_t PciImp::pciGetInitializedBars(uint32_t *pCount, zes_pci_bar_properties_t *pProperties) {
-    if (pProperties == nullptr) {
-        *pCount = static_cast<uint32_t>(pciBarProperties.size());
-        return ZE_RESULT_SUCCESS;
-    } else {
-        *pCount = std::min(*pCount, static_cast<uint32_t>(pciBarProperties.size()));
-        for (uint32_t i = 0; i < *pCount; i++) {
+    uint32_t pciBarPropertiesSize = static_cast<uint32_t>(pciBarProperties.size());
+    uint32_t numToCopy = std::min(*pCount, pciBarPropertiesSize);
+    if (0 == *pCount || *pCount > pciBarPropertiesSize) {
+        *pCount = pciBarPropertiesSize;
+    }
+    if (nullptr != pProperties) {
+        for (uint32_t i = 0; i < numToCopy; i++) {
             pProperties[i] = *pciBarProperties[i];
         }
     }

level_zero/tools/source/sysman/temperature/temperature.cpp

@@ -27,15 +27,6 @@ void TemperatureHandleContext::createHandle(zes_temp_sensors_t type) {
 }
 
 void TemperatureHandleContext::init() {
-    auto isSysmanEnabled = getenv("ZES_ENABLE_SYSMAN");
-    if (isSysmanEnabled != nullptr) {
-        auto isSysmanEnabledAsInt = atoi(isSysmanEnabled);
-        if (isSysmanEnabledAsInt == 1) {
-            createHandle(ZES_TEMP_SENSORS_GLOBAL);
-            createHandle(ZES_TEMP_SENSORS_GPU);
-        }
-        return;
-    }
     createHandle(ZES_TEMP_SENSORS_GLOBAL);
     createHandle(ZES_TEMP_SENSORS_GPU);
 }

level_zero/tools/test/unit_tests/sources/sysman/pci/linux/test_zes_pci.cpp

@@ -194,6 +194,10 @@ TEST_F(ZesPciFixture, GivenValidSysmanHandleWhenCallingzetSysmanPciGetBarsThenVe
     EXPECT_EQ(ZE_RESULT_SUCCESS, result);
     EXPECT_GT(count, 0u);
 
+    uint32_t testCount = count + 1;
+    EXPECT_EQ(ZE_RESULT_SUCCESS, zesDevicePciGetBars(device, &testCount, nullptr));
+    EXPECT_EQ(count, testCount);
+
     std::vector<zes_pci_bar_properties_t> pciBarProps(count);
     result = zesDevicePciGetBars(device, &count, pciBarProps.data());
     EXPECT_EQ(ZE_RESULT_SUCCESS, result);

level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/test_zes_temperature.cpp

@@ -108,23 +108,6 @@ TEST_F(SysmanDeviceTemperatureFixture, GivenPmtSupportAvailableWhenCheckingForTe
     }
 }
 
-TEST_F(SysmanDeviceTemperatureFixture, GivenSysmanEnvironmentVariableSetToZeroWhenCreatingTemperatureHandlesThenHandlesNotCreated) {
-    setenv("ZES_ENABLE_SYSMAN", "0", 1);
-    auto pTempHandleContextTest = std::make_unique<TemperatureHandleContext>(pOsSysman);
-    pTempHandleContextTest->init();
-    uint32_t count = 0;
-    std::vector<zes_temp_handle_t> handles(count, nullptr);
-    EXPECT_EQ(ZE_RESULT_SUCCESS, pTempHandleContextTest->temperatureGet(&count, handles.data()));
-    EXPECT_EQ(count, 0u);
-}
-
-TEST_F(SysmanDeviceTemperatureFixture, GivenSysmanEnvironmentVariableNotSetWhenCreatingTemperatureHandlesThenZetHandlesCreated) {
-    unsetenv("ZES_ENABLE_SYSMAN");
-    auto pTempHandleContextTestWithoutEnvSet = std::make_unique<TemperatureHandleContext>(pOsSysman);
-    pTempHandleContextTestWithoutEnvSet->init();
-    EXPECT_EQ(handleComponentCount, static_cast<uint32_t>(pTempHandleContextTestWithoutEnvSet->handleList.size()));
-}
-
 TEST_F(SysmanDeviceTemperatureFixture, GivenValidTempHandleWhenGettingTemperaturePropertiesThenUnsupportedIsReturned) {
     auto handles = get_temp_handles(handleComponentCount);
     for (auto handle : handles) {