Commit 01415e78 authored by Sunil V L's avatar Sunil V L Committed by Rafael J. Wysocki
Browse files

ACPI: RISC-V: Implement PCI related functionality 



Replace the dummy implementation for PCI related functions with actual
implementation. This needs ECAM and MCFG CONFIG options to be enabled
for RISC-V.

Signed-off-by: default avatarSunil V L <sunilvl@ventanamicro.com>
Tested-by: default avatarBjörn Töpel <bjorn@rivosinc.com>
Link: https://patch.msgid.link/20240812005929.113499-10-sunilvl@ventanamicro.com


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 2cb9155d

arch/riscv/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config 32BIT 
config RISCV

	def_bool y

	select ACPI_GENERIC_GSI if ACPI

	select ACPI_MCFG if (ACPI && PCI)

	select ACPI_PPTT if ACPI

	select ACPI_REDUCED_HARDWARE_ONLY if ACPI

	select ACPI_SPCR_TABLE if ACPI
@@ -188,6 +189,7 @@ config RISCV 
	select OF_EARLY_FLATTREE

	select OF_IRQ

	select PCI_DOMAINS_GENERIC if PCI

	select PCI_ECAM if (ACPI && PCI)

	select PCI_MSI if PCI

	select RISCV_ALTERNATIVE if !XIP_KERNEL

	select RISCV_APLIC

arch/riscv/kernel/acpi.c

+14 −17
Original line number Diff line number Diff line
@@ -311,29 +311,26 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) 
#ifdef CONFIG_PCI



/*

 * These interfaces are defined just to enable building ACPI core.

 * TODO: Update it with actual implementation when external interrupt

 * controller support is added in RISC-V ACPI.

 * raw_pci_read/write - Platform-specific PCI config space access.

 */

int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,

		 int reg, int len, u32 *val)

int raw_pci_read(unsigned int domain, unsigned int bus,

		 unsigned int devfn, int reg, int len, u32 *val)

{

	return PCIBIOS_DEVICE_NOT_FOUND;

}

	struct pci_bus *b = pci_find_bus(domain, bus);



int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn,

		  int reg, int len, u32 val)

{

	if (!b)

		return PCIBIOS_DEVICE_NOT_FOUND;

	return b->ops->read(b, devfn, reg, len, val);

}



int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)

int raw_pci_write(unsigned int domain, unsigned int bus,

		  unsigned int devfn, int reg, int len, u32 val)

{

	return -1;

}

	struct pci_bus *b = pci_find_bus(domain, bus);



struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)

{

	return NULL;

	if (!b)

		return PCIBIOS_DEVICE_NOT_FOUND;

	return b->ops->write(b, devfn, reg, len, val);

}



#endif	/* CONFIG_PCI */

drivers/pci/pci-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -1543,7 +1543,7 @@ static int __init acpi_pci_init(void) 
}

arch_initcall(acpi_pci_init);



#if defined(CONFIG_ARM64)

#if defined(CONFIG_ARM64) || defined(CONFIG_RISCV)



/*

 * Try to assign the IRQ number when probing a new device