Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Push 2025 02 19 #911

Merged
merged 16 commits into from
Feb 20, 2025
Merged

Push 2025 02 19 #911

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5cd7580
support non-zero PCICFG segment through 'MSR' driver
rdementi Feb 12, 2025
d118c41
convert some debug messages into DBG
rdementi Feb 12, 2025
9a81634
scan more PCICFG segments on GNR/Windows
rdementi Feb 12, 2025
6afb27e
convert errors to warnings
rdementi Feb 13, 2025
7e1c7f1
support non-zero PCI segment groupnr on *BSD
rdementi Feb 14, 2025
bd80503
avoid using PCM::getInstance in getMCFGRecords because of a deadlock
rdementi Feb 14, 2025
7f005db
pcm-power: support tpmi perf limit reason telemetry
rdementi Feb 14, 2025
5dd5610
add comments/docs
rdementi Feb 15, 2025
4ef3d03
rename extract_bits_ui into extract_bits_32
rdementi Feb 16, 2025
285417a
add extract_bits_64
rdementi Feb 16, 2025
b9695b5
debug: print version from PLR_HEADER
rdementi Feb 16, 2025
03a0134
debug: convert to DBG macro in cpucounters.h
rdementi Feb 16, 2025
82a5e43
debug: convert to DBG macro in utils.*
rdementi Feb 16, 2025
fed67f8
Merge remote-tracking branch 'opcm-github/master'
rdementi Feb 17, 2025
ba1298b
debug: convert to DBG
rdementi Feb 17, 2025
45cec87
print header.fields.vsec_id
rdementi Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/pci.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,15 @@ union VSEC {
template <class MatchFunc, class ProcessFunc>
void processDVSEC(MatchFunc matchFunc, ProcessFunc processFunc)
{
forAllIntelDevices([&](const uint32 group, const uint32 bus, const uint32 device, const uint32 function, const uint32 /* device_id */)
forAllIntelDevices([&](const uint32 group, const uint32 bus, const uint32 device, const uint32 function, const uint32 device_id)
{
// std::cerr << "Intel device scan. found " << std::hex << group << ":" << bus << ":" << device << ":" << function << " " << device_id << std::dec;
DBG(2, "Intel device scan.found " , std::hex , group , ":" , bus , " : " , device , " : " , function , " " , device_id);
uint32 status{0};
PciHandleType h(group, bus, device, function);
h.read32(4, &status); // read status
if (status & 0x100000) // has capability list
{
// std::cerr << "Intel device scan. found "<< std::hex << group << ":" << bus << ":" << device << ":" << function << " " << device_id << " with capability list\n" << std::dec;
DBG(2, "Intel device scan. found ", std::hex , group , ":" , bus , ":" , device , ":" , function , " " , device_id , " with capability list");
VSEC header;
uint64 offset = 0x100;
do
Expand All @@ -269,11 +269,10 @@ void processDVSEC(MatchFunc matchFunc, ProcessFunc processFunc)
{
return;
}
// std::cerr << "offset 0x" << std::hex << offset << " header.fields.cap_id: 0x" << header.fields.cap_id << std::dec << "\n";
// std::cerr << ".. found entryID: 0x" << std::hex << header.fields.entryID << std::dec << "\n";
DBG(2, "offset 0x" , std::hex , offset , " cap_id: 0x" , header.fields.cap_id , " vsec_id: 0x", header.fields.vsec_id, " entryID: 0x" , std::hex , header.fields.entryID , std::dec);
if (matchFunc(header))
{
// std::cerr << ".... found match\n";
DBG(2, ".... found match");
auto barOffset = 0x10 + header.fields.tBIR * 4;
uint32 bar = 0;
if (h.read32(barOffset, &bar) == sizeof(uint32) && bar != 0) // read bar
Expand All @@ -290,6 +289,7 @@ void processDVSEC(MatchFunc matchFunc, ProcessFunc processFunc)
offset = header.fields.cap_next & ~3;
if (lastOffset == offset) // the offset did not change
{
DBG(2, " lastOffset == offset ", lastOffset , "==", offset);
return; // deadlock protection
}
} while (1);
Expand Down
Loading