Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5f0231e authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Fix acpi_os_read_pci_configuration prototype 



Prototype in acpiosxf.h had the output value pointer as a (u32 *).
Should be a (u64 *).

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 899611ee

drivers/acpi/acpica/exregion.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -353,7 +353,6 @@ acpi_ex_pci_config_space_handler(u32 function, 
	acpi_status status = AE_OK;

	acpi_status status = AE_OK;

	struct acpi_pci_id *pci_id;

	struct acpi_pci_id *pci_id;

	u16 pci_register;

	u16 pci_register;

	u32 value32;





	ACPI_FUNCTION_TRACE(ex_pci_config_space_handler);

	ACPI_FUNCTION_TRACE(ex_pci_config_space_handler);
@@ -381,8 +380,7 @@ acpi_ex_pci_config_space_handler(u32 function, 
	case ACPI_READ:

	case ACPI_READ:





		status = acpi_os_read_pci_configuration(pci_id, pci_register,

		status = acpi_os_read_pci_configuration(pci_id, pci_register,

							&value32, bit_width);

							value, bit_width);

		*value = value32;

		break;

		break;





	case ACPI_WRITE:

	case ACPI_WRITE:

drivers/acpi/osl.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -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));

include/acpi/acpiosxf.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -223,7 +223,7 @@ acpi_os_write_memory(acpi_physical_address address, u32 value, u32 width); 
 */

 */

acpi_status

acpi_status

acpi_os_read_pci_configuration(struct acpi_pci_id *pci_id,

acpi_os_read_pci_configuration(struct acpi_pci_id *pci_id,

			       u32 reg, u32 *value, u32 width);

			       u32 reg, u64 *value, u32 width);





acpi_status

acpi_status

acpi_os_write_pci_configuration(struct acpi_pci_id *pci_id,

acpi_os_write_pci_configuration(struct acpi_pci_id *pci_id,