In article <[email protected]>,
Jukka Andberg <[email protected]> wrote:
>Christos Zoulas wrote:
>> Can you add some debugging statements to AcpiEvAddressSpaceDispatch and
>> see where AcpiOsReadPciConfiguration is called from?
>
>AcpiEvAddressSpaceDispatch calls (via Handler pointer)
>AcpiExPciConfigSpaceHandler and that calls AcpiOsReadPciConfiguration.
How about this?
christos
Index: acpica/OsdHardware.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/OsdHardware.c,v
retrieving revision 1.9
diff -u -u -r1.9 OsdHardware.c
--- acpica/OsdHardware.c 27 Dec 2013 18:53:25 -0000 1.9
+++ acpica/OsdHardware.c 25 Jan 2016 22:13:16 -0000
@@ -212,15 +212,15 @@
{
pcitag_t tag;
pcireg_t tmp;
+ pci_chipset_tag_t pc = acpi_softc ? acpi_softc->sc_pc : NULL;
/* XXX Need to deal with "segment" ("hose" in Alpha terminology). */
if (PciId->Bus >= 256 || PciId->Device >= 32 || PciId->Function >= 8)
return AE_BAD_PARAMETER;
- tag = pci_make_tag(acpi_softc->sc_pc, PciId->Bus, PciId->Device,
- PciId->Function);
- tmp = pci_conf_read(acpi_softc->sc_pc, tag, Register & ~3);
+ tag = pci_make_tag(pc, PciId->Bus, PciId->Device, PciId->Function);
+ tmp = pci_conf_read(pc, tag, Register & ~3);
switch (Width) {
case 8:
@@ -253,21 +253,21 @@
{
pcitag_t tag;
pcireg_t tmp;
+ pci_chipset_tag_t pc = acpi_softc ? acpi_softc->sc_pc : NULL;
/* XXX Need to deal with "segment" ("hose" in Alpha terminology). */
- tag = pci_make_tag(acpi_softc->sc_pc, PciId->Bus, PciId->Device,
- PciId->Function);
+ tag = pci_make_tag(pc, PciId->Bus, PciId->Device, PciId->Function);
switch (Width) {
case 8:
- tmp = pci_conf_read(acpi_softc->sc_pc, tag, Register & ~3);
+ tmp = pci_conf_read(pc, tag, Register & ~3);
tmp &= ~(0xff << ((Register & 3) * 8));
tmp |= (Value << ((Register & 3) * 8));
break;
case 16:
- tmp = pci_conf_read(acpi_softc->sc_pc, tag, Register & ~3);
+ tmp = pci_conf_read(pc, tag, Register & ~3);
tmp &= ~(0xffff << ((Register & 3) * 8));
tmp |= (Value << ((Register & 3) * 8));
break;
@@ -280,7 +280,7 @@
return AE_BAD_PARAMETER;
}
- pci_conf_write(acpi_softc->sc_pc, tag, Register & ~3, tmp);
+ pci_conf_write(pc, tag, Register & ~3, tmp);
return AE_OK;
}
