|
@@ -547,9 +547,10 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
|
|
|
|
|
|
acpi_status
|
|
acpi_status
|
|
acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
|
|
acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
|
|
- u32 *value, u32 width)
|
|
|
|
|
|
+ u64 *value, u32 width)
|
|
{
|
|
{
|
|
int result, size;
|
|
int result, size;
|
|
|
|
+ u32 value32;
|
|
|
|
|
|
if (!value)
|
|
if (!value)
|
|
return AE_BAD_PARAMETER;
|
|
return AE_BAD_PARAMETER;
|
|
@@ -570,7 +571,8 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
|
|
|
|
|
|
result = raw_pci_read(pci_id->segment, pci_id->bus,
|
|
result = raw_pci_read(pci_id->segment, pci_id->bus,
|
|
PCI_DEVFN(pci_id->device, pci_id->function),
|
|
PCI_DEVFN(pci_id->device, pci_id->function),
|
|
- reg, size, value);
|
|
|
|
|
|
+ reg, size, &value32);
|
|
|
|
+ *value = value32;
|
|
|
|
|
|
return (result ? AE_ERROR : AE_OK);
|
|
return (result ? AE_ERROR : AE_OK);
|
|
}
|
|
}
|
|
@@ -626,7 +628,7 @@ static void acpi_os_derive_pci_id_2(acpi_handle rhandle, /* upper bound */
|
|
status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
|
|
status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
|
|
&temp);
|
|
&temp);
|
|
if (ACPI_SUCCESS(status)) {
|
|
if (ACPI_SUCCESS(status)) {
|
|
- u32 val;
|
|
|
|
|
|
+ u64 val;
|
|
pci_id->device = ACPI_HIWORD(ACPI_LODWORD(temp));
|
|
pci_id->device = ACPI_HIWORD(ACPI_LODWORD(temp));
|
|
pci_id->function = ACPI_LOWORD(ACPI_LODWORD(temp));
|
|
pci_id->function = ACPI_LOWORD(ACPI_LODWORD(temp));
|
|
|
|
|