Skip to content

x86: Cleanups around slow_down_io() #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
blktests-ci wants to merge 1 commit into from
Closed

x86: Cleanups around slow_down_io() #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions arch/x86/include/asm/floppy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
#define CSW fd_routine[can_use_virtual_dma & 1]


#define fd_inb(base, reg) inb_p((base) + (reg))
#define fd_outb(value, base, reg) outb_p(value, (base) + (reg))

#define fd_request_dma() CSW._request_dma(FLOPPY_DMA, "floppy")
#define fd_free_dma() CSW._free_dma(FLOPPY_DMA)
#define fd_enable_irq() enable_irq(FLOPPY_IRQ)
Expand All @@ -49,6 +46,26 @@ static char *virtual_dma_addr;
static int virtual_dma_mode;
static int doing_pdma;

static inline u8 fd_inb(u16 base, u16 reg)
{
u8 ret = inb_p(base + reg);

native_io_delay();
native_io_delay();
native_io_delay();

return ret;
}

static inline void fd_outb(u8 value, u16 base, u16 reg)
{
outb_p(value, base + reg);

native_io_delay();
native_io_delay();
native_io_delay();
}

static irqreturn_t floppy_hardint(int irq, void *dev_id)
{
unsigned char st;
Expand Down Expand Up @@ -79,9 +96,9 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id)
if (st != (STATUS_DMA | STATUS_READY))
break;
if (virtual_dma_mode)
outb_p(*lptr, virtual_dma_port + FD_DATA);
fd_outb(*lptr, virtual_dma_port, FD_DATA);
else
*lptr = inb_p(virtual_dma_port + FD_DATA);
*lptr = fd_inb(virtual_dma_port, FD_DATA);
}
virtual_dma_count = lcount;
virtual_dma_addr = lptr;
Expand Down
2 changes: 0 additions & 2 deletions drivers/block/floppy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,6 @@
* Better audit of register_blkdev.
*/

#define REALLY_SLOW_IO

#define DEBUGT 2

#define DPRINT(format, args...) \
Expand Down