Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 23:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPI: RISC-V: Implement PCI related functionality

Browse Source 
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: Sunil V L <sunilvl@ventanamicro.com>
Tested-by: Björn Töpel <bjorn@rivosinc.com>
Link: https://patch.msgid.link/20240812005929.113499-10-sunilvl@ventanamicro.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Sunil V L 2024-08-12 06:29:21 +05:30 committed by Rafael J. Wysocki
parent 2cb9155d11
commit 01415e78cf
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/riscv/Kconfig
View File

@ -13,6 +13,7 @@ config 32BIT
config RISCV config RISCV
def_bool y def_bool y
select ACPI_GENERIC_GSI if ACPI select ACPI_GENERIC_GSI if ACPI
select ACPI_MCFG if (ACPI && PCI)
select ACPI_PPTT if ACPI select ACPI_PPTT if ACPI
select ACPI_REDUCED_HARDWARE_ONLY if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI
select ACPI_SPCR_TABLE if ACPI select ACPI_SPCR_TABLE if ACPI
@ -188,6 +189,7 @@ config RISCV
select OF_EARLY_FLATTREE select OF_EARLY_FLATTREE
select OF_IRQ select OF_IRQ
select PCI_DOMAINS_GENERIC if PCI select PCI_DOMAINS_GENERIC if PCI
select PCI_ECAM if (ACPI && PCI)
select PCI_MSI if PCI select PCI_MSI if PCI
select RISCV_ALTERNATIVE if !XIP_KERNEL select RISCV_ALTERNATIVE if !XIP_KERNEL
select RISCV_APLIC select RISCV_APLIC

33
arch/riscv/kernel/acpi.c
View File

@ -311,29 +311,26 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* /*
* These interfaces are defined just to enable building ACPI core. * raw_pci_read/write - Platform-specific PCI config space access.
* TODO: Update it with actual implementation when external interrupt
* controller support is added in RISC-V ACPI.
*/ */
int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, int raw_pci_read(unsigned int domain, unsigned int bus,
int reg, int len, u32 *val) unsigned int devfn, int reg, int len, u32 *val)
{ {
return PCIBIOS_DEVICE_NOT_FOUND; struct pci_bus *b = pci_find_bus(domain, bus);
if (!b)
return PCIBIOS_DEVICE_NOT_FOUND;
return b->ops->read(b, devfn, reg, len, val);
} }
int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn, int raw_pci_write(unsigned int domain, unsigned int bus,
int reg, int len, u32 val) unsigned int devfn, int reg, int len, u32 val)
{ {
return PCIBIOS_DEVICE_NOT_FOUND; struct pci_bus *b = pci_find_bus(domain, bus);
if (!b)
return PCIBIOS_DEVICE_NOT_FOUND;
return b->ops->write(b, devfn, reg, len, val);
} }
int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)
{
return -1;
}
struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
{
return NULL;
}
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */

2
drivers/pci/pci-acpi.c
View File

@ -1543,7 +1543,7 @@ static int __init acpi_pci_init(void)
} }
arch_initcall(acpi_pci_init); 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 * Try to assign the IRQ number when probing a new device