On 2013年12月04日 00:47, One Thousand Gnomes wrote:
diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c index a6c77e8b..89a181f 100644 --- a/drivers/acpi/reboot.c +++ b/drivers/acpi/reboot.c @@ -3,12 +3,43 @@ #include <linux/acpi.h> #include <acpi/reboot.h> +/*
- There are some rare cases in the ARM world with PCI is not one
- of the buses available to us, even though we use ACPI.
Can we have a comment that is easier to understand here and perhaps a better function name ?
ok, how about "Not all the ARM/ARM64 platforms with CONFIG_PCI enabled, introduce stub function here in case of !CONFIG_PCI when using ACPI" ?
I will discuss with Graeme for a better function name
- */
+#ifdef CONFIG_PCI +static void acpi_reset_with_writing_pci_config(u64 address, u8 reset_value) +{
- struct pci_bus *bus0;
- unsigned int devfn;
- /* The reset register can only live on bus 0. */
- bus0 = pci_find_bus(0, 0);
- if (!bus0)
return;So if you can't find the PCI eg because we have no PCI on the device you return silently, but
+static void acpi_reset_with_writing_pci_config(u64 address, u8 reset_value) +{
- pr_warn("Resetting with ACPI PCI RESET_REG failed, PCI is disabled\n");
- return;
+}
the same system without CONFIG_PCI makes a noise.
What happens when you want to build a single kernel which works on both PCI and non PCI systems. Surely the behaviour should be the same.
Good point, thanks for the guidance, will update in next version.
The other question I'd ask is given the nature of some of these bits would it be better to have an acpi/pci.c which holds the PCI bits ?
Sorry, I'm confused here, which PCI bits?
acpi_reset_with_writing_pci_config(rr->address, reset_value);case ACPI_ADR_SPACE_SYSTEM_MEMORY: diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 167f3d0..5804e77 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c @@ -113,8 +113,10 @@ static int dma_flags(struct pnp_dev *dev, int type, int bus_master, static void pnpacpi_add_irqresource(struct pnp_dev *dev, struct resource *r) { +#ifdef CONFIG_PCI if (!(r->flags & IORESOURCE_DISABLED)) pcibios_penalize_isa_irq(r->start, 1);
Probably better avoid PCI ifdefs all over the place. Any reason the includes for the PCI layer can't provide this as a dummy on a non-PCI system ?
Agreed, I will introduce arch\arm64\include\asm\pci.h to cover pcibios_penalize_isa_irq() as ARM did, then #ifdef here can be removed.
Thanks Hanjun