Skip to content

macintosh: Resolve various PMU driver problems

Finn Thain linuxppc-dev lkml 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest11 patches 10 repliesIn review
  2. v312 patches 6 repliesSuperseded
  3. v212 patches 14 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v111 patches8 repliesSuperseded

Changes in v4 from the cover letter

1) Rebased on v4.18-rc2.
2) Omitted patch 10/12, since these RTC changes now conflict with mainline. It will be reworked once the mainline m68k/powerpc RTC code stabilizes.

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/11macintosh/via-pmu: Fix section mismatch warningdrivers/macintosh/via-pmu.c+1 -13 replies
2/11macintosh/via-pmu: Add missing mmio accessorsdrivers/macintosh/via-pmu.c+5 -40 replies
3/11macintosh/via-pmu: Don't clear shift register interrupt flag twicedrivers/macintosh/via-pmu.c+0 -10 replies
4/11macintosh/via-pmu: Enhance state machine with new 'uninitialized' statedrivers/macintosh/via-pmu.c+22 -220 replies
5/11macintosh/via-pmu: Replace via pointer with via1 and via2 pointersdrivers/macintosh/via-pmu.c+69 -730 replies
6/11macintosh/via-pmu: Add support for m68k PowerBooksdrivers/macintosh/Kconfig drivers/macintosh/via-pmu.c+91 -120 replies
7/11macintosh/via-pmu: Explicitly specify CONFIG_PPC_PMAC dependenciesdrivers/macintosh/Kconfig+2 -20 replies
8/11macintosh/via-pmu68k: Don't load driver on unsupported hardwarearch/m68k/mac/misc.c drivers/macintosh/via-pmu68k.c include/uapi/linux/pmu.h+3 -91 reply
9/11macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driverarch/m68k/configs/mac_defconfig arch/m68k/configs/multi_defconfig arch/m68k/mac/config.c +6 more+14 -9045 replies
10/11macintosh/via-pmu: Clean up interrupt statisticsdrivers/macintosh/via-pmu.c+22 -170 replies
11/11macintosh/via-pmu: Disambiguate interrupt statisticsdrivers/macintosh/via-pmu.c+12 -80 replies

Reviews trailers per patch

6 of 11 patches have a Reviewed-by or Acked-by.

PatchStan JohnsonGeert UytterhoevenMichael Schmitz
SeriesT-b
1/11T-b R-b
2/11T-b R-b
3/11T-b R-b
4/11T-b
5/11T-b
6/11T-b
7/11T-b
8/11A-b R-b
9/11T-b A-b R-b A-b
10/11T-b R-b
11/11T-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 v4 thread

Cover letter [PATCH v4 00/11] macintosh: Resolve various PMU driver problems

This series of patches has the following aims.

1) Eliminate duplicated code. Linux presently has two drivers for the 68HC05-based PMU devices found in Macs: via-pmu and via-pmu68k. There's no value in having separate PMU drivers for each architecture.

2) Avoid further work on via-pmu68k that's not needed for via-pmu.

3) Fix some bugs in the via-pmu driver.

4) Enable the /dev/pmu and /proc/pmu/* userspace APIs on m68k Macs by adopting via-pmu.

5) Improve stability on early 100-series PowerBooks by loading no PMU driver at all. Neither via-pmu nor via-pmu68k supports the early M50753-based PMU device found in these models.

6) Assist the out-of-tree NuBus PowerMac port to support PMU designs shared with the m68k Mac port (e.g. PowerBooks 190 and 5300).

This patch series has been regression tested on various PowerBooks (190, 520, 3400, Pismo G3) and PowerMacs (Beige G3, G5). These patches did not affect userland utilities. (Note that there is a userland- visible change to the contents of /proc/pmu/interrupts.)

Changed since v1:
1) Added blank lines after 'break' statements in patch 10.
2) Improved patch description for patch 3.
3) Added reviewed-by tags.
4) Split patch 8 to make code review easier.

Changed since v2:
1) Added reviewed-by tag.
2) Retained PMU_68K_V1 and PMU_68K_V2 symbols.

Changed since v3:
1) Rebased on v4.18-rc2.
2) Omitted patch 10/12, since these RTC changes now conflict with mainline. It will be reworked once the mainline m68k/powerpc RTC code stabilizes.

Finn Thain (11):
macintosh/via-pmu: Fix section mismatch warning macintosh/via-pmu: Add missing mmio accessors macintosh/via-pmu: Don't clear shift register interrupt flag twice macintosh/via-pmu: Enhance state machine with new 'uninitialized'
state
macintosh/via-pmu: Replace via pointer with via1 and via2 pointers macintosh/via-pmu: Add support for m68k PowerBooks macintosh/via-pmu: Explicitly specify CONFIG_PPC_PMAC dependencies macintosh/via-pmu68k: Don't load driver on unsupported hardware macintosh/via-pmu: Replace via-pmu68k driver with via-pmu driver macintosh/via-pmu: Clean up interrupt statistics macintosh/via-pmu: Disambiguate interrupt statistics

 arch/m68k/configs/mac_defconfig   |   2 +-
 arch/m68k/configs/multi_defconfig |   2 +-
 arch/m68k/mac/config.c            |   2 +-
 arch/m68k/mac/misc.c              |  54 +--
 drivers/macintosh/Kconfig         |  19 +-
 drivers/macintosh/Makefile        |   1 -
 drivers/macintosh/adb.c           |   2 +-
 drivers/macintosh/via-pmu.c       | 346 ++++++++++------
 drivers/macintosh/via-pmu68k.c    | 850 --------------------------------------
 include/uapi/linux/pmu.h          |   4 +-
 10 files changed, 235 insertions(+), 1047 deletions(-)
 delete mode 100644 drivers/macintosh/via-pmu68k.c
Signature · 1 line
2.16.4