hpsim, initialize chip for assigned irqs

Currently, when assign_irq_vector is called and the irq connected in
the simulator, the irq is not ready. request_irq will return ENOSYS
immediately. It is because the irq chip is unset.

Hence set the chip properly to irq_type_hp_sim. And make sure this is
done from both users of simulated interrupts.

Also we have to set handler here, otherwise we end up in
handle_bad_int resulting in spam in logs and no irqs handled. We use
handle_simple_irq as these are SW interrupts that need no ACK or
anything.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 16 deletions

diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 47afcc61f6e5..e343357f80b9 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -129,17 +129,6 @@ netdev_probe(char *name, unsigned char *ether)
 
 
 static inline int
-netdev_connect(int irq)
-{
-        /* XXX Fix me
-         * this does not support multiple cards
-         * also no return value
-         */
-        ia64_ssc_connect_irq(NETWORK_INTR, irq);
-        return 0;
-}
-
-static inline int
 netdev_attach(int fd, int irq, unsigned int ipaddr)
 {
         /* this puts the host interface in the right mode (start interrupting) */
@@ -226,15 +215,13 @@ simeth_probe1(void)
                 return err;
         }
 
-        if ((rc = assign_irq_vector(AUTO_ASSIGN)) < 0)
-                panic("%s: out of interrupt vectors!\n", __func__);
-        dev->irq = rc;
-
         /*
          * attach the interrupt in the simulator, this does enable interrupts
          * until a netdev_attach() is called
          */
-        netdev_connect(dev->irq);
+        if ((rc = hpsim_get_irq(NETWORK_INTR)) < 0)
+                panic("%s: out of interrupt vectors!\n", __func__);
+        dev->irq = rc;
 
         printk(KERN_INFO "%s: hosteth=%s simfd=%d, HwAddr",
                dev->name, simeth_device, local->simfd);