2020-03-16 10:48:09

by Denis Efremov (Oracle)

[permalink] [raw]
Subject: [GIT PULL] Floppy cleanups for next

Hi Jens,

The following changes since commit 5d50c8f405bf91d9d9a48628fde0f2f4ff069d7b:

Merge branch 'for-5.7/io_uring' into for-next (2020-03-14 17:20:45 -0600)

are available in the Git repository at:

https://github.com/evdenis/linux-floppy tags/floppy-for-5.7

Please pull

----------------------------------------------------------------
Floppy patches for 5.7

Cleanups from Willy Tarreau:
- expansion of macros referencing global or local variables with
equivalent code
- removal of incomplete support for second FDC from ARM code
- renaming the "fdc" global variable to "current_fdc" to differ
between global and local context

Changes were compile tested on arm, x86 arches. Changes introduce
no binary difference on x86 arch (before and after the patches).
On arm, incomplete support for second FDC removed. This set of
patches with commit 2e90ca68 ("floppy: check FDC index for errors
before assigning it") was tested with syzkaller and simple
write/read/format tests for no new issues.

Signed-off-by: Denis Efremov <[email protected]>

----------------------------------------------------------------
Willy Tarreau (16):
floppy: cleanup: expand macro FDCS
floppy: cleanup: expand macro UFDCS
floppy: cleanup: expand macro UDP
floppy: cleanup: expand macro UDRS
floppy: cleanup: expand macro UDRWE
floppy: cleanup: expand macro DP
floppy: cleanup: expand macro DRS
floppy: cleanup: expand macro DRWE
floppy: cleanup: expand the R/W / format command macros
floppy: cleanup: expand the reply_buffer macros
floppy: remove dead code for drives scanning on ARM
floppy: remove incomplete support for second FDC from ARM code
floppy: prepare ARM code to simplify base address separation
floppy: introduce new functions fdc_inb() and fdc_outb()
floppy: separate the FDC's base address from its registers
floppy: rename the global "fdc" variable to "current_fdc"

arch/arm/include/asm/floppy.h | 88 +----
drivers/block/floppy.c | 1093 +++++++++++++++++++++++++++++++----------------------------
include/uapi/linux/fdreg.h | 18 +-
3 files changed, 586 insertions(+), 613 deletions(-)


2020-03-16 15:09:32

by Jens Axboe

[permalink] [raw]
Subject: Re: [GIT PULL] Floppy cleanups for next

On 3/16/20 4:47 AM, Denis Efremov wrote:
> Hi Jens,
>
> The following changes since commit 5d50c8f405bf91d9d9a48628fde0f2f4ff069d7b:
>
> Merge branch 'for-5.7/io_uring' into for-next (2020-03-14 17:20:45 -0600)
>
> are available in the Git repository at:
>
> https://github.com/evdenis/linux-floppy tags/floppy-for-5.7
>
> Please pull
>
> ----------------------------------------------------------------
> Floppy patches for 5.7
>
> Cleanups from Willy Tarreau:
> - expansion of macros referencing global or local variables with
> equivalent code
> - removal of incomplete support for second FDC from ARM code
> - renaming the "fdc" global variable to "current_fdc" to differ
> between global and local context
>
> Changes were compile tested on arm, x86 arches. Changes introduce
> no binary difference on x86 arch (before and after the patches).
> On arm, incomplete support for second FDC removed. This set of
> patches with commit 2e90ca68 ("floppy: check FDC index for errors
> before assigning it") was tested with syzkaller and simple
> write/read/format tests for no new issues.
>
> Signed-off-by: Denis Efremov <[email protected]>

Thanks - I hand applied the series, my for-next branch isn't really
stable, only the parent branches are.

--
Jens Axboe

2020-05-12 15:27:06

by Jens Axboe

[permalink] [raw]
Subject: Re: [GIT PULL] Floppy cleanups for next

On 5/12/20 8:28 AM, Denis Efremov wrote:
> Hi Jens,
>
> The following changes since commit 2ef96a5bb12be62ef75b5828c0aab838ebb29cb8:
>
> Linux 5.7-rc5 (2020-05-10 15:16:58 -0700)
>
> are available in the Git repository at:
>
> https://github.com/evdenis/linux-floppy tags/floppy-for-5.8

Denis, can you rebase on my for-5.8/drivers branch? If I pull this,
I'm going to get a lot of unrelated changes as well. Alternatively,
I can pull and spit out the patches, and apply those. Either way
works for me.

--
Jens Axboe