mirror of
https://github.com/torvalds/linux.git
synced 2024-12-21 18:42:44 +00:00
2d4407079c
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVkO5XAAoJEOvOhAQsB9HWe4cQAJcsmSXIDN2O6oxvgH8Wilof EIEMvT13uwBdsjQdYUY6A6B3iUV9wzEEgoosg/JRgpz5/b1FTDMIO4arUPD3Lcak 5bmyVO2qAT+yaLAWSgn6I8DMplXrKiEuK+TkH/mW3p9TdvElLdG3Vg6UI407hSWv W0QbVwkNtv8XmzshV9F2YdmflT8j1PgYxIu/tEkVOWn37DNW+Fp2OVBrdTIYp3AJ X6bYZPEcQDCrWWW/s2GmIDrNgryiebasns+CAgGY21262jAYaRcFOJmR47AsTqW7 DSZXIlLc/gJca++hfxqV15RZ4NRHxrebCypTsPtZUV7ZiYHI726eeUZzxsp/9itu mvhmi+aQUTTUP3dDhiv05f4syAKEb4zslT6SLwcna6oi09M97HfCeQsHqhcFq/MG KnS2JJoJQToQtJvMUXMQzp5hyHjNlOclIvCxEiL32EZU54PeJOKasy/mptNGEctk TxACWvoXBQglRaVN+1wIjjr0BaHJSuJa9CUnIfM4WZdSHiMQMx00XLTkZcTnSM6R 12pE54vVolrXswGPJhy4W/Sf1yPSW1tkWSVBbkKLyCIrlAWJtu68rXhvwhG/nz6E 3g6QrDEQGlk6bzUH4CJCEqXLPRN1bNS0XjdkEFh60Lury3Ns5yHKZXPW5vCQ5csr FQNUyBs595CWbJNfbn1n =0BDx -----END PGP SIGNATURE----- Merge tag 'module_init-device_initcall-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux Pull module_init replacement part one from Paul Gortmaker: "Replace module_init with equivalent device_initcall in non modules. This series of commits converts non-modular code that is using the module_init() call to hook itself into the system to instead use device_initcall(). The conversion is a runtime no-op, since module_init actually becomes __initcall in the non-modular case, and that in turn gets mapped onto device_initcall. A couple files show a larger negative diffstat, representing ones that had a module_exit function that we remove here vs previously relying on the linker to dispose of it. We make this conversion now, so that we can relocate module_init from init.h into module.h in the future. The files changed here are just limited to those that would otherwise have to add module.h to obviously non-modular code, in order to avoid a compile fail, as testing has shown" * tag 'module_init-device_initcall-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: MIPS: don't use module_init in non-modular cobalt/mtd.c file drivers/leds: don't use module_init in non-modular leds-cobalt-raq.c cris: don't use module_init for non-modular core eeprom.c code tty/metag_da: Avoid module_init/module_exit in non-modular code drivers/clk: don't use module_init in clk-nomadik.c which is non-modular xtensa: don't use module_init for non-modular core network.c code sh: don't use module_init in non-modular psw.c code mn10300: don't use module_init in non-modular flash.c code parisc64: don't use module_init for non-modular core perf code parisc: don't use module_init for non-modular core pdc_cons code cris: don't use module_init for non-modular core intmem.c code ia64: don't use module_init in non-modular sim/simscsi.c code ia64: don't use module_init for non-modular core kernel/mca.c code arm: don't use module_init in non-modular mach-vexpress/spc.c code powerpc: don't use module_init in non-modular 83xx suspend code powerpc: use device_initcall for registering rtc devices x86: don't use module_init in non-modular devicetree.c code x86: don't use module_init in non-modular intel_mid_vrtc.c
304 lines
6.0 KiB
C
304 lines
6.0 KiB
C
/*
|
|
* Architecture specific OF callbacks.
|
|
*/
|
|
#include <linux/bootmem.h>
|
|
#include <linux/export.h>
|
|
#include <linux/io.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/list.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/of_pci.h>
|
|
#include <linux/initrd.h>
|
|
|
|
#include <asm/irqdomain.h>
|
|
#include <asm/hpet.h>
|
|
#include <asm/apic.h>
|
|
#include <asm/pci_x86.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/i8259.h>
|
|
|
|
__initdata u64 initial_dtb;
|
|
char __initdata cmd_line[COMMAND_LINE_SIZE];
|
|
|
|
int __initdata of_ioapic;
|
|
|
|
void __init early_init_dt_scan_chosen_arch(unsigned long node)
|
|
{
|
|
BUG();
|
|
}
|
|
|
|
void __init early_init_dt_add_memory_arch(u64 base, u64 size)
|
|
{
|
|
BUG();
|
|
}
|
|
|
|
void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
|
|
{
|
|
return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
|
|
}
|
|
|
|
void __init add_dtb(u64 data)
|
|
{
|
|
initial_dtb = data + offsetof(struct setup_data, data);
|
|
}
|
|
|
|
/*
|
|
* CE4100 ids. Will be moved to machine_device_initcall() once we have it.
|
|
*/
|
|
static struct of_device_id __initdata ce4100_ids[] = {
|
|
{ .compatible = "intel,ce4100-cp", },
|
|
{ .compatible = "isa", },
|
|
{ .compatible = "pci", },
|
|
{},
|
|
};
|
|
|
|
static int __init add_bus_probe(void)
|
|
{
|
|
if (!of_have_populated_dt())
|
|
return 0;
|
|
|
|
return of_platform_bus_probe(NULL, ce4100_ids, NULL);
|
|
}
|
|
device_initcall(add_bus_probe);
|
|
|
|
#ifdef CONFIG_PCI
|
|
struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
|
|
{
|
|
struct device_node *np;
|
|
|
|
for_each_node_by_type(np, "pci") {
|
|
const void *prop;
|
|
unsigned int bus_min;
|
|
|
|
prop = of_get_property(np, "bus-range", NULL);
|
|
if (!prop)
|
|
continue;
|
|
bus_min = be32_to_cpup(prop);
|
|
if (bus->number == bus_min)
|
|
return np;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static int x86_of_pci_irq_enable(struct pci_dev *dev)
|
|
{
|
|
u32 virq;
|
|
int ret;
|
|
u8 pin;
|
|
|
|
ret = pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
|
|
if (ret)
|
|
return ret;
|
|
if (!pin)
|
|
return 0;
|
|
|
|
virq = of_irq_parse_and_map_pci(dev, 0, 0);
|
|
if (virq == 0)
|
|
return -EINVAL;
|
|
dev->irq = virq;
|
|
return 0;
|
|
}
|
|
|
|
static void x86_of_pci_irq_disable(struct pci_dev *dev)
|
|
{
|
|
}
|
|
|
|
void x86_of_pci_init(void)
|
|
{
|
|
pcibios_enable_irq = x86_of_pci_irq_enable;
|
|
pcibios_disable_irq = x86_of_pci_irq_disable;
|
|
}
|
|
#endif
|
|
|
|
static void __init dtb_setup_hpet(void)
|
|
{
|
|
#ifdef CONFIG_HPET_TIMER
|
|
struct device_node *dn;
|
|
struct resource r;
|
|
int ret;
|
|
|
|
dn = of_find_compatible_node(NULL, NULL, "intel,ce4100-hpet");
|
|
if (!dn)
|
|
return;
|
|
ret = of_address_to_resource(dn, 0, &r);
|
|
if (ret) {
|
|
WARN_ON(1);
|
|
return;
|
|
}
|
|
hpet_address = r.start;
|
|
#endif
|
|
}
|
|
|
|
static void __init dtb_lapic_setup(void)
|
|
{
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
struct device_node *dn;
|
|
struct resource r;
|
|
int ret;
|
|
|
|
dn = of_find_compatible_node(NULL, NULL, "intel,ce4100-lapic");
|
|
if (!dn)
|
|
return;
|
|
|
|
ret = of_address_to_resource(dn, 0, &r);
|
|
if (WARN_ON(ret))
|
|
return;
|
|
|
|
/* Did the boot loader setup the local APIC ? */
|
|
if (!cpu_has_apic) {
|
|
if (apic_force_enable(r.start))
|
|
return;
|
|
}
|
|
smp_found_config = 1;
|
|
pic_mode = 1;
|
|
register_lapic_address(r.start);
|
|
generic_processor_info(boot_cpu_physical_apicid,
|
|
GET_APIC_VERSION(apic_read(APIC_LVR)));
|
|
#endif
|
|
}
|
|
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
static unsigned int ioapic_id;
|
|
|
|
struct of_ioapic_type {
|
|
u32 out_type;
|
|
u32 trigger;
|
|
u32 polarity;
|
|
};
|
|
|
|
static struct of_ioapic_type of_ioapic_type[] =
|
|
{
|
|
{
|
|
.out_type = IRQ_TYPE_EDGE_RISING,
|
|
.trigger = IOAPIC_EDGE,
|
|
.polarity = 1,
|
|
},
|
|
{
|
|
.out_type = IRQ_TYPE_LEVEL_LOW,
|
|
.trigger = IOAPIC_LEVEL,
|
|
.polarity = 0,
|
|
},
|
|
{
|
|
.out_type = IRQ_TYPE_LEVEL_HIGH,
|
|
.trigger = IOAPIC_LEVEL,
|
|
.polarity = 1,
|
|
},
|
|
{
|
|
.out_type = IRQ_TYPE_EDGE_FALLING,
|
|
.trigger = IOAPIC_EDGE,
|
|
.polarity = 0,
|
|
},
|
|
};
|
|
|
|
static int dt_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
|
|
unsigned int nr_irqs, void *arg)
|
|
{
|
|
struct of_phandle_args *irq_data = (void *)arg;
|
|
struct of_ioapic_type *it;
|
|
struct irq_alloc_info tmp;
|
|
|
|
if (WARN_ON(irq_data->args_count < 2))
|
|
return -EINVAL;
|
|
if (irq_data->args[1] >= ARRAY_SIZE(of_ioapic_type))
|
|
return -EINVAL;
|
|
|
|
it = &of_ioapic_type[irq_data->args[1]];
|
|
ioapic_set_alloc_attr(&tmp, NUMA_NO_NODE, it->trigger, it->polarity);
|
|
tmp.ioapic_id = mpc_ioapic_id(mp_irqdomain_ioapic_idx(domain));
|
|
tmp.ioapic_pin = irq_data->args[0];
|
|
|
|
return mp_irqdomain_alloc(domain, virq, nr_irqs, &tmp);
|
|
}
|
|
|
|
static const struct irq_domain_ops ioapic_irq_domain_ops = {
|
|
.alloc = dt_irqdomain_alloc,
|
|
.free = mp_irqdomain_free,
|
|
.activate = mp_irqdomain_activate,
|
|
.deactivate = mp_irqdomain_deactivate,
|
|
};
|
|
|
|
static void __init dtb_add_ioapic(struct device_node *dn)
|
|
{
|
|
struct resource r;
|
|
int ret;
|
|
struct ioapic_domain_cfg cfg = {
|
|
.type = IOAPIC_DOMAIN_DYNAMIC,
|
|
.ops = &ioapic_irq_domain_ops,
|
|
.dev = dn,
|
|
};
|
|
|
|
ret = of_address_to_resource(dn, 0, &r);
|
|
if (ret) {
|
|
printk(KERN_ERR "Can't obtain address from node %s.\n",
|
|
dn->full_name);
|
|
return;
|
|
}
|
|
mp_register_ioapic(++ioapic_id, r.start, gsi_top, &cfg);
|
|
}
|
|
|
|
static void __init dtb_ioapic_setup(void)
|
|
{
|
|
struct device_node *dn;
|
|
|
|
for_each_compatible_node(dn, NULL, "intel,ce4100-ioapic")
|
|
dtb_add_ioapic(dn);
|
|
|
|
if (nr_ioapics) {
|
|
of_ioapic = 1;
|
|
return;
|
|
}
|
|
printk(KERN_ERR "Error: No information about IO-APIC in OF.\n");
|
|
}
|
|
#else
|
|
static void __init dtb_ioapic_setup(void) {}
|
|
#endif
|
|
|
|
static void __init dtb_apic_setup(void)
|
|
{
|
|
dtb_lapic_setup();
|
|
dtb_ioapic_setup();
|
|
}
|
|
|
|
#ifdef CONFIG_OF_FLATTREE
|
|
static void __init x86_flattree_get_config(void)
|
|
{
|
|
u32 size, map_len;
|
|
void *dt;
|
|
|
|
if (!initial_dtb)
|
|
return;
|
|
|
|
map_len = max(PAGE_SIZE - (initial_dtb & ~PAGE_MASK), (u64)128);
|
|
|
|
initial_boot_params = dt = early_memremap(initial_dtb, map_len);
|
|
size = of_get_flat_dt_size();
|
|
if (map_len < size) {
|
|
early_memunmap(dt, map_len);
|
|
initial_boot_params = dt = early_memremap(initial_dtb, size);
|
|
map_len = size;
|
|
}
|
|
|
|
unflatten_and_copy_device_tree();
|
|
early_memunmap(dt, map_len);
|
|
}
|
|
#else
|
|
static inline void x86_flattree_get_config(void) { }
|
|
#endif
|
|
|
|
void __init x86_dtb_init(void)
|
|
{
|
|
x86_flattree_get_config();
|
|
|
|
if (!of_have_populated_dt())
|
|
return;
|
|
|
|
dtb_setup_hpet();
|
|
dtb_apic_setup();
|
|
}
|