system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 10:05:32 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Kernel/Audio: Fail AC97 probe if no good BAR1 is found

Browse source 
Otherwise we get a kernel panic later on Intel SOF.
This commit is contained in:
Vladimir Serbinenko 2023-07-22 20:45:59 +02:00 committed by Andrew Kaster
parent 3e1146d4b8
commit 2e9a28272e
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Kernel/Devices/Audio/AC97/AC97.cpp
View file

@ -35,6 +35,21 @@ UNMAP_AFTER_INIT ErrorOr<NonnullRefPtr<AudioController>> AC97::create(PCI::Devic
UNMAP_AFTER_INIT ErrorOr<bool> AC97::probe(PCI::DeviceIdentifier const& device_identifier)
{
VERIFY(device_identifier.class_code() == PCI::ClassID::Multimedia);
// TODO: Check pci ids.
if (PCI::get_BAR_space_size(device_identifier, PCI::HeaderType0BaseRegister::BAR0) <= NativeAudioMixerRegister::MaxUsedMixerOffset)
return Error::from_errno(EIO);
// BAR registers are 32-bit. So if BAR0 is 64-bit then
// it occupies BAR0 and BAR1 and hence BAR1 isn't present on its own.
u64 pci_bar0_value = PCI::get_BAR(device_identifier, PCI::HeaderType0BaseRegister::BAR0);
if (PCI::get_BAR_space_type(pci_bar0_value) == PCI::BARSpaceType::Memory64BitSpace)
return Error::from_errno(EIO);
if (PCI::get_BAR_space_size(device_identifier, PCI::HeaderType0BaseRegister::BAR1) <= NativeAudioBusRegister::MaxUsedBusOffset)
return Error::from_errno(EIO);
return device_identifier.subclass_code() == PCI::Multimedia::SubclassID::Audio;
}

2
Kernel/Devices/Audio/AC97/AC97.h
View file

@ -48,6 +48,7 @@ private:
PCMFrontDACRate = 0x2c,
VendorID1 = 0x7c,
VendorID2 = 0x7e,
MaxUsedMixerOffset = 0x7f,
};
enum ExtendedAudioMask : u16 {
@ -79,6 +80,7 @@ private:
enum NativeAudioBusRegister : u8 {
GlobalControl = 0x2c,
MaxUsedBusOffset = 0x2f
};
enum AudioStatusRegisterFlag : u16 {