Skip to content

SWIM driver fixes

Finn Thain linux-block linuxppc-dev lkml stable 2 versions – Applied

Status from this message: I've picked up 3-10, thanks.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest10 patches 4 repliesApplied
  2. v112 patches 30 repliesSuperseded

Changes in v2 from the cover letter

- Dropped the two IOP patches as they aren't simple fixes. This way, the entire series is suitable for stable trees.
- Added Cc, Fixes, Acked-by and Reviewed-by tags.

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/10m68k/mac: Revisit floppy disc controller base addressesarch/m68k/include/asm/macintosh.h arch/m68k/mac/config.c+70 -640 replies
2/10m68k/mac: Fix SWIM memory resource end addressarch/m68k/mac/config.c+1 -11 reply
3/10m68k/mac: Don't remap SWIM MMIO regiondrivers/block/swim.c+3 -70 replies
4/10block/swim: Fix array bounds checkdrivers/block/swim.c+1 -10 replies
5/10block/swim: Remove extra put_disk() call from error pathdrivers/block/swim.c+0 -10 replies
6/10block/swim: Don't log an error message for an invalid ioctldrivers/block/swim.c+2 -70 replies
7/10block/swim: Rename macros to avoid inconsistent inverted logicdrivers/block/swim.c drivers/block/swim3.c+7 -70 replies
8/10block/swim: Check drive typedrivers/block/swim.c+4 -20 replies
9/10block/swim: Fix IO error at end of mediumdrivers/block/swim.c+8 -50 replies
10/10block/swim: Select appropriate drive on device opendrivers/block/swim.c+1 -10 replies

Reviews trailers per patch

All 10 patches have a Reviewed-by or Acked-by.

PatchStan JohnsonLaurent VivierGeert Uytterhoeven
1/10T-b A-b
2/10T-b A-b R-b
3/10T-b A-b
4/10T-b A-b R-b
5/10T-b A-b R-b
6/10T-b A-b R-b
7/10T-b A-b
8/10T-b A-b
9/10T-b A-b
10/10T-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v2 thread

Cover letter [PATCH v2 00/10] SWIM driver fixes

This patch series has fixes for bugs in the SWIM floppy disk controller driver, including an oops and a soft lockup.

One way to apply these patches to v4.14+ is by first cherry-picking these commits:
b87eaec27eca3def6c8ed617e3b1bac08d7bc715 e5f0d2e2a153b18dcf31e1a633e210c37829d759
There are of course other ways to fix the patch rejects, but this way would be convenient for me because it would simplify my own backporting.

Changes since v1:
- Dropped the two IOP patches as they aren't simple fixes. This way, the entire series is suitable for stable trees.
- Added Cc, Fixes, Acked-by and Reviewed-by tags.

Finn Thain (10):
m68k/mac: Revisit floppy disc controller base addresses m68k/mac: Fix SWIM memory resource end address m68k/mac: Don't remap SWIM MMIO region
block/swim: Fix array bounds check
block/swim: Remove extra put_disk() call from error path block/swim: Don't log an error message for an invalid ioctl block/swim: Rename macros to avoid inconsistent inverted logic block/swim: Check drive type
block/swim: Fix IO error at end of medium block/swim: Select appropriate drive on device open

 arch/m68k/include/asm/macintosh.h |  10 +--
 arch/m68k/mac/config.c            | 126 ++++++++++++++++++++------------------
 drivers/block/swim.c              |  49 +++++++--------
 drivers/block/swim3.c             |   6 +-
 4 files changed, 96 insertions(+), 95 deletions(-)
Signature · 1 line
2.16.1