From Bruno Albuquerque <bga@xxxxxxxxxxxxx>:
Bruno Albuquerque has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/2875 ;)
Change subject: Fix hda driver for x86_64.
......................................................................
Fix hda driver for x86_64.
- Correctly map registers when on a 64 bit machine.
- Some small cleanup.
---
M src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
1 file changed, 21 insertions(+), 21 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/75/2875/1
diff --git a/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
b/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
index c69fd31..5634521 100644
--- a/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
+++ b/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
@@ -88,7 +88,7 @@
{ PCI_VENDOR_INTEL, 0x9dc8, HDA_QUIRK_SNOOP },
{ PCI_VENDOR_INTEL, 0xa0c8, HDA_QUIRK_SNOOP },
{ PCI_VENDOR_INTEL, 0xa170, HDA_QUIRK_SNOOP },
- { PCI_VENDOR_INTEL, 0xa171, HDA_QUIRK_SNOOP },
+ { PCI_VENDOR_INTEL, 0xa171, 0},
{ PCI_VENDOR_INTEL, 0xa1f0, HDA_QUIRK_SNOOP },
{ PCI_VENDOR_INTEL, 0xa270, HDA_QUIRK_SNOOP },
{ PCI_VENDOR_INTEL, 0xa2f0, HDA_QUIRK_SNOOP },
@@ -135,7 +135,7 @@
static uint32
-get_controller_quirks(pci_info& info)
+get_controller_quirks(const pci_info& info)
{
for (size_t i = 0;
i < sizeof(kControllerQuirks) /
sizeof(kControllerQuirks[0]); i++) {
@@ -1003,20 +1003,25 @@
uint16 stateStatus;
uint16 cmd;
status_t status;
- uint32 quirks = get_controller_quirks(controller->pci_info);
+ const pci_info& pciInfo = controller->pci_info;
+ uint32 quirks = get_controller_quirks(pciInfo);
+
+ // map the registers (low + high for 64-bit when requested)
+ phys_addr_t physicalAddress = pciInfo.u.h0.base_registers[0];
+ physicalAddress &= PCI_address_memory_32_mask;
+ if ((pciInfo.u.h0.base_register_flags[0] & 0xC) == PCI_address_type_64)
+ physicalAddress += (phys_addr_t)pciInfo.u.h0.base_registers[1]
<< 32;
// Map MMIO registers
controller->regs_area = map_physical_memory("hda_hw_regs",
- controller->pci_info.u.h0.base_registers[0],
- controller->pci_info.u.h0.base_register_sizes[0],
B_ANY_KERNEL_ADDRESS,
- 0, (void**)&controller->regs);
+ physicalAddress, pciInfo.u.h0.base_register_sizes[0],
+ B_ANY_KERNEL_ADDRESS, 0, (void**)&controller->regs);
if (controller->regs_area < B_OK) {
status = controller->regs_area;
goto error;
}
- cmd = (gPci->read_pci_config)(controller->pci_info.bus,
- controller->pci_info.device, controller->pci_info.function,
+ cmd = (gPci->read_pci_config)(pciInfo.bus, pciInfo.device,
pciInfo.function,
PCI_command, 2);
if (!(cmd & PCI_command_master)) {
dprintf("hda: enabling PCI bus mastering\n");
@@ -1030,27 +1035,22 @@
dprintf("hda: enabling PCI interrupts\n");
cmd &= ~PCI_command_int_disable;
}
- (gPci->write_pci_config)(controller->pci_info.bus,
- controller->pci_info.device, controller->pci_info.function,
+ (gPci->write_pci_config)(pciInfo.bus, pciInfo.device, pciInfo.function,
PCI_command, 2, cmd);
// Absolute minimum hw is online; we can now install interrupt handler
- controller->irq = controller->pci_info.u.h0.interrupt_line;
+ controller->irq = pciInfo.u.h0.interrupt_line;
controller->msi = false;
if (gPCIx86Module != NULL && (quirks & HDA_QUIRK_NO_MSI) == 0
- && gPCIx86Module->get_msi_count(
- controller->pci_info.bus,
controller->pci_info.device,
- controller->pci_info.function) >= 1) {
+ && gPCIx86Module->get_msi_count(pciInfo.bus,
pciInfo.device,
+ pciInfo.function) >= 1) {
// Try MSI first
uint8 vector;
- if (gPCIx86Module->configure_msi(controller->pci_info.bus,
- controller->pci_info.device,
controller->pci_info.function,
- 1, &vector) == B_OK
- && gPCIx86Module->enable_msi(controller->pci_info.bus,
- controller->pci_info.device,
controller->pci_info.function)
- == B_OK) {
+ if (gPCIx86Module->configure_msi(pciInfo.bus, pciInfo.device,
+ pciInfo.function, 1, &vector) == B_OK &&
gPCIx86Module->enable_msi(
+ pciInfo.bus, pciInfo.device, pciInfo.function)
== B_OK) {
dprintf("hda: using MSI vector %u\n", vector);
controller->irq = vector;
controller->msi = true;
@@ -1071,7 +1071,7 @@
controller->dma_snooping = false;
if ((quirks & HDA_QUIRK_SNOOP) != 0) {
- switch (controller->pci_info.vendor_id) {
+ switch (pciInfo.vendor_id) {
case PCI_VENDOR_NVIDIA:
{
controller->dma_snooping =
update_pci_register(controller,
--
To view, visit https://review.haiku-os.org/c/haiku/+/2875
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I07f6cfeedc9f650740e1be7ab998b4fc3e0fd4d2
Gerrit-Change-Number: 2875
Gerrit-PatchSet: 1
Gerrit-Owner: Bruno Albuquerque <bga@xxxxxxxxxxxxx>
Gerrit-MessageType: newchange
