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

Commit abdba717 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Add linux/pagemap.h to asm/tlb.h
  [SPARC64]: Need to set state to IDLE during sun4v IRQ enable.
  [SPARC64]: Fix VIRQ enabling.
  [SPARC64]: Add irqs to mdesc_node.
parents 2d408b42 9f462a1a

arch/sparc64/kernel/irq.c

+11 −1
Original line number Diff line number Diff line
@@ -329,6 +329,10 @@ static void sun4v_irq_enable(unsigned int virt_irq) 
		if (err != HV_EOK)

			printk("sun4v_intr_settarget(%x,%lu): err(%d)\n",

			       ino, cpuid, err);

		err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE);

		if (err != HV_EOK)

			printk("sun4v_intr_setstate(%x): "

			       "err(%d)\n", ino, err);

		err = sun4v_intr_setenabled(ino, HV_INTR_ENABLED);

		if (err != HV_EOK)

			printk("sun4v_intr_setenabled(%x): err(%d)\n",
@@ -400,6 +404,12 @@ static void sun4v_virq_enable(unsigned int virt_irq) 
			       "err(%d)\n",

			       dev_handle, dev_ino, cpuid, err);

		err = sun4v_vintr_set_state(dev_handle, dev_ino,

					    HV_INTR_STATE_IDLE);

		if (err != HV_EOK)

			printk("sun4v_vintr_set_state(%lx,%lx,"

				"HV_INTR_STATE_IDLE): err(%d)\n",

			       dev_handle, dev_ino, err);

		err = sun4v_vintr_set_valid(dev_handle, dev_ino,

					    HV_INTR_ENABLED);

		if (err != HV_EOK)

			printk("sun4v_vintr_set_state(%lx,%lx,"
@@ -420,7 +430,7 @@ static void sun4v_virq_disable(unsigned int virt_irq) 
		dev_handle = ino & IMAP_IGN;

		dev_ino = ino & IMAP_INO;



		err = sun4v_vintr_set_state(dev_handle, dev_ino,

		err = sun4v_vintr_set_valid(dev_handle, dev_ino,

					    HV_INTR_DISABLED);

		if (err != HV_EOK)

			printk("sun4v_vintr_set_state(%lx,%lx,"

include/asm-sparc64/mdesc.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct mdesc_node { 
	u64			node;

	unsigned int		unique_id;

	unsigned int		num_arcs;

	unsigned int		irqs[2];

	struct property		*properties;

	struct mdesc_node	*hash_next;

	struct mdesc_node	*allnodes_next;

include/asm-sparc64/tlb.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _SPARC64_TLB_H



#include <linux/swap.h>

#include <linux/pagemap.h>

#include <asm/pgalloc.h>

#include <asm/tlbflush.h>

#include <asm/mmu_context.h>