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

Commit 35055996 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Allow floppy driver to build modular. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 69853918

arch/sparc64/kernel/irq.c

+0 −61
Original line number Diff line number Diff line
@@ -563,67 +563,6 @@ void handler_irq(int irq, struct pt_regs *regs) 
	irq_exit();

}



#ifdef CONFIG_BLK_DEV_FD

extern irqreturn_t floppy_interrupt(int, void *, struct pt_regs *);



/* XXX No easy way to include asm/floppy.h XXX */

extern unsigned char *pdma_vaddr;

extern unsigned long pdma_size;

extern volatile int doing_pdma;

extern unsigned long fdc_status;



irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie, struct pt_regs *regs)

{

	if (likely(doing_pdma)) {

		void __iomem *stat = (void __iomem *) fdc_status;

		unsigned char *vaddr = pdma_vaddr;

		unsigned long size = pdma_size;

		u8 val;



		while (size) {

			val = readb(stat);

			if (unlikely(!(val & 0x80))) {

				pdma_vaddr = vaddr;

				pdma_size = size;

				return IRQ_HANDLED;

			}

			if (unlikely(!(val & 0x20))) {

				pdma_vaddr = vaddr;

				pdma_size = size;

				doing_pdma = 0;

				goto main_interrupt;

			}

			if (val & 0x40) {

				/* read */

				*vaddr++ = readb(stat + 1);

			} else {

				unsigned char data = *vaddr++;



				/* write */

				writeb(data, stat + 1);

			}

			size--;

		}



		pdma_vaddr = vaddr;

		pdma_size = size;



		/* Send Terminal Count pulse to floppy controller. */

		val = readb(auxio_register);

		val |= AUXIO_AUX1_FTCNT;

		writeb(val, auxio_register);

		val &= ~AUXIO_AUX1_FTCNT;

		writeb(val, auxio_register);



		doing_pdma = 0;

	}



main_interrupt:

	return floppy_interrupt(irq, dev_cookie, regs);

}

EXPORT_SYMBOL(sparc_floppy_irq);

#endif



struct sun5_timer {

	u64	count0;

	u64	limit0;

include/asm-sparc64/floppy.h

+49 −1
Original line number Diff line number Diff line
@@ -208,7 +208,55 @@ static void sun_fd_enable_dma(void) 
	pdma_areasize = pdma_size;

}



extern irqreturn_t sparc_floppy_irq(int, void *, struct pt_regs *);

irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie, struct pt_regs *regs)

{

	if (likely(doing_pdma)) {

		void __iomem *stat = (void __iomem *) fdc_status;

		unsigned char *vaddr = pdma_vaddr;

		unsigned long size = pdma_size;

		u8 val;



		while (size) {

			val = readb(stat);

			if (unlikely(!(val & 0x80))) {

				pdma_vaddr = vaddr;

				pdma_size = size;

				return IRQ_HANDLED;

			}

			if (unlikely(!(val & 0x20))) {

				pdma_vaddr = vaddr;

				pdma_size = size;

				doing_pdma = 0;

				goto main_interrupt;

			}

			if (val & 0x40) {

				/* read */

				*vaddr++ = readb(stat + 1);

			} else {

				unsigned char data = *vaddr++;



				/* write */

				writeb(data, stat + 1);

			}

			size--;

		}



		pdma_vaddr = vaddr;

		pdma_size = size;



		/* Send Terminal Count pulse to floppy controller. */

		val = readb(auxio_register);

		val |= AUXIO_AUX1_FTCNT;

		writeb(val, auxio_register);

		val &= ~AUXIO_AUX1_FTCNT;

		writeb(val, auxio_register);



		doing_pdma = 0;

	}



main_interrupt:

	return floppy_interrupt(irq, dev_cookie, regs);

}



static int sun_fd_request_irq(void)

{