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

Commit 97754e3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux 

Pull powerpc fixes from Michael Ellerman:
 - Fix for dynticks.
 - Fix for smpboot bug.
 - Fix for IOMMU group refcounting.

* tag 'powerpc-4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/iommu: Remove IOMMU device references via bus notifier
  powerpc/smp: Wait until secondaries are active & online
  powerpc: Re-enable dynticks
parents a6c5170d 4ad04e59

arch/powerpc/include/asm/iommu.h

+6 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ extern void iommu_register_group(struct iommu_table *tbl, 
				 int pci_domain_number, unsigned long pe_num);

extern int iommu_add_device(struct device *dev);

extern void iommu_del_device(struct device *dev);

extern int __init tce_iommu_bus_notifier_init(void);

#else

static inline void iommu_register_group(struct iommu_table *tbl,

					int pci_domain_number,
@@ -128,6 +129,11 @@ static inline int iommu_add_device(struct device *dev) 
static inline void iommu_del_device(struct device *dev)

{

}



static inline int __init tce_iommu_bus_notifier_init(void)

{

        return 0;

}

#endif /* !CONFIG_IOMMU_API */



static inline void set_iommu_table_base_and_group(struct device *dev,

arch/powerpc/include/asm/irq_work.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_IRQ_WORK_H

#define _ASM_POWERPC_IRQ_WORK_H



static inline bool arch_irq_work_has_interrupt(void)

{

	return true;

}



#endif /* _ASM_POWERPC_IRQ_WORK_H */

arch/powerpc/kernel/iommu.c

+26 −0
Original line number Diff line number Diff line
@@ -1175,4 +1175,30 @@ void iommu_del_device(struct device *dev) 
}

EXPORT_SYMBOL_GPL(iommu_del_device);



static int tce_iommu_bus_notifier(struct notifier_block *nb,

                unsigned long action, void *data)

{

        struct device *dev = data;



        switch (action) {

        case BUS_NOTIFY_ADD_DEVICE:

                return iommu_add_device(dev);

        case BUS_NOTIFY_DEL_DEVICE:

                if (dev->iommu_group)

                        iommu_del_device(dev);

                return 0;

        default:

                return 0;

        }

}



static struct notifier_block tce_iommu_bus_nb = {

        .notifier_call = tce_iommu_bus_notifier,

};



int __init tce_iommu_bus_notifier_init(void)

{

        bus_register_notifier(&pci_bus_type, &tce_iommu_bus_nb);

        return 0;

}

#endif /* CONFIG_IOMMU_API */

arch/powerpc/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -541,8 +541,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) 
	if (smp_ops->give_timebase)

		smp_ops->give_timebase();



	/* Wait until cpu puts itself in the online map */

	while (!cpu_online(cpu))

	/* Wait until cpu puts itself in the online & active maps */

	while (!cpu_online(cpu) || !cpu_active(cpu))

		cpu_relax();



	return 0;

arch/powerpc/platforms/powernv/pci.c

+0 −26
Original line number Diff line number Diff line
@@ -836,30 +836,4 @@ void __init pnv_pci_init(void) 
#endif

}



static int tce_iommu_bus_notifier(struct notifier_block *nb,

		unsigned long action, void *data)

{

	struct device *dev = data;



	switch (action) {

	case BUS_NOTIFY_ADD_DEVICE:

		return iommu_add_device(dev);

	case BUS_NOTIFY_DEL_DEVICE:

		if (dev->iommu_group)

			iommu_del_device(dev);

		return 0;

	default:

		return 0;

	}

}



static struct notifier_block tce_iommu_bus_nb = {

	.notifier_call = tce_iommu_bus_notifier,

};



static int __init tce_iommu_bus_notifier_init(void)

{

	bus_register_notifier(&pci_bus_type, &tce_iommu_bus_nb);

	return 0;

}

machine_subsys_initcall_sync(powernv, tce_iommu_bus_notifier_init);