floppy: prepare ARM code to simplify base address separation (fc0c5c0c) · Commits · 戴 / test

The fd_outb() macro on ARM relies on a special fd_setdor() macro when the register is FD_DOR and both will need to be changed to accept a separate base address. Let's just remerge them to simplify the change and make this code more easily reviewable. Link: https://lore.kernel.org/r/20200301195555.11154-4-w@1wt.eu Cc: Ian Molton <spyro@f2s.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by:

Willy Tarreau <w@1wt.eu> Signed-off-by:

Denis Efremov <efremov@linux.com> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

arch/arm/include/asm/floppy.h

+11 −16

Original line number	Diff line number	Diff line
		@@ -11,10 +11,15 @@

		#define fd_outb(val,port) \
		do { \
		if ((port) == (u32)FD_DOR) \
		fd_setdor((val)); \
		int new_val = (val); \
		if ((port) == (u32)FD_DOR) { \
		if (new_val & 0xf0) \
		new_val = (new_val & 0x0c) \| \
		floppy_selects[new_val & 3]; \
		else \
		outb((val),(port)); \
		new_val &= 0x0c; \
		} \
		outb(new_val, (port)); \
		} while(0)

		#define fd_inb(port) inb((port))
		@@ -52,16 +57,6 @@ static inline int fd_dma_setup(void *data, unsigned int length,
		*/
		static unsigned char floppy_selects[4] = { 0x10, 0x21, 0x23, 0x33 };

		#define fd_setdor(dor) \
		do { \
		int new_dor = (dor); \
		if (new_dor & 0xf0) \
		new_dor = (new_dor & 0x0c) \| floppy_selects[new_dor & 3]; \
		else \
		new_dor &= 0x0c; \
		outb(new_dor, FD_DOR); \
		} while (0)

		#define FDC1 (0x3f0)

		#define FLOPPY0_TYPE 4

Admin message