Skip to content

L
linux
Commit aca21de2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'm68k-for-v4.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

  - first part of an overhaul of the NuBus subsystem, to bring it up to
    modern driver model standards

  - a race condition fix for Mac

  - defconfig updates

* tag 'm68k-for-v4.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  MAINTAINERS: Add NuBus subsystem entry
  m68k/mac: Fix race conditions in OSS interrupt dispatch
  nubus: Add support for the driver model
  nubus: Add expansion_type values for various Mac models
  nubus: Adopt standard linked list implementation
  nubus: Rename struct nubus_dev
  nubus: Rework /proc/bus/nubus/s/ implementation
  nubus: Generalize block resource handling
  nubus: Clean up whitespace
  nubus: Remove redundant code
  nubus: Call proc_mkdir() not more than once per slot directory
  nubus: Validate slot resource IDs
  nubus: Fix log spam
  nubus: Use static functions where possible
  nubus: Fix up header split
  nubus: Avoid array underflow and overflow
  m68k/defconfig: Update defconfigs for v4.15-rc1
parents 31466f3e 2334b1ac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 833 additions and 651 deletions
MAINTAINERS
View file @ aca21de2
...@@ -9757,6 +9757,15 @@ S: Supported ...@@ -9757,6 +9757,15 @@ S: Supported
F: Documentation/filesystems/ntfs.txt F: Documentation/filesystems/ntfs.txt
F: fs/ntfs/ F: fs/ntfs/
NUBUS SUBSYSTEM
M: Finn Thain <fthain@telegraphics.com.au>
L: linux-m68k@lists.linux-m68k.org
S: Maintained
F: arch/*/include/asm/nubus.h
F: drivers/nubus/
F: include/linux/nubus.h
F: include/uapi/linux/nubus.h
NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
M: Antonino Daplas <adaplas@gmail.com> M: Antonino Daplas <adaplas@gmail.com>
L: linux-fbdev@vger.kernel.org L: linux-fbdev@vger.kernel.org
......
arch/m68k/configs/amiga_defconfig
View file @ aca21de2
...@@ -454,7 +454,6 @@ CONFIG_PPS_CLIENT_LDISC=m ...@@ -454,7 +454,6 @@ CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m CONFIG_PPS_CLIENT_PARPORT=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_CIRRUS=y CONFIG_FB_CIRRUS=y
CONFIG_FB_AMIGA=y CONFIG_FB_AMIGA=y
...@@ -595,6 +594,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -595,6 +594,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -624,6 +624,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -624,6 +624,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -653,3 +654,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -653,3 +654,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/apollo_defconfig
View file @ aca21de2
...@@ -422,7 +422,6 @@ CONFIG_NTP_PPS=y ...@@ -422,7 +422,6 @@ CONFIG_NTP_PPS=y
CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_FB=y CONFIG_FB=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y CONFIG_LOGO=y
...@@ -554,6 +553,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -554,6 +553,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -583,6 +583,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -583,6 +583,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -612,3 +613,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -612,3 +613,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/atari_defconfig
View file @ aca21de2
...@@ -437,7 +437,6 @@ CONFIG_PPS_CLIENT_LDISC=m ...@@ -437,7 +437,6 @@ CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m CONFIG_PPS_CLIENT_PARPORT=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_ATARI=y CONFIG_FB_ATARI=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
...@@ -576,6 +575,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -576,6 +575,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -605,6 +605,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -605,6 +605,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -634,3 +635,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -634,3 +635,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/bvme6000_defconfig
View file @ aca21de2
...@@ -420,7 +420,6 @@ CONFIG_NTP_PPS=y ...@@ -420,7 +420,6 @@ CONFIG_NTP_PPS=y
CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_HID=m CONFIG_HID=m
CONFIG_HIDRAW=y CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
...@@ -546,6 +545,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -546,6 +545,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -575,6 +575,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -575,6 +575,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -604,3 +605,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -604,3 +605,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/hp300_defconfig
View file @ aca21de2
...@@ -425,7 +425,6 @@ CONFIG_NTP_PPS=y ...@@ -425,7 +425,6 @@ CONFIG_NTP_PPS=y
CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_FB=y CONFIG_FB=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y CONFIG_LOGO=y
...@@ -556,6 +555,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -556,6 +555,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -585,6 +585,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -585,6 +585,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -614,3 +615,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -614,3 +615,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/mac_defconfig
View file @ aca21de2
...@@ -447,7 +447,6 @@ CONFIG_NTP_PPS=y ...@@ -447,7 +447,6 @@ CONFIG_NTP_PPS=y
CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_VALKYRIE=y CONFIG_FB_VALKYRIE=y
CONFIG_FB_MAC=y CONFIG_FB_MAC=y
...@@ -578,6 +577,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -578,6 +577,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -607,6 +607,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -607,6 +607,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -636,3 +637,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -636,3 +637,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/multi_defconfig
View file @ aca21de2
...@@ -504,7 +504,6 @@ CONFIG_PPS_CLIENT_LDISC=m ...@@ -504,7 +504,6 @@ CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m CONFIG_PPS_CLIENT_PARPORT=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_CIRRUS=y CONFIG_FB_CIRRUS=y
CONFIG_FB_AMIGA=y CONFIG_FB_AMIGA=y
...@@ -658,6 +657,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -658,6 +657,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -687,6 +687,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -687,6 +687,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -716,3 +717,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -716,3 +717,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/mvme147_defconfig
View file @ aca21de2
...@@ -420,7 +420,6 @@ CONFIG_NTP_PPS=y ...@@ -420,7 +420,6 @@ CONFIG_NTP_PPS=y
CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_HID=m CONFIG_HID=m
CONFIG_HIDRAW=y CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
...@@ -546,6 +545,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -546,6 +545,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -575,6 +575,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -575,6 +575,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -604,3 +605,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -604,3 +605,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/mvme16x_defconfig
View file @ aca21de2
...@@ -420,7 +420,6 @@ CONFIG_NTP_PPS=y ...@@ -420,7 +420,6 @@ CONFIG_NTP_PPS=y
CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_HID=m CONFIG_HID=m
CONFIG_HIDRAW=y CONFIG_HIDRAW=y
CONFIG_UHID=m CONFIG_UHID=m
...@@ -546,6 +545,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -546,6 +545,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -575,6 +575,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -575,6 +575,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -604,3 +605,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -604,3 +605,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/q40_defconfig
View file @ aca21de2
...@@ -437,7 +437,6 @@ CONFIG_PPS_CLIENT_LDISC=m ...@@ -437,7 +437,6 @@ CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m CONFIG_PPS_CLIENT_PARPORT=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_FB=y CONFIG_FB=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y CONFIG_LOGO=y
...@@ -569,6 +568,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -569,6 +568,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -598,6 +598,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -598,6 +598,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -627,3 +628,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -627,3 +628,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/sun3_defconfig
View file @ aca21de2
...@@ -419,7 +419,6 @@ CONFIG_NTP_PPS=y ...@@ -419,7 +419,6 @@ CONFIG_NTP_PPS=y
CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_FB=y CONFIG_FB=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y CONFIG_LOGO=y
...@@ -548,6 +547,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -548,6 +547,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -576,6 +576,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -576,6 +576,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -605,3 +606,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -605,3 +606,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/configs/sun3x_defconfig
View file @ aca21de2
...@@ -419,7 +419,6 @@ CONFIG_NTP_PPS=y ...@@ -419,7 +419,6 @@ CONFIG_NTP_PPS=y
CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK=m
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_RC_CORE is not set
CONFIG_FB=y CONFIG_FB=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y CONFIG_LOGO=y
...@@ -548,6 +547,7 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -548,6 +547,7 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_HASH=m CONFIG_TEST_HASH=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_FIND_BIT=m
CONFIG_TEST_FIRMWARE=m CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_SYSCTL=m CONFIG_TEST_SYSCTL=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
...@@ -577,6 +577,7 @@ CONFIG_CRYPTO_RMD256=m ...@@ -577,6 +577,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -606,3 +607,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m ...@@ -606,3 +607,4 @@ CONFIG_CRYPTO_USER_API_AEAD=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m
arch/m68k/include/asm/macintosh.h
View file @ aca21de2
...@@ -33,7 +33,7 @@ struct mac_model ...@@ -33,7 +33,7 @@ struct mac_model
char ide_type; char ide_type;
char scc_type; char scc_type;
char ether_type; char ether_type;
char nubus_type; char expansion_type;
char floppy_type; char floppy_type;
}; };
...@@ -73,8 +73,11 @@ struct mac_model ...@@ -73,8 +73,11 @@ struct mac_model
#define MAC_ETHER_SONIC 1 #define MAC_ETHER_SONIC 1
#define MAC_ETHER_MACE 2 #define MAC_ETHER_MACE 2
#define MAC_NO_NUBUS 0 #define MAC_EXP_NONE 0
#define MAC_NUBUS 1 #define MAC_EXP_PDS 1 /* Accepts only a PDS card */
#define MAC_EXP_NUBUS 2 /* Accepts only NuBus card(s) */
#define MAC_EXP_PDS_NUBUS 3 /* Accepts PDS card and/or NuBus card(s) */
#define MAC_EXP_PDS_COMM 4 /* Accepts PDS card or Comm Slot card */
#define MAC_FLOPPY_IWM 0 #define MAC_FLOPPY_IWM 0
#define MAC_FLOPPY_SWIM_ADDR1 1 #define MAC_FLOPPY_SWIM_ADDR1 1
......
arch/m68k/mac/config.c
View file @ aca21de2
This diff is collapsed.
arch/m68k/mac/oss.c
View file @ aca21de2
...@@ -53,56 +53,41 @@ void __init oss_init(void) ...@@ -53,56 +53,41 @@ void __init oss_init(void)
} }
/* /*
* Handle miscellaneous OSS interrupts. * Handle OSS interrupts.
* XXX how do you clear a pending IRQ? is it even necessary?
*/ */
static void oss_irq(struct irq_desc *desc) static void oss_iopism_irq(struct irq_desc *desc)
{ {
int events = oss->irq_pending & generic_handle_irq(IRQ_MAC_ADB);
(OSS_IP_IOPSCC | OSS_IP_SCSI | OSS_IP_IOPISM);
if (events & OSS_IP_IOPSCC) {
oss->irq_pending &= ~OSS_IP_IOPSCC;
generic_handle_irq(IRQ_MAC_SCC);
}
if (events & OSS_IP_SCSI) {
oss->irq_pending &= ~OSS_IP_SCSI;
generic_handle_irq(IRQ_MAC_SCSI);
}
if (events & OSS_IP_IOPISM) {
oss->irq_pending &= ~OSS_IP_IOPISM;
generic_handle_irq(IRQ_MAC_ADB);
}
} }
/* static void oss_scsi_irq(struct irq_desc *desc)
* Nubus IRQ handler, OSS style {
* generic_handle_irq(IRQ_MAC_SCSI);
* Unlike the VIA/RBV this is on its own autovector interrupt level. }
*/
static void oss_nubus_irq(struct irq_desc *desc) static void oss_nubus_irq(struct irq_desc *desc)
{ {
int events, irq_bit, i; u16 events, irq_bit;
int irq_num;
events = oss->irq_pending & OSS_IP_NUBUS; events = oss->irq_pending & OSS_IP_NUBUS;
if (!events) irq_num = NUBUS_SOURCE_BASE + 5;
return; irq_bit = OSS_IP_NUBUS5;
/* There are only six slots on the OSS, not seven */
i = 6;
irq_bit = 0x40;
do { do {
--i;
irq_bit >>= 1;
if (events & irq_bit) { if (events & irq_bit) {
oss->irq_pending &= ~irq_bit; events &= ~irq_bit;
generic_handle_irq(NUBUS_SOURCE_BASE + i); generic_handle_irq(irq_num);
} }
} while(events & (irq_bit - 1)); --irq_num;
irq_bit >>= 1;
} while (events);
}
static void oss_iopscc_irq(struct irq_desc *desc)
{
generic_handle_irq(IRQ_MAC_SCC);
} }
/* /*
...@@ -122,14 +107,14 @@ static void oss_nubus_irq(struct irq_desc *desc) ...@@ -122,14 +107,14 @@ static void oss_nubus_irq(struct irq_desc *desc)
void __init oss_register_interrupts(void) void __init oss_register_interrupts(void)
{ {
irq_set_chained_handler(OSS_IRQLEV_IOPISM, oss_irq); irq_set_chained_handler(OSS_IRQLEV_IOPISM, oss_iopism_irq);
irq_set_chained_handler(OSS_IRQLEV_SCSI, oss_irq); irq_set_chained_handler(OSS_IRQLEV_SCSI, oss_scsi_irq);
irq_set_chained_handler(OSS_IRQLEV_NUBUS, oss_nubus_irq); irq_set_chained_handler(OSS_IRQLEV_NUBUS, oss_nubus_irq);
irq_set_chained_handler(OSS_IRQLEV_IOPSCC, oss_irq); irq_set_chained_handler(OSS_IRQLEV_IOPSCC, oss_iopscc_irq);
irq_set_chained_handler(OSS_IRQLEV_VIA1, via1_irq); irq_set_chained_handler(OSS_IRQLEV_VIA1, via1_irq);
/* OSS_VIA1 gets enabled here because it has no machspec interrupt. */ /* OSS_VIA1 gets enabled here because it has no machspec interrupt. */
oss->irq_level[OSS_VIA1] = IRQ_AUTO_6; oss->irq_level[OSS_VIA1] = OSS_IRQLEV_VIA1;
} }
/* /*
......
drivers/net/ethernet/8390/mac8390.c
View file @ aca21de2
...@@ -123,7 +123,8 @@ enum mac8390_access { ...@@ -123,7 +123,8 @@ enum mac8390_access {
}; };
extern int mac8390_memtest(struct net_device *dev); extern int mac8390_memtest(struct net_device *dev);
static int mac8390_initdev(struct net_device *dev, struct nubus_dev *ndev, static int mac8390_initdev(struct net_device *dev,
struct nubus_rsrc *ndev,
enum mac8390_type type); enum mac8390_type type);
static int mac8390_open(struct net_device *dev); static int mac8390_open(struct net_device *dev);
...@@ -169,11 +170,11 @@ static void word_memcpy_tocard(unsigned long tp, const void *fp, int count); ...@@ -169,11 +170,11 @@ static void word_memcpy_tocard(unsigned long tp, const void *fp, int count);
static void word_memcpy_fromcard(void *tp, unsigned long fp, int count); static void word_memcpy_fromcard(void *tp, unsigned long fp, int count);
static u32 mac8390_msg_enable; static u32 mac8390_msg_enable;
static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev) static enum mac8390_type __init mac8390_ident(struct nubus_rsrc *fres)
{ {
switch (dev->dr_sw) { switch (fres->dr_sw) {
case NUBUS_DRSW_3COM: case NUBUS_DRSW_3COM:
switch (dev->dr_hw) { switch (fres->dr_hw) {
case NUBUS_DRHW_APPLE_SONIC_NB: case NUBUS_DRHW_APPLE_SONIC_NB:
case NUBUS_DRHW_APPLE_SONIC_LC: case NUBUS_DRHW_APPLE_SONIC_LC:
case NUBUS_DRHW_SONNET: case NUBUS_DRHW_SONNET:
...@@ -184,7 +185,7 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev) ...@@ -184,7 +185,7 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
break; break;
case NUBUS_DRSW_APPLE: case NUBUS_DRSW_APPLE:
switch (dev->dr_hw) { switch (fres->dr_hw) {
case NUBUS_DRHW_ASANTE_LC: case NUBUS_DRHW_ASANTE_LC:
return MAC8390_NONE; return MAC8390_NONE;
case NUBUS_DRHW_CABLETRON: case NUBUS_DRHW_CABLETRON:
...@@ -201,7 +202,7 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev) ...@@ -201,7 +202,7 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
case NUBUS_DRSW_TECHWORKS: case NUBUS_DRSW_TECHWORKS:
case NUBUS_DRSW_DAYNA2: case NUBUS_DRSW_DAYNA2:
case NUBUS_DRSW_DAYNA_LC: case NUBUS_DRSW_DAYNA_LC:
if (dev->dr_hw == NUBUS_DRHW_CABLETRON) if (fres->dr_hw == NUBUS_DRHW_CABLETRON)
return MAC8390_CABLETRON; return MAC8390_CABLETRON;
else else
return MAC8390_APPLE; return MAC8390_APPLE;
...@@ -212,7 +213,7 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev) ...@@ -212,7 +213,7 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
break; break;
case NUBUS_DRSW_KINETICS: case NUBUS_DRSW_KINETICS:
switch (dev->dr_hw) { switch (fres->dr_hw) {
case NUBUS_DRHW_INTERLAN: case NUBUS_DRHW_INTERLAN:
return MAC8390_INTERLAN; return MAC8390_INTERLAN;
default: default:
...@@ -225,8 +226,8 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev) ...@@ -225,8 +226,8 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
* These correspond to Dayna Sonic cards * These correspond to Dayna Sonic cards
* which use the macsonic driver * which use the macsonic driver
*/ */
if (dev->dr_hw == NUBUS_DRHW_SMC9194 || if (fres->dr_hw == NUBUS_DRHW_SMC9194 ||
dev->dr_hw == NUBUS_DRHW_INTERLAN) fres->dr_hw == NUBUS_DRHW_INTERLAN)
return MAC8390_NONE; return MAC8390_NONE;
else else
return MAC8390_DAYNA; return MAC8390_DAYNA;
...@@ -289,7 +290,8 @@ static int __init mac8390_memsize(unsigned long membase) ...@@ -289,7 +290,8 @@ static int __init mac8390_memsize(unsigned long membase)
return i * 0x1000; return i * 0x1000;
} }
static bool __init mac8390_init(struct net_device *dev, struct nubus_dev *ndev, static bool __init mac8390_init(struct net_device *dev,
struct nubus_rsrc *ndev,
enum mac8390_type cardtype) enum mac8390_type cardtype)
{ {
struct nubus_dir dir; struct nubus_dir dir;
...@@ -394,7 +396,7 @@ static bool __init mac8390_init(struct net_device *dev, struct nubus_dev *ndev, ...@@ -394,7 +396,7 @@ static bool __init mac8390_init(struct net_device *dev, struct nubus_dev *ndev,
struct net_device * __init mac8390_probe(int unit) struct net_device * __init mac8390_probe(int unit)
{ {
struct net_device *dev; struct net_device *dev;
struct nubus_dev *ndev = NULL; struct nubus_rsrc *ndev = NULL;
int err = -ENODEV; int err = -ENODEV;
struct ei_device *ei_local; struct ei_device *ei_local;
...@@ -414,8 +416,11 @@ struct net_device * __init mac8390_probe(int unit) ...@@ -414,8 +416,11 @@ struct net_device * __init mac8390_probe(int unit)
if (unit >= 0) if (unit >= 0)
sprintf(dev->name, "eth%d", unit); sprintf(dev->name, "eth%d", unit);
while ((ndev = nubus_find_type(NUBUS_CAT_NETWORK, NUBUS_TYPE_ETHERNET, for_each_func_rsrc(ndev) {
ndev))) { if (ndev->category != NUBUS_CAT_NETWORK ||
ndev->type != NUBUS_TYPE_ETHERNET)
continue;
/* Have we seen it already? */ /* Have we seen it already? */
if (slots & (1 << ndev->board->slot)) if (slots & (1 << ndev->board->slot))
continue; continue;
...@@ -489,7 +494,7 @@ static const struct net_device_ops mac8390_netdev_ops = { ...@@ -489,7 +494,7 @@ static const struct net_device_ops mac8390_netdev_ops = {
}; };
static int __init mac8390_initdev(struct net_device *dev, static int __init mac8390_initdev(struct net_device *dev,
struct nubus_dev *ndev, struct nubus_rsrc *ndev,
enum mac8390_type type) enum mac8390_type type)
{ {
static u32 fwrd4_offsets[16] = { static u32 fwrd4_offsets[16] = {
......
drivers/net/ethernet/cirrus/mac89x0.c
View file @ aca21de2
...@@ -187,6 +187,7 @@ struct net_device * __init mac89x0_probe(int unit) ...@@ -187,6 +187,7 @@ struct net_device * __init mac89x0_probe(int unit)
unsigned long ioaddr; unsigned long ioaddr;
unsigned short sig; unsigned short sig;
int err = -ENODEV; int err = -ENODEV;
struct nubus_rsrc *fres;
if (!MACH_IS_MAC) if (!MACH_IS_MAC)
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
...@@ -207,8 +208,9 @@ struct net_device * __init mac89x0_probe(int unit) ...@@ -207,8 +208,9 @@ struct net_device * __init mac89x0_probe(int unit)
/* We might have to parameterize this later */ /* We might have to parameterize this later */
slot = 0xE; slot = 0xE;
/* Get out now if there's a real NuBus card in slot E */ /* Get out now if there's a real NuBus card in slot E */
if (nubus_find_slot(slot, NULL) != NULL) for_each_func_rsrc(fres)
goto out; if (fres->board->slot == slot)
goto out;
/* The pseudo-ISA bits always live at offset 0x300 (gee, /* The pseudo-ISA bits always live at offset 0x300 (gee,
wonder why...) */ wonder why...) */
......
drivers/net/ethernet/natsemi/macsonic.c
View file @ aca21de2
...@@ -311,7 +311,7 @@ static int mac_onboard_sonic_probe(struct net_device *dev) ...@@ -311,7 +311,7 @@ static int mac_onboard_sonic_probe(struct net_device *dev)
{ {
struct sonic_local* lp = netdev_priv(dev); struct sonic_local* lp = netdev_priv(dev);
int sr; int sr;
int commslot = 0; bool commslot = macintosh_config->expansion_type == MAC_EXP_PDS_COMM;
if (!MACH_IS_MAC) if (!MACH_IS_MAC)
return -ENODEV; return -ENODEV;
...@@ -322,10 +322,7 @@ static int mac_onboard_sonic_probe(struct net_device *dev) ...@@ -322,10 +322,7 @@ static int mac_onboard_sonic_probe(struct net_device *dev)
Ethernet (BTW, the Ethernet *is* always at the same Ethernet (BTW, the Ethernet *is* always at the same
address, and nothing else lives there, at least if Apple's address, and nothing else lives there, at least if Apple's
documentation is to be believed) */ documentation is to be believed) */
if (macintosh_config->ident == MAC_MODEL_Q630 || if (commslot || macintosh_config->ident == MAC_MODEL_C610) {
macintosh_config->ident == MAC_MODEL_P588 ||
macintosh_config->ident == MAC_MODEL_P575 ||
macintosh_config->ident == MAC_MODEL_C610) {
int card_present; int card_present;
card_present = hwreg_present((void*)ONBOARD_SONIC_REGISTERS); card_present = hwreg_present((void*)ONBOARD_SONIC_REGISTERS);
...@@ -333,7 +330,6 @@ static int mac_onboard_sonic_probe(struct net_device *dev) ...@@ -333,7 +330,6 @@ static int mac_onboard_sonic_probe(struct net_device *dev)
printk("none.\n"); printk("none.\n");
return -ENODEV; return -ENODEV;
} }
commslot = 1;
} }
printk("yes\n"); printk("yes\n");
...@@ -428,26 +424,26 @@ static int mac_nubus_sonic_ethernet_addr(struct net_device *dev, ...@@ -428,26 +424,26 @@ static int mac_nubus_sonic_ethernet_addr(struct net_device *dev,
return 0; return 0;
} }
static int macsonic_ident(struct nubus_dev *ndev) static int macsonic_ident(struct nubus_rsrc *fres)
{ {
if (ndev->dr_hw == NUBUS_DRHW_ASANTE_LC && if (fres->dr_hw == NUBUS_DRHW_ASANTE_LC &&
ndev->dr_sw == NUBUS_DRSW_SONIC_LC) fres->dr_sw == NUBUS_DRSW_SONIC_LC)
return MACSONIC_DAYNALINK; return MACSONIC_DAYNALINK;
if (ndev->dr_hw == NUBUS_DRHW_SONIC && if (fres->dr_hw == NUBUS_DRHW_SONIC &&
ndev->dr_sw == NUBUS_DRSW_APPLE) { fres->dr_sw == NUBUS_DRSW_APPLE) {
/* There has to be a better way to do this... */ /* There has to be a better way to do this... */
if (strstr(ndev->board->name, "DuoDock")) if (strstr(fres->board->name, "DuoDock"))
return MACSONIC_DUODOCK; return MACSONIC_DUODOCK;
else else
return MACSONIC_APPLE; return MACSONIC_APPLE;
} }
if (ndev->dr_hw == NUBUS_DRHW_SMC9194 && if (fres->dr_hw == NUBUS_DRHW_SMC9194 &&
ndev->dr_sw == NUBUS_DRSW_DAYNA) fres->dr_sw == NUBUS_DRSW_DAYNA)
return MACSONIC_DAYNA; return MACSONIC_DAYNA;
if (ndev->dr_hw == NUBUS_DRHW_APPLE_SONIC_LC && if (fres->dr_hw == NUBUS_DRHW_APPLE_SONIC_LC &&
ndev->dr_sw == 0) { /* huh? */ fres->dr_sw == 0) { /* huh? */
return MACSONIC_APPLE16; return MACSONIC_APPLE16;
} }
return -1; return -1;
...@@ -456,7 +452,7 @@ static int macsonic_ident(struct nubus_dev *ndev) ...@@ -456,7 +452,7 @@ static int macsonic_ident(struct nubus_dev *ndev)
static int mac_nubus_sonic_probe(struct net_device *dev) static int mac_nubus_sonic_probe(struct net_device *dev)
{ {
static int slots; static int slots;
struct nubus_dev* ndev = NULL; struct nubus_rsrc *ndev = NULL;
struct sonic_local* lp = netdev_priv(dev); struct sonic_local* lp = netdev_priv(dev);
unsigned long base_addr, prom_addr; unsigned long base_addr, prom_addr;
u16 sonic_dcr; u16 sonic_dcr;
...@@ -464,9 +460,11 @@ static int mac_nubus_sonic_probe(struct net_device *dev) ...@@ -464,9 +460,11 @@ static int mac_nubus_sonic_probe(struct net_device *dev)
int reg_offset, dma_bitmode; int reg_offset, dma_bitmode;
/* Find the first SONIC that hasn't been initialized already */ /* Find the first SONIC that hasn't been initialized already */
while ((ndev = nubus_find_type(NUBUS_CAT_NETWORK, for_each_func_rsrc(ndev) {
NUBUS_TYPE_ETHERNET, ndev)) != NULL) if (ndev->category != NUBUS_CAT_NETWORK ||
{ ndev->type != NUBUS_TYPE_ETHERNET)
continue;
/* Have we seen it already? */ /* Have we seen it already? */
if (slots & (1<<ndev->board->slot)) if (slots & (1<<ndev->board->slot))
continue; continue;
......
drivers/nubus/Makefile
View file @ aca21de2
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
# Makefile for the nubus specific drivers. # Makefile for the nubus specific drivers.
# #
obj-y := nubus.o obj-y := nubus.o bus.o
obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_PROC_FS) += proc.o
drivers/nubus/bus.c 0 → 100644
View file @ aca21de2
// SPDX-License-Identifier: GPL-2.0
//
// Bus implementation for the NuBus subsystem.
//
// Copyright (C) 2017 Finn Thain
#include <linux/device.h>
#include <linux/list.h>
#include <linux/nubus.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#define to_nubus_board(d) container_of(d, struct nubus_board, dev)
#define to_nubus_driver(d) container_of(d, struct nubus_driver, driver)
static int nubus_bus_match(struct device *dev, struct device_driver *driver)
{
return 1;
}
static int nubus_device_probe(struct device *dev)
{
struct nubus_driver *ndrv = to_nubus_driver(dev->driver);
int err = -ENODEV;
if (ndrv->probe)
err = ndrv->probe(to_nubus_board(dev));
return err;
}
static int nubus_device_remove(struct device *dev)
{
struct nubus_driver *ndrv = to_nubus_driver(dev->driver);
int err = -ENODEV;
if (dev->driver && ndrv->remove)
err = ndrv->remove(to_nubus_board(dev));
return err;
}
struct bus_type nubus_bus_type = {
.name = "nubus",
.match = nubus_bus_match,
.probe = nubus_device_probe,
.remove = nubus_device_remove,
};
EXPORT_SYMBOL(nubus_bus_type);
int nubus_driver_register(struct nubus_driver *ndrv)
{
ndrv->driver.bus = &nubus_bus_type;
return driver_register(&ndrv->driver);
}
EXPORT_SYMBOL(nubus_driver_register);
void nubus_driver_unregister(struct nubus_driver *ndrv)
{
driver_unregister(&ndrv->driver);
}
EXPORT_SYMBOL(nubus_driver_unregister);
static struct device nubus_parent = {
.init_name = "nubus",
};
int __init nubus_bus_register(void)
{
int err;
err = device_register(&nubus_parent);
if (err)
return err;
err = bus_register(&nubus_bus_type);
if (!err)
return 0;
device_unregister(&nubus_parent);
return err;
}
static void nubus_device_release(struct device *dev)
{
struct nubus_board *board = to_nubus_board(dev);
struct nubus_rsrc *fres, *tmp;
list_for_each_entry_safe(fres, tmp, &nubus_func_rsrcs, list)
if (fres->board == board) {
list_del(&fres->list);
kfree(fres);
}
kfree(board);
}
int nubus_device_register(struct nubus_board *board)
{
board->dev.parent = &nubus_parent;
board->dev.release = nubus_device_release;
board->dev.bus = &nubus_bus_type;
dev_set_name(&board->dev, "slot.%X", board->slot);
return device_register(&board->dev);
}
static int nubus_print_device_name_fn(struct device *dev, void *data)
{
struct nubus_board *board = to_nubus_board(dev);
struct seq_file *m = data;
seq_printf(m, "Slot %X: %s\n", board->slot, board->name);
return 0;
}
int nubus_proc_show(struct seq_file *m, void *data)
{
return bus_for_each_dev(&nubus_bus_type, NULL, m,
nubus_print_device_name_fn);
}
drivers/nubus/nubus.c
View file @ aca21de2
This diff is collapsed.
drivers/nubus/proc.c
View file @ aca21de2
...@@ -11,39 +11,37 @@ ...@@ -11,39 +11,37 @@
structure in /proc analogous to the structure of the NuBus ROM structure in /proc analogous to the structure of the NuBus ROM
resources. resources.
Therefore each NuBus device is in fact a directory, which may in Therefore each board function gets a directory, which may in turn
turn contain subdirectories. The "files" correspond to NuBus contain subdirectories. Each slot resource is a file. Unrecognized
resource records. For those types of records which we know how to resources are empty files, since every resource ID requires a special
convert to formats that are meaningful to userspace (mostly just case (e.g. if the resource ID implies a directory or block, then its
icons) these files will provide "cooked" data. Otherwise they will value has to be interpreted as a slot ROM pointer etc.).
simply provide raw access (read-only of course) to the ROM. */ */
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/nubus.h> #include <linux/nubus.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
/*
* /proc/bus/nubus/devices stuff
*/
static int static int
nubus_devices_proc_show(struct seq_file *m, void *v) nubus_devices_proc_show(struct seq_file *m, void *v)
{ {
struct nubus_dev *dev = nubus_devices; struct nubus_rsrc *fres;
while (dev) { for_each_func_rsrc(fres)
seq_printf(m, "%x\t%04x %04x %04x %04x", seq_printf(m, "%x\t%04x %04x %04x %04x\t%08lx\n",
dev->board->slot, fres->board->slot, fres->category, fres->type,
dev->category, fres->dr_sw, fres->dr_hw, fres->board->slot_addr);
dev->type,
dev->dr_sw,
dev->dr_hw);
seq_printf(m, "\t%08lx\n", dev->board->slot_addr);
dev = dev->next;
}
return 0; return 0;
} }
...@@ -61,174 +59,163 @@ static const struct file_operations nubus_devices_proc_fops = { ...@@ -61,174 +59,163 @@ static const struct file_operations nubus_devices_proc_fops = {
static struct proc_dir_entry *proc_bus_nubus_dir; static struct proc_dir_entry *proc_bus_nubus_dir;
static const struct file_operations nubus_proc_subdir_fops = { /*
#warning Need to set some I/O handlers here * /proc/bus/nubus/x/ stuff
}; */
static void nubus_proc_subdir(struct nubus_dev* dev, struct proc_dir_entry *nubus_proc_add_board(struct nubus_board *board)
struct proc_dir_entry* parent,
struct nubus_dir* dir)
{ {
struct nubus_dirent ent; char name[2];
/* Some of these are directories, others aren't */ if (!proc_bus_nubus_dir)
while (nubus_readdir(dir, &ent) != -1) { return NULL;
char name[8]; snprintf(name, sizeof(name), "%x", board->slot);
struct proc_dir_entry* e; return proc_mkdir(name, proc_bus_nubus_dir);
sprintf(name, "%x", ent.type);
e = proc_create(name, S_IFREG | S_IRUGO | S_IWUSR, parent,
&nubus_proc_subdir_fops);
if (!e)
return;
}
} }
/* Can't do this recursively since the root directory is structured /* The PDE private data for any directory under /proc/bus/nubus/x/
somewhat differently from the subdirectories */ * is the bytelanes value for the board in slot x.
static void nubus_proc_populate(struct nubus_dev* dev, */
struct proc_dir_entry* parent,
struct nubus_dir* root) struct proc_dir_entry *nubus_proc_add_rsrc_dir(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent,
struct nubus_board *board)
{ {
struct nubus_dirent ent; char name[9];
int lanes = board->lanes;
/* We know these are all directories (board resource + one or
more functional resources) */ if (!procdir)
while (nubus_readdir(root, &ent) != -1) { return NULL;
char name[8]; snprintf(name, sizeof(name), "%x", ent->type);
struct proc_dir_entry* e; return proc_mkdir_data(name, 0555, procdir, (void *)lanes);
struct nubus_dir dir;
sprintf(name, "%x", ent.type);
e = proc_mkdir(name, parent);
if (!e) return;
/* And descend */
if (nubus_get_subdir(&ent, &dir) == -1) {
/* This shouldn't happen */
printk(KERN_ERR "NuBus root directory node %x:%x has no subdir!\n",
dev->board->slot, ent.type);
continue;
} else {
nubus_proc_subdir(dev, e, &dir);
}
}
} }
int nubus_proc_attach_device(struct nubus_dev *dev) /* The PDE private data for a file under /proc/bus/nubus/x/ is a pointer to
* an instance of the following structure, which gives the location and size
* of the resource data in the slot ROM. For slot resources which hold only a
* small integer, this integer value is stored directly and size is set to 0.
* A NULL private data pointer indicates an unrecognized resource.
*/
struct nubus_proc_pde_data {
unsigned char *res_ptr;
unsigned int res_size;
};
static struct nubus_proc_pde_data *
nubus_proc_alloc_pde_data(unsigned char *ptr, unsigned int size)
{ {
struct proc_dir_entry *e; struct nubus_proc_pde_data *pde_data;
struct nubus_dir root;
char name[8];
if (dev == NULL) {
printk(KERN_ERR
"NULL pointer in nubus_proc_attach_device, shoot the programmer!\n");
return -1;
}
if (dev->board == NULL) {
printk(KERN_ERR
"NULL pointer in nubus_proc_attach_device, shoot the programmer!\n");
printk("dev = %p, dev->board = %p\n", dev, dev->board);
return -1;
}
/* Create a directory */
sprintf(name, "%x", dev->board->slot);
e = dev->procdir = proc_mkdir(name, proc_bus_nubus_dir);
if (!e)
return -ENOMEM;
/* Now recursively populate it with files */ pde_data = kmalloc(sizeof(*pde_data), GFP_KERNEL);
nubus_get_root_dir(dev->board, &root); if (!pde_data)
nubus_proc_populate(dev, e, &root); return NULL;
return 0; pde_data->res_ptr = ptr;
pde_data->res_size = size;
return pde_data;
} }
EXPORT_SYMBOL(nubus_proc_attach_device);
/* static int nubus_proc_rsrc_show(struct seq_file *m, void *v)
* /proc/nubus stuff
*/
static int nubus_proc_show(struct seq_file *m, void *v)
{ {
const struct nubus_board *board = v; struct inode *inode = m->private;
struct nubus_proc_pde_data *pde_data;
/* Display header on line 1 */ pde_data = PDE_DATA(inode);
if (v == SEQ_START_TOKEN) if (!pde_data)
seq_puts(m, "Nubus devices found:\n"); return 0;
else
seq_printf(m, "Slot %X: %s\n", board->slot, board->name); if (pde_data->res_size > m->size)
return -EFBIG;
if (pde_data->res_size) {
int lanes = (int)proc_get_parent_data(inode);
struct nubus_dirent ent;
if (!lanes)
return 0;
ent.mask = lanes;
ent.base = pde_data->res_ptr;
ent.data = 0;
nubus_seq_write_rsrc_mem(m, &ent, pde_data->res_size);
} else {
unsigned int data = (unsigned int)pde_data->res_ptr;
seq_putc(m, data >> 16);
seq_putc(m, data >> 8);
seq_putc(m, data >> 0);
}
return 0; return 0;
} }
static void *nubus_proc_start(struct seq_file *m, loff_t *_pos) static int nubus_proc_rsrc_open(struct inode *inode, struct file *file)
{ {
struct nubus_board *board; return single_open(file, nubus_proc_rsrc_show, inode);
unsigned pos;
if (*_pos > LONG_MAX)
return NULL;
pos = *_pos;
if (pos == 0)
return SEQ_START_TOKEN;
for (board = nubus_boards; board; board = board->next)
if (--pos == 0)
break;
return board;
} }
static void *nubus_proc_next(struct seq_file *p, void *v, loff_t *_pos) static const struct file_operations nubus_proc_rsrc_fops = {
.open = nubus_proc_rsrc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
void nubus_proc_add_rsrc_mem(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent,
unsigned int size)
{ {
/* Walk the list of NuBus boards */ char name[9];
struct nubus_board *board = v; struct nubus_proc_pde_data *pde_data;
++*_pos; if (!procdir)
if (v == SEQ_START_TOKEN) return;
board = nubus_boards;
else if (board) snprintf(name, sizeof(name), "%x", ent->type);
board = board->next; if (size)
return board; pde_data = nubus_proc_alloc_pde_data(nubus_dirptr(ent), size);
else
pde_data = NULL;
proc_create_data(name, S_IFREG | 0444, procdir,
&nubus_proc_rsrc_fops, pde_data);
} }
static void nubus_proc_stop(struct seq_file *p, void *v) void nubus_proc_add_rsrc(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent)
{ {
char name[9];
unsigned char *data = (unsigned char *)ent->data;
if (!procdir)
return;
snprintf(name, sizeof(name), "%x", ent->type);
proc_create_data(name, S_IFREG | 0444, procdir,
&nubus_proc_rsrc_fops,
nubus_proc_alloc_pde_data(data, 0));
} }
static const struct seq_operations nubus_proc_seqops = { /*
.start = nubus_proc_start, * /proc/nubus stuff
.next = nubus_proc_next, */
.stop = nubus_proc_stop,
.show = nubus_proc_show,
};
static int nubus_proc_open(struct inode *inode, struct file *file) static int nubus_proc_open(struct inode *inode, struct file *file)
{ {
return seq_open(file, &nubus_proc_seqops); return single_open(file, nubus_proc_show, NULL);
} }
static const struct file_operations nubus_proc_fops = { static const struct file_operations nubus_proc_fops = {
.open = nubus_proc_open, .open = nubus_proc_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release, .release = single_release,
}; };
void __init proc_bus_nubus_add_devices(void)
{
struct nubus_dev *dev;
for(dev = nubus_devices; dev; dev = dev->next)
nubus_proc_attach_device(dev);
}
void __init nubus_proc_init(void) void __init nubus_proc_init(void)
{ {
proc_create("nubus", 0, NULL, &nubus_proc_fops); proc_create("nubus", 0, NULL, &nubus_proc_fops);
if (!MACH_IS_MAC)
return;
proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL); proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL);
if (!proc_bus_nubus_dir)
return;
proc_create("devices", 0, proc_bus_nubus_dir, &nubus_devices_proc_fops); proc_create("devices", 0, proc_bus_nubus_dir, &nubus_devices_proc_fops);
proc_bus_nubus_add_devices();
} }
drivers/video/fbdev/macfb.c
View file @ aca21de2
...@@ -556,7 +556,7 @@ static void __init iounmap_macfb(void) ...@@ -556,7 +556,7 @@ static void __init iounmap_macfb(void)
static int __init macfb_init(void) static int __init macfb_init(void)
{ {
int video_cmap_len, video_is_nubus = 0; int video_cmap_len, video_is_nubus = 0;
struct nubus_dev* ndev = NULL; struct nubus_rsrc *ndev = NULL;
char *option = NULL; char *option = NULL;
int err; int err;
...@@ -670,15 +670,17 @@ static int __init macfb_init(void) ...@@ -670,15 +670,17 @@ static int __init macfb_init(void)
* code is really broken :-) * code is really broken :-)
*/ */
while ((ndev = nubus_find_type(NUBUS_CAT_DISPLAY, for_each_func_rsrc(ndev) {
NUBUS_TYPE_VIDEO, ndev)))
{
unsigned long base = ndev->board->slot_addr; unsigned long base = ndev->board->slot_addr;
if (mac_bi_data.videoaddr < base || if (mac_bi_data.videoaddr < base ||
mac_bi_data.videoaddr - base > 0xFFFFFF) mac_bi_data.videoaddr - base > 0xFFFFFF)
continue; continue;
if (ndev->category != NUBUS_CAT_DISPLAY ||
ndev->type != NUBUS_TYPE_VIDEO)
continue;
video_is_nubus = 1; video_is_nubus = 1;
slot_addr = (unsigned char *)base; slot_addr = (unsigned char *)base;
......
include/linux/nubus.h
View file @ aca21de2
...@@ -5,20 +5,36 @@ ...@@ -5,20 +5,36 @@
Originally written by Alan Cox. Originally written by Alan Cox.
Hacked to death by C. Scott Ananian and David Huggins-Daines. Hacked to death by C. Scott Ananian and David Huggins-Daines.
*/
Some of the constants in here are from the corresponding
NetBSD/OpenBSD header file, by Allen Briggs. We figured out the
rest of them on our own. */
#ifndef LINUX_NUBUS_H #ifndef LINUX_NUBUS_H
#define LINUX_NUBUS_H #define LINUX_NUBUS_H
#include <linux/device.h>
#include <asm/nubus.h> #include <asm/nubus.h>
#include <uapi/linux/nubus.h> #include <uapi/linux/nubus.h>
struct proc_dir_entry;
struct seq_file;
struct nubus_dir {
unsigned char *base;
unsigned char *ptr;
int done;
int mask;
struct proc_dir_entry *procdir;
};
struct nubus_dirent {
unsigned char *base;
unsigned char type;
__u32 data; /* Actually 24 bits used */
int mask;
};
struct nubus_board { struct nubus_board {
struct nubus_board* next; struct device dev;
struct nubus_dev* first_dev;
/* Only 9-E actually exist, though 0-8 are also theoretically /* Only 9-E actually exist, though 0-8 are also theoretically
possible, and 0 is a special case which represents the possible, and 0 is a special case which represents the
motherboard and onboard peripherals (Ethernet, video) */ motherboard and onboard peripherals (Ethernet, video) */
...@@ -27,10 +43,10 @@ struct nubus_board { ...@@ -27,10 +43,10 @@ struct nubus_board {
char name[64]; char name[64];
/* Format block */ /* Format block */
unsigned char* fblock; unsigned char *fblock;
/* Root directory (does *not* always equal fblock + doffset!) */ /* Root directory (does *not* always equal fblock + doffset!) */
unsigned char* directory; unsigned char *directory;
unsigned long slot_addr; unsigned long slot_addr;
/* Offset to root directory (sometimes) */ /* Offset to root directory (sometimes) */
unsigned long doffset; unsigned long doffset;
...@@ -41,15 +57,15 @@ struct nubus_board { ...@@ -41,15 +57,15 @@ struct nubus_board {
unsigned char rev; unsigned char rev;
unsigned char format; unsigned char format;
unsigned char lanes; unsigned char lanes;
};
struct nubus_dev {
/* Next link in device list */
struct nubus_dev* next;
/* Directory entry in /proc/bus/nubus */ /* Directory entry in /proc/bus/nubus */
struct proc_dir_entry* procdir; struct proc_dir_entry *procdir;
};
struct nubus_rsrc {
struct list_head list;
/* The functional resource ID of this device */ /* The functional resource ID */
unsigned char resid; unsigned char resid;
/* These are mostly here for convenience; we could always read /* These are mostly here for convenience; we could always read
them from the ROMs if we wanted to */ them from the ROMs if we wanted to */
...@@ -57,79 +73,116 @@ struct nubus_dev { ...@@ -57,79 +73,116 @@ struct nubus_dev {
unsigned short type; unsigned short type;
unsigned short dr_sw; unsigned short dr_sw;
unsigned short dr_hw; unsigned short dr_hw;
/* This is the device's name rather than the board's.
Sometimes they are different. Usually the board name is
more correct. */
char name[64];
/* MacOS driver (I kid you not) */
unsigned char* driver;
/* Actually this is an offset */
unsigned long iobase;
unsigned long iosize;
unsigned char flags, hwdevid;
/* Functional directory */ /* Functional directory */
unsigned char* directory; unsigned char *directory;
/* Much of our info comes from here */ /* Much of our info comes from here */
struct nubus_board* board; struct nubus_board *board;
};
/* This is all NuBus functional resources (used to find devices later on) */
extern struct list_head nubus_func_rsrcs;
struct nubus_driver {
struct device_driver driver;
int (*probe)(struct nubus_board *board);
int (*remove)(struct nubus_board *board);
}; };
/* This is all NuBus devices (used to find devices later on) */ extern struct bus_type nubus_bus_type;
extern struct nubus_dev* nubus_devices;
/* This is all NuBus cards */
extern struct nubus_board* nubus_boards;
/* Generic NuBus interface functions, modelled after the PCI interface */ /* Generic NuBus interface functions, modelled after the PCI interface */
void nubus_scan_bus(void);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern void nubus_proc_init(void); void nubus_proc_init(void);
struct proc_dir_entry *nubus_proc_add_board(struct nubus_board *board);
struct proc_dir_entry *nubus_proc_add_rsrc_dir(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent,
struct nubus_board *board);
void nubus_proc_add_rsrc_mem(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent,
unsigned int size);
void nubus_proc_add_rsrc(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent);
#else #else
static inline void nubus_proc_init(void) {} static inline void nubus_proc_init(void) {}
static inline
struct proc_dir_entry *nubus_proc_add_board(struct nubus_board *board)
{ return NULL; }
static inline
struct proc_dir_entry *nubus_proc_add_rsrc_dir(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent,
struct nubus_board *board)
{ return NULL; }
static inline void nubus_proc_add_rsrc_mem(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent,
unsigned int size) {}
static inline void nubus_proc_add_rsrc(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent) {}
#endif #endif
int get_nubus_list(char *buf);
int nubus_proc_attach_device(struct nubus_dev *dev); struct nubus_rsrc *nubus_first_rsrc_or_null(void);
/* If we need more precision we can add some more of these */ struct nubus_rsrc *nubus_next_rsrc_or_null(struct nubus_rsrc *from);
struct nubus_dev* nubus_find_device(unsigned short category,
unsigned short type, #define for_each_func_rsrc(f) \
unsigned short dr_hw, for (f = nubus_first_rsrc_or_null(); f; f = nubus_next_rsrc_or_null(f))
unsigned short dr_sw,
const struct nubus_dev* from); #define for_each_board_func_rsrc(b, f) \
struct nubus_dev* nubus_find_type(unsigned short category, for_each_func_rsrc(f) if (f->board != b) {} else
unsigned short type,
const struct nubus_dev* from);
/* Might have more than one device in a slot, you know... */
struct nubus_dev* nubus_find_slot(unsigned int slot,
const struct nubus_dev* from);
/* These are somewhat more NuBus-specific. They all return 0 for /* These are somewhat more NuBus-specific. They all return 0 for
success and -1 for failure, as you'd expect. */ success and -1 for failure, as you'd expect. */
/* The root directory which contains the board and functional /* The root directory which contains the board and functional
directories */ directories */
int nubus_get_root_dir(const struct nubus_board* board, int nubus_get_root_dir(const struct nubus_board *board,
struct nubus_dir* dir); struct nubus_dir *dir);
/* The board directory */ /* The board directory */
int nubus_get_board_dir(const struct nubus_board* board, int nubus_get_board_dir(const struct nubus_board *board,
struct nubus_dir* dir); struct nubus_dir *dir);
/* The functional directory */ /* The functional directory */
int nubus_get_func_dir(const struct nubus_dev* dev, int nubus_get_func_dir(const struct nubus_rsrc *fres, struct nubus_dir *dir);
struct nubus_dir* dir);
/* These work on any directory gotten via the above */ /* These work on any directory gotten via the above */
int nubus_readdir(struct nubus_dir* dir, int nubus_readdir(struct nubus_dir *dir,
struct nubus_dirent* ent); struct nubus_dirent *ent);
int nubus_find_rsrc(struct nubus_dir* dir, int nubus_find_rsrc(struct nubus_dir *dir,
unsigned char rsrc_type, unsigned char rsrc_type,
struct nubus_dirent* ent); struct nubus_dirent *ent);
int nubus_rewinddir(struct nubus_dir* dir); int nubus_rewinddir(struct nubus_dir *dir);
/* Things to do with directory entries */ /* Things to do with directory entries */
int nubus_get_subdir(const struct nubus_dirent* ent, int nubus_get_subdir(const struct nubus_dirent *ent,
struct nubus_dir* dir); struct nubus_dir *dir);
void nubus_get_rsrc_mem(void* dest, void nubus_get_rsrc_mem(void *dest, const struct nubus_dirent *dirent,
const struct nubus_dirent *dirent, unsigned int len);
int len); unsigned int nubus_get_rsrc_str(char *dest, const struct nubus_dirent *dirent,
void nubus_get_rsrc_str(void* dest, unsigned int len);
const struct nubus_dirent *dirent, void nubus_seq_write_rsrc_mem(struct seq_file *m,
int maxlen); const struct nubus_dirent *dirent,
unsigned int len);
unsigned char *nubus_dirptr(const struct nubus_dirent *nd);
/* Declarations relating to driver model objects */
int nubus_bus_register(void);
int nubus_device_register(struct nubus_board *board);
int nubus_driver_register(struct nubus_driver *ndrv);
void nubus_driver_unregister(struct nubus_driver *ndrv);
int nubus_proc_show(struct seq_file *m, void *data);
static inline void nubus_set_drvdata(struct nubus_board *board, void *data)
{
dev_set_drvdata(&board->dev, data);
}
static inline void *nubus_get_drvdata(struct nubus_board *board)
{
return dev_get_drvdata(&board->dev);
}
/* Returns a pointer to the "standard" slot space. */
static inline void *nubus_slot_addr(int slot)
{
return (void *)(0xF0000000 | (slot << 24));
}
#endif /* LINUX_NUBUS_H */ #endif /* LINUX_NUBUS_H */
include/uapi/linux/nubus.h
View file @ aca21de2
...@@ -221,27 +221,4 @@ enum nubus_display_res_id { ...@@ -221,27 +221,4 @@ enum nubus_display_res_id {
NUBUS_RESID_SIXTHMODE = 0x0085 NUBUS_RESID_SIXTHMODE = 0x0085
}; };
struct nubus_dir
{
unsigned char *base;
unsigned char *ptr;
int done;
int mask;
};
struct nubus_dirent
{
unsigned char *base;
unsigned char type;
__u32 data; /* Actually 24bits used */
int mask;
};
/* We'd like to get rid of this eventually. Only daynaport.c uses it now. */
static inline void *nubus_slot_addr(int slot)
{
return (void *)(0xF0000000|(slot<<24));
}
#endif /* _UAPILINUX_NUBUS_H */ #endif /* _UAPILINUX_NUBUS_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7