iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m68k updates for v5.7

Browse Source 
- Pagetable layout rewrite, to facilitate global READ_ONCE() rework,
   - Zorro (Amiga) and DIO (HP 9000/300) bus cleanups,
   - Defconfig updates,
   - Minor cleanups and fixes.
 -----BEGIN PGP SIGNATURE-----
 
 iIsEABYIADMWIQQ9qaHoIs/1I4cXmEiKwlD9ZEnxcAUCXoHCohUcZ2VlcnRAbGlu
 dXgtbTY4ay5vcmcACgkQisJQ/WRJ8XDVIwEA7AtaUBkpK52a0jJXjEZxqG1riOM4
 b8H9wsw96R8VDlQA/RIdoUrBG0ytCE7a4ClIv6Ze30tjqBuy7ogk9rEj/6cA
 =zYv0
 -----END PGP SIGNATURE-----

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

Pull m68k updates from Geert Uytterhoeven:

 - pagetable layout rewrite, to facilitate global READ_ONCE() rework

 - Zorro (Amiga) and DIO (HP 9000/300) bus cleanups

 - defconfig updates

 - minor cleanups and fixes

* tag 'm68k-for-v5.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (23 commits)
  m68k: defconfig: Update defconfigs for v5.6-rc4
  zorro: Replace zero-length array with flexible-array member
  m68k: Switch to asm-generic/hardirq.h
  fbdev: c2p: Use BUILD_BUG() instead of custom solution
  dio: Remove unused dio_dev_driver()
  dio: Fix dio_bus_match() kerneldoc
  dio: Make dio_match_device() static
  zorro: Move zorro_bus_type to bus-private header file
  zorro: Remove unused zorro_dev_driver()
  zorro: Use zorro_match_device() helper in zorro_bus_match()
  zorro: Fix zorro_bus_match() kerneldoc
  zorro: Make zorro_match_device() static
  m68k: Fix Kconfig indentation
  m68k: mm: Change ColdFire pgtable_t
  m68k: mm: Fully initialize the page-table allocator
  m68k: mm: Extend table allocator for multiple sizes
  m68k: mm: Use table allocator for pgtables
  m68k: mm: Improve kernel_page_table()
  m68k: mm: Restructure Motorola MMU page-table layout
  m68k: mm: Move the pointer table allocator to motorola.c
  ...
This commit is contained in:
Linus Torvalds 2020-03-31 08:49:26 -07:00
commit 58233ccf94
33 changed files with 351 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/Kconfig.bus
View File

@ -66,6 +66,6 @@ endif
if !MMU if !MMU
config ISA_DMA_API config ISA_DMA_API
def_bool !M5272 def_bool !M5272
endif endif

16
arch/m68k/Kconfig.debug
View File

@ -12,16 +12,16 @@ config EARLY_PRINTK
bool "Early printk" bool "Early printk"
depends on !(SUN3 || M68000 || COLDFIRE) depends on !(SUN3 || M68000 || COLDFIRE)
help help
Write kernel log output directly to a serial port. Write kernel log output directly to a serial port.
Where implemented, output goes to the framebuffer as well. Where implemented, output goes to the framebuffer as well.
PROM console functionality on Sun 3x is not affected by this option. PROM console functionality on Sun 3x is not affected by this option.
Pass "earlyprintk" on the kernel command line to get a Pass "earlyprintk" on the kernel command line to get a
boot console. boot console.
This is useful for kernel debugging when your machine crashes very This is useful for kernel debugging when your machine crashes very
early, i.e. before the normal console driver is loaded. early, i.e. before the normal console driver is loaded.
You should normally say N here, unless you want to debug such a crash. You should normally say N here, unless you want to debug such a crash.
if !MMU if !MMU

8
arch/m68k/Kconfig.machine
View File

@ -269,10 +269,10 @@ config AMCORE
Support for the Sysam AMCORE open-hardware generic board. Support for the Sysam AMCORE open-hardware generic board.
config STMARK2 config STMARK2
bool "Sysam stmark2 board support" bool "Sysam stmark2 board support"
depends on M5441x depends on M5441x
help help
Support for the Sysam stmark2 open-hardware generic board. Support for the Sysam stmark2 open-hardware generic board.
config FIREBEE config FIREBEE
bool "FireBee board support" bool "FireBee board support"

5
arch/m68k/configs/amiga_defconfig
View File

@ -173,7 +173,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -369,6 +368,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -613,9 +613,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/apollo_defconfig
View File

@ -169,7 +169,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -348,6 +347,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -569,9 +569,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/atari_defconfig
View File

@ -176,7 +176,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -364,6 +363,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -591,9 +591,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/bvme6000_defconfig
View File

@ -166,7 +166,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -346,6 +345,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -562,9 +562,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/hp300_defconfig
View File

@ -168,7 +168,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -347,6 +346,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -571,9 +571,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/mac_defconfig
View File

@ -167,7 +167,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -363,6 +362,7 @@ CONFIG_INPUT_ADBHID=y
CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -593,9 +593,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/multi_defconfig
View File

@ -187,7 +187,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -407,6 +406,7 @@ CONFIG_INPUT_ADBHID=y
CONFIG_MAC_EMUMOUSEBTN=y CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -679,9 +679,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/mvme147_defconfig
View File

@ -165,7 +165,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -345,6 +344,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -561,9 +561,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/mvme16x_defconfig
View File

@ -166,7 +166,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -346,6 +345,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -562,9 +562,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/q40_defconfig
View File

@ -167,7 +167,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -353,6 +352,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -580,9 +580,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/sun3_defconfig
View File

@ -163,7 +163,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -343,6 +342,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -564,9 +564,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

5
arch/m68k/configs/sun3x_defconfig
View File

@ -163,7 +163,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -343,6 +342,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m CONFIG_TCM_PSCSI=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=m CONFIG_DUMMY=m
CONFIG_WIREGUARD=m
CONFIG_EQUALIZER=m CONFIG_EQUALIZER=m
CONFIG_NET_TEAM=m CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_BROADCAST=m
@ -563,9 +563,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
# CONFIG_CRYPTO_HW is not set # CONFIG_CRYPTO_HW is not set
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m

1
arch/m68k/include/asm/Kbuild
View File

@ -8,6 +8,7 @@ generic-y += emergency-restart.h
generic-y += exec.h generic-y += exec.h
generic-y += extable.h generic-y += extable.h
generic-y += futex.h generic-y += futex.h
generic-y += hardirq.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += irq_work.h generic-y += irq_work.h

29
arch/m68k/include/asm/hardirq.h
View File

@ -1,29 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __M68K_HARDIRQ_H
#define __M68K_HARDIRQ_H
#include <linux/threads.h>
#include <linux/cache.h>
#include <asm/irq.h>
#ifdef CONFIG_MMU
static inline void ack_bad_irq(unsigned int irq)
{
pr_crit("unexpected IRQ trap at vector %02x\n", irq);
}
/* entry.S is sensitive to the offsets of these fields */
typedef struct {
unsigned int __softirq_pending;
} ____cacheline_aligned irq_cpustat_t;
#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
#else
#include <asm-generic/hardirq.h>
#endif /* !CONFIG_MMU */
#endif

31
arch/m68k/include/asm/mcf_pgalloc.h
View File

@ -28,21 +28,22 @@ extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)
return (pmd_t *) pgd; return (pmd_t *) pgd;
} }
#define pmd_populate(mm, pmd, page) (pmd_val(*pmd) = \ #define pmd_populate(mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte))
(unsigned long)(page_address(page)))
#define pmd_populate_kernel(mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte)) #define pmd_populate_kernel pmd_populate
#define pmd_pgtable(pmd) pmd_page(pmd) #define pmd_pgtable(pmd) pfn_to_virt(pmd_val(pmd) >> PAGE_SHIFT)
static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page, static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pgtable,
unsigned long address) unsigned long address)
{ {
struct page *page = virt_to_page(pgtable);
pgtable_pte_page_dtor(page); pgtable_pte_page_dtor(page);
__free_page(page); __free_page(page);
} }
static inline struct page *pte_alloc_one(struct mm_struct *mm) static inline pgtable_t pte_alloc_one(struct mm_struct *mm)
{ {
struct page *page = alloc_pages(GFP_DMA, 0); struct page *page = alloc_pages(GFP_DMA, 0);
pte_t *pte; pte_t *pte;
@ -54,20 +55,16 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm)
return NULL; return NULL;
} }
pte = kmap(page); pte = page_address(page);
if (pte) { clear_page(pte);
clear_page(pte);
__flush_page_to_ram(pte);
flush_tlb_kernel_page(pte);
nocache_page(pte);
}
kunmap(page);
return page; return pte;
} }
static inline void pte_free(struct mm_struct *mm, struct page *page) static inline void pte_free(struct mm_struct *mm, pgtable_t pgtable)
{ {
struct page *page = virt_to_page(pgtable);
pgtable_pte_page_dtor(page); pgtable_pte_page_dtor(page);
__free_page(page); __free_page(page);
} }
@ -90,7 +87,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
new_pgd = (pgd_t *)__get_free_page(GFP_DMA | __GFP_NOWARN); new_pgd = (pgd_t *)__get_free_page(GFP_DMA | __GFP_NOWARN);
if (!new_pgd) if (!new_pgd)
return NULL; return NULL;
memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE); memcpy(new_pgd, swapper_pg_dir, PTRS_PER_PGD * sizeof(pgd_t));
memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT); memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT);
return new_pgd; return new_pgd;
} }

74
arch/m68k/include/asm/motorola_pgalloc.h
View File

@ -5,93 +5,71 @@
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
extern pmd_t *get_pointer_table(void); extern void mmu_page_ctor(void *page);
extern int free_pointer_table(pmd_t *); extern void mmu_page_dtor(void *page);
enum m68k_table_types {
TABLE_PGD = 0,
TABLE_PMD = 0, /* same size as PGD */
TABLE_PTE = 1,
};
extern void init_pointer_table(void *table, int type);
extern void *get_pointer_table(int type);
extern int free_pointer_table(void *table, int type);
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm) static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
{ {
pte_t *pte; return get_pointer_table(TABLE_PTE);
pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
if (pte) {
__flush_page_to_ram(pte);
flush_tlb_kernel_page(pte);
nocache_page(pte);
}
return pte;
} }
static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
cache_page(pte); free_pointer_table(pte, TABLE_PTE);
free_page((unsigned long) pte);
} }
static inline pgtable_t pte_alloc_one(struct mm_struct *mm) static inline pgtable_t pte_alloc_one(struct mm_struct *mm)
{ {
struct page *page; return get_pointer_table(TABLE_PTE);
pte_t *pte;
page = alloc_pages(GFP_KERNEL|__GFP_ZERO, 0);
if(!page)
return NULL;
if (!pgtable_pte_page_ctor(page)) {
__free_page(page);
return NULL;
}
pte = kmap(page);
__flush_page_to_ram(pte);
flush_tlb_kernel_page(pte);
nocache_page(pte);
kunmap(page);
return page;
} }
static inline void pte_free(struct mm_struct *mm, pgtable_t page) static inline void pte_free(struct mm_struct *mm, pgtable_t pgtable)
{ {
pgtable_pte_page_dtor(page); free_pointer_table(pgtable, TABLE_PTE);
cache_page(kmap(page));
kunmap(page);
__free_page(page);
} }
static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page, static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pgtable,
unsigned long address) unsigned long address)
{ {
pgtable_pte_page_dtor(page); free_pointer_table(pgtable, TABLE_PTE);
cache_page(kmap(page));
kunmap(page);
__free_page(page);
} }
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
{ {
return get_pointer_table(); return get_pointer_table(TABLE_PMD);
} }
static inline int pmd_free(struct mm_struct *mm, pmd_t *pmd) static inline int pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
return free_pointer_table(pmd); return free_pointer_table(pmd, TABLE_PMD);
} }
static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
unsigned long address) unsigned long address)
{ {
return free_pointer_table(pmd); return free_pointer_table(pmd, TABLE_PMD);
} }
static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
pmd_free(mm, (pmd_t *)pgd); free_pointer_table(pgd, TABLE_PGD);
} }
static inline pgd_t *pgd_alloc(struct mm_struct *mm) static inline pgd_t *pgd_alloc(struct mm_struct *mm)
{ {
return (pgd_t *)get_pointer_table(); return get_pointer_table(TABLE_PGD);
} }
@ -102,9 +80,9 @@ static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *
static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page) static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page)
{ {
pmd_set(pmd, page_address(page)); pmd_set(pmd, page);
} }
#define pmd_pgtable(pmd) pmd_page(pmd) #define pmd_pgtable(pmd) ((pgtable_t)__pmd_page(pmd))
static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
{ {

36
arch/m68k/include/asm/motorola_pgtable.h
View File

@ -23,7 +23,18 @@
#define _DESCTYPE_MASK 0x003 #define _DESCTYPE_MASK 0x003
#define _CACHEMASK040 (~0x060) #define _CACHEMASK040 (~0x060)
#define _TABLE_MASK (0xfffffe00)
/*
* Currently set to the minimum alignment of table pointers (256 bytes).
* The hardware only uses the low 4 bits for state:
*
* 3 - Used
* 2 - Write Protected
* 0,1 - Descriptor Type
*
* and has the rest of the bits reserved.
*/
#define _TABLE_MASK (0xffffff00)
#define _PAGE_TABLE (_PAGE_SHORT) #define _PAGE_TABLE (_PAGE_SHORT)
#define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_NOCACHE) #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_NOCACHE)
@ -108,13 +119,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) static inline void pmd_set(pmd_t *pmdp, pte_t *ptep)
{ {
unsigned long ptbl = virt_to_phys(ptep) | _PAGE_TABLE | _PAGE_ACCESSED; pmd_val(*pmdp) = virt_to_phys(ptep) | _PAGE_TABLE | _PAGE_ACCESSED;
unsigned long *ptr = pmdp->pmd;
short i = 16;
while (--i >= 0) {
*ptr++ = ptbl;
ptbl += (sizeof(pte_t)*PTRS_PER_PTE/16);
}
} }
static inline void pud_set(pud_t *pudp, pmd_t *pmdp) static inline void pud_set(pud_t *pudp, pmd_t *pmdp)
@ -138,13 +143,14 @@ static inline void pud_set(pud_t *pudp, pmd_t *pmdp)
#define pmd_none(pmd) (!pmd_val(pmd)) #define pmd_none(pmd) (!pmd_val(pmd))
#define pmd_bad(pmd) ((pmd_val(pmd) & _DESCTYPE_MASK) != _PAGE_TABLE) #define pmd_bad(pmd) ((pmd_val(pmd) & _DESCTYPE_MASK) != _PAGE_TABLE)
#define pmd_present(pmd) (pmd_val(pmd) & _PAGE_TABLE) #define pmd_present(pmd) (pmd_val(pmd) & _PAGE_TABLE)
#define pmd_clear(pmdp) ({ \ #define pmd_clear(pmdp) ({ pmd_val(*pmdp) = 0; })
unsigned long *__ptr = pmdp->pmd; \
short __i = 16; \ /*
while (--__i >= 0) \ * m68k does not have huge pages (020/030 actually could), but generic code
*__ptr++ = 0; \ * expects pmd_page() to exists, only to then DCE it all. Provide a dummy to
}) * make the compiler happy.
#define pmd_page(pmd) virt_to_page(__va(pmd_val(pmd))) */
#define pmd_page(pmd) NULL
#define pud_none(pud) (!pud_val(pud)) #define pud_none(pud) (!pud_val(pud))

16
arch/m68k/include/asm/page.h
View File

@ -22,15 +22,25 @@
* These are used to make use of C type-checking.. * These are used to make use of C type-checking..
*/ */
#if !defined(CONFIG_MMU) || CONFIG_PGTABLE_LEVELS == 3 #if !defined(CONFIG_MMU) || CONFIG_PGTABLE_LEVELS == 3
typedef struct { unsigned long pmd[16]; } pmd_t; typedef struct { unsigned long pmd; } pmd_t;
#define pmd_val(x) ((&x)->pmd[0]) #define pmd_val(x) ((&x)->pmd)
#define __pmd(x) ((pmd_t) { { (x) }, }) #define __pmd(x) ((pmd_t) { (x) } )
#endif #endif
typedef struct { unsigned long pte; } pte_t; typedef struct { unsigned long pte; } pte_t;
typedef struct { unsigned long pgd; } pgd_t; typedef struct { unsigned long pgd; } pgd_t;
typedef struct { unsigned long pgprot; } pgprot_t; typedef struct { unsigned long pgprot; } pgprot_t;
#if defined(CONFIG_SUN3)
/*
* Sun3 still uses the asm-generic/pgalloc.h code and thus needs this
* definition. It would be possible to unify Sun3 and ColdFire pgalloc and have
* all of m68k use the same type.
*/
typedef struct page *pgtable_t; typedef struct page *pgtable_t;
#else
typedef pte_t *pgtable_t;
#endif
#define pte_val(x) ((x).pte) #define pte_val(x) ((x).pte)
#define pgd_val(x) ((x).pgd) #define pgd_val(x) ((x).pgd)

10
arch/m68k/include/asm/pgtable_mm.h
View File

@ -36,7 +36,7 @@
/* PMD_SHIFT determines the size of the area a second-level page table can map */ /* PMD_SHIFT determines the size of the area a second-level page table can map */
#if CONFIG_PGTABLE_LEVELS == 3 #if CONFIG_PGTABLE_LEVELS == 3
#define PMD_SHIFT 22 #define PMD_SHIFT 18
#endif #endif
#define PMD_SIZE (1UL << PMD_SHIFT) #define PMD_SIZE (1UL << PMD_SHIFT)
#define PMD_MASK (~(PMD_SIZE-1)) #define PMD_MASK (~(PMD_SIZE-1))
@ -67,8 +67,8 @@
#define PTRS_PER_PMD 1 #define PTRS_PER_PMD 1
#define PTRS_PER_PGD 1024 #define PTRS_PER_PGD 1024
#else #else
#define PTRS_PER_PTE 1024 #define PTRS_PER_PTE 64
#define PTRS_PER_PMD 8 #define PTRS_PER_PMD 128
#define PTRS_PER_PGD 128 #define PTRS_PER_PGD 128
#endif #endif
#define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE)
@ -76,8 +76,8 @@
/* Virtual address region for use by kernel_map() */ /* Virtual address region for use by kernel_map() */
#ifdef CONFIG_SUN3 #ifdef CONFIG_SUN3
#define KMAP_START 0x0DC00000 #define KMAP_START 0x0dc00000
#define KMAP_END 0x0E000000 #define KMAP_END 0x0e000000
#elif defined(CONFIG_COLDFIRE) #elif defined(CONFIG_COLDFIRE)
#define KMAP_START 0xe0000000 #define KMAP_START 0xe0000000
#define KMAP_END 0xf0000000 #define KMAP_END 0xf0000000

34
arch/m68k/mm/init.c
View File

@ -40,11 +40,6 @@
void *empty_zero_page; void *empty_zero_page;
EXPORT_SYMBOL(empty_zero_page); EXPORT_SYMBOL(empty_zero_page);
#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
extern void init_pointer_table(unsigned long ptable);
extern pmd_t *zero_pgtable;
#endif
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
pg_data_t pg_data_map[MAX_NUMNODES]; pg_data_t pg_data_map[MAX_NUMNODES];
@ -125,20 +120,31 @@ void free_initmem(void)
static inline void init_pointer_tables(void) static inline void init_pointer_tables(void)
{ {
#if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE) #if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
int i; int i, j;
/* insert pointer tables allocated so far into the tablelist */ /* insert pointer tables allocated so far into the tablelist */
init_pointer_table((unsigned long)kernel_pg_dir); init_pointer_table(kernel_pg_dir, TABLE_PGD);
for (i = 0; i < PTRS_PER_PGD; i++) { for (i = 0; i < PTRS_PER_PGD; i++) {
pud_t *pud = (pud_t *)(&kernel_pg_dir[i]); pud_t *pud = (pud_t *)&kernel_pg_dir[i];
pmd_t *pmd_dir;
if (pud_present(*pud)) if (!pud_present(*pud))
init_pointer_table(pgd_page_vaddr(kernel_pg_dir[i])); continue;
pmd_dir = (pmd_t *)pgd_page_vaddr(kernel_pg_dir[i]);
init_pointer_table(pmd_dir, TABLE_PMD);
for (j = 0; j < PTRS_PER_PMD; j++) {
pmd_t *pmd = &pmd_dir[j];
pte_t *pte_dir;
if (!pmd_present(*pmd))
continue;
pte_dir = (pte_t *)__pmd_page(*pmd);
init_pointer_table(pte_dir, TABLE_PTE);
}
} }
/* insert also pointer table that we used to unmap the zero page */
if (zero_pgtable)
init_pointer_table((unsigned long)zero_pgtable);
#endif #endif
} }

36
arch/m68k/mm/kmap.c
View File

@ -24,8 +24,6 @@
#undef DEBUG #undef DEBUG
#define PTRTREESIZE (256*1024)
/* /*
* For 040/060 we can use the virtual memory area like other architectures, * For 040/060 we can use the virtual memory area like other architectures,
* but for 020/030 we want to use early termination page descriptors and we * but for 020/030 we want to use early termination page descriptors and we
@ -50,7 +48,7 @@ static inline void free_io_area(void *addr)
#else #else
#define IO_SIZE (256*1024) #define IO_SIZE PMD_SIZE
static struct vm_struct *iolist; static struct vm_struct *iolist;
@ -81,14 +79,13 @@ static void __free_io_area(void *addr, unsigned long size)
#if CONFIG_PGTABLE_LEVELS == 3 #if CONFIG_PGTABLE_LEVELS == 3
if (CPU_IS_020_OR_030) { if (CPU_IS_020_OR_030) {
int pmd_off = (virtaddr/PTRTREESIZE) & 15; int pmd_type = pmd_val(*pmd_dir) & _DESCTYPE_MASK;
int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK;
if (pmd_type == _PAGE_PRESENT) { if (pmd_type == _PAGE_PRESENT) {
pmd_dir->pmd[pmd_off] = 0; pmd_clear(pmd_dir);
virtaddr += PTRTREESIZE; virtaddr += PMD_SIZE;
size -= PTRTREESIZE; size -= PMD_SIZE;
continue;
} else if (pmd_type == 0) } else if (pmd_type == 0)
continue; continue;
} }
@ -249,7 +246,7 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla
while ((long)size > 0) { while ((long)size > 0) {
#ifdef DEBUG #ifdef DEBUG
if (!(virtaddr & (PTRTREESIZE-1))) if (!(virtaddr & (PMD_SIZE-1)))
printk ("\npa=%#lx va=%#lx ", physaddr, virtaddr); printk ("\npa=%#lx va=%#lx ", physaddr, virtaddr);
#endif #endif
pgd_dir = pgd_offset_k(virtaddr); pgd_dir = pgd_offset_k(virtaddr);
@ -263,10 +260,10 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla
#if CONFIG_PGTABLE_LEVELS == 3 #if CONFIG_PGTABLE_LEVELS == 3
if (CPU_IS_020_OR_030) { if (CPU_IS_020_OR_030) {
pmd_dir->pmd[(virtaddr/PTRTREESIZE) & 15] = physaddr; pmd_val(*pmd_dir) = physaddr;
physaddr += PTRTREESIZE; physaddr += PMD_SIZE;
virtaddr += PTRTREESIZE; virtaddr += PMD_SIZE;
size -= PTRTREESIZE; size -= PMD_SIZE;
} else } else
#endif #endif
{ {
@ -367,13 +364,12 @@ void kernel_set_cachemode(void *addr, unsigned long size, int cmode)
#if CONFIG_PGTABLE_LEVELS == 3 #if CONFIG_PGTABLE_LEVELS == 3
if (CPU_IS_020_OR_030) { if (CPU_IS_020_OR_030) {
int pmd_off = (virtaddr/PTRTREESIZE) & 15; unsigned long pmd = pmd_val(*pmd_dir);
if ((pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK) == _PAGE_PRESENT) { if ((pmd & _DESCTYPE_MASK) == _PAGE_PRESENT) {
pmd_dir->pmd[pmd_off] = (pmd_dir->pmd[pmd_off] & *pmd_dir = __pmd((pmd & _CACHEMASK040) | cmode);
_CACHEMASK040) | cmode; virtaddr += PMD_SIZE;
virtaddr += PTRTREESIZE; size -= PMD_SIZE;
size -= PTRTREESIZE;
continue; continue;
} }
} }

103
arch/m68k/mm/memory.c
View File

@ -22,109 +22,6 @@
#include <asm/machdep.h> #include <asm/machdep.h>
/* ++andreas: {get,free}_pointer_table rewritten to use unused fields from
struct page instead of separately kmalloced struct. Stolen from
arch/sparc/mm/srmmu.c ... */
typedef struct list_head ptable_desc;
static LIST_HEAD(ptable_list);
#define PD_PTABLE(page) ((ptable_desc *)&(virt_to_page(page)->lru))
#define PD_PAGE(ptable) (list_entry(ptable, struct page, lru))
#define PD_MARKBITS(dp) (*(unsigned char *)&PD_PAGE(dp)->index)
#define PTABLE_SIZE (PTRS_PER_PMD * sizeof(pmd_t))
void __init init_pointer_table(unsigned long ptable)
{
ptable_desc *dp;
unsigned long page = ptable & PAGE_MASK;
unsigned char mask = 1 << ((ptable - page)/PTABLE_SIZE);
dp = PD_PTABLE(page);
if (!(PD_MARKBITS(dp) & mask)) {
PD_MARKBITS(dp) = 0xff;
list_add(dp, &ptable_list);
}
PD_MARKBITS(dp) &= ~mask;
pr_debug("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));
/* unreserve the page so it's possible to free that page */
__ClearPageReserved(PD_PAGE(dp));
init_page_count(PD_PAGE(dp));
return;
}
pmd_t *get_pointer_table (void)
{
ptable_desc *dp = ptable_list.next;
unsigned char mask = PD_MARKBITS (dp);
unsigned char tmp;
unsigned int off;
/*
* For a pointer table for a user process address space, a
* table is taken from a page allocated for the purpose. Each
* page can hold 8 pointer tables. The page is remapped in
* virtual address space to be noncacheable.
*/
if (mask == 0) {
void *page;
ptable_desc *new;
if (!(page = (void *)get_zeroed_page(GFP_KERNEL)))
return NULL;
flush_tlb_kernel_page(page);
nocache_page(page);
new = PD_PTABLE(page);
PD_MARKBITS(new) = 0xfe;
list_add_tail(new, dp);
return (pmd_t *)page;
}
for (tmp = 1, off = 0; (mask & tmp) == 0; tmp <<= 1, off += PTABLE_SIZE)
;
PD_MARKBITS(dp) = mask & ~tmp;
if (!PD_MARKBITS(dp)) {
/* move to end of list */
list_move_tail(dp, &ptable_list);
}
return (pmd_t *) (page_address(PD_PAGE(dp)) + off);
}
int free_pointer_table (pmd_t *ptable)
{
ptable_desc *dp;
unsigned long page = (unsigned long)ptable & PAGE_MASK;
unsigned char mask = 1 << (((unsigned long)ptable - page)/PTABLE_SIZE);
dp = PD_PTABLE(page);
if (PD_MARKBITS (dp) & mask)
panic ("table already free!");
PD_MARKBITS (dp) |= mask;
if (PD_MARKBITS(dp) == 0xff) {
/* all tables in page are free, free page */
list_del(dp);
cache_page((void *)page);
free_page (page);
return 1;
} else if (ptable_list.next != dp) {
/*
* move this descriptor to the front of the list, since
* it has one or more free tables.
*/
list_move(dp, &ptable_list);
}
return 0;
}
/* invalidate page in both caches */ /* invalidate page in both caches */
static inline void clear040(unsigned long paddr) static inline void clear040(unsigned long paddr)
{ {

228
arch/m68k/mm/motorola.c
View File

@ -45,34 +45,185 @@ unsigned long mm_cachebits;
EXPORT_SYMBOL(mm_cachebits); EXPORT_SYMBOL(mm_cachebits);
#endif #endif
/*
* Motorola 680x0 user's manual recommends using uncached memory for address
* translation tables.
*
* Seeing how the MMU can be external on (some of) these chips, that seems like
* a very important recommendation to follow. Provide some helpers to combat
* 'variation' amongst the users of this.
*/
void mmu_page_ctor(void *page)
{
__flush_page_to_ram(page);
flush_tlb_kernel_page(page);
nocache_page(page);
}
void mmu_page_dtor(void *page)
{
cache_page(page);
}
/* ++andreas: {get,free}_pointer_table rewritten to use unused fields from
struct page instead of separately kmalloced struct. Stolen from
arch/sparc/mm/srmmu.c ... */
typedef struct list_head ptable_desc;
static struct list_head ptable_list[2] = {
LIST_HEAD_INIT(ptable_list[0]),
LIST_HEAD_INIT(ptable_list[1]),
};
#define PD_PTABLE(page) ((ptable_desc *)&(virt_to_page(page)->lru))
#define PD_PAGE(ptable) (list_entry(ptable, struct page, lru))
#define PD_MARKBITS(dp) (*(unsigned int *)&PD_PAGE(dp)->index)
static const int ptable_shift[2] = {
7+2, /* PGD, PMD */
6+2, /* PTE */
};
#define ptable_size(type) (1U << ptable_shift[type])
#define ptable_mask(type) ((1U << (PAGE_SIZE / ptable_size(type))) - 1)
void __init init_pointer_table(void *table, int type)
{
ptable_desc *dp;
unsigned long ptable = (unsigned long)table;
unsigned long page = ptable & PAGE_MASK;
unsigned int mask = 1U << ((ptable - page)/ptable_size(type));
dp = PD_PTABLE(page);
if (!(PD_MARKBITS(dp) & mask)) {
PD_MARKBITS(dp) = ptable_mask(type);
list_add(dp, &ptable_list[type]);
}
PD_MARKBITS(dp) &= ~mask;
pr_debug("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));
/* unreserve the page so it's possible to free that page */
__ClearPageReserved(PD_PAGE(dp));
init_page_count(PD_PAGE(dp));
return;
}
void *get_pointer_table(int type)
{
ptable_desc *dp = ptable_list[type].next;
unsigned int mask = list_empty(&ptable_list[type]) ? 0 : PD_MARKBITS(dp);
unsigned int tmp, off;
/*
* For a pointer table for a user process address space, a
* table is taken from a page allocated for the purpose. Each
* page can hold 8 pointer tables. The page is remapped in
* virtual address space to be noncacheable.
*/
if (mask == 0) {
void *page;
ptable_desc *new;
if (!(page = (void *)get_zeroed_page(GFP_KERNEL)))
return NULL;
if (type == TABLE_PTE) {
/*
* m68k doesn't have SPLIT_PTE_PTLOCKS for not having
* SMP.
*/
pgtable_pte_page_ctor(virt_to_page(page));
}
mmu_page_ctor(page);
new = PD_PTABLE(page);
PD_MARKBITS(new) = ptable_mask(type) - 1;
list_add_tail(new, dp);
return (pmd_t *)page;
}
for (tmp = 1, off = 0; (mask & tmp) == 0; tmp <<= 1, off += ptable_size(type))
;
PD_MARKBITS(dp) = mask & ~tmp;
if (!PD_MARKBITS(dp)) {
/* move to end of list */
list_move_tail(dp, &ptable_list[type]);
}
return page_address(PD_PAGE(dp)) + off;
}
int free_pointer_table(void *table, int type)
{
ptable_desc *dp;
unsigned long ptable = (unsigned long)table;
unsigned long page = ptable & PAGE_MASK;
unsigned int mask = 1U << ((ptable - page)/ptable_size(type));
dp = PD_PTABLE(page);
if (PD_MARKBITS (dp) & mask)
panic ("table already free!");
PD_MARKBITS (dp) |= mask;
if (PD_MARKBITS(dp) == ptable_mask(type)) {
/* all tables in page are free, free page */
list_del(dp);
mmu_page_dtor((void *)page);
if (type == TABLE_PTE)
pgtable_pte_page_dtor(virt_to_page(page));
free_page (page);
return 1;
} else if (ptable_list[type].next != dp) {
/*
* move this descriptor to the front of the list, since
* it has one or more free tables.
*/
list_move(dp, &ptable_list[type]);
}
return 0;
}
/* size of memory already mapped in head.S */ /* size of memory already mapped in head.S */
extern __initdata unsigned long m68k_init_mapped_size; extern __initdata unsigned long m68k_init_mapped_size;
extern unsigned long availmem; extern unsigned long availmem;
static pte_t *last_pte_table __initdata = NULL;
static pte_t * __init kernel_page_table(void) static pte_t * __init kernel_page_table(void)
{ {
pte_t *ptablep; pte_t *pte_table = last_pte_table;
ptablep = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); if (((unsigned long)last_pte_table & ~PAGE_MASK) == 0) {
if (!ptablep) pte_table = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE);
panic("%s: Failed to allocate %lu bytes align=%lx\n", if (!pte_table) {
__func__, PAGE_SIZE, PAGE_SIZE); panic("%s: Failed to allocate %lu bytes align=%lx\n",
__func__, PAGE_SIZE, PAGE_SIZE);
}
clear_page(ptablep); clear_page(pte_table);
__flush_page_to_ram(ptablep); mmu_page_ctor(pte_table);
flush_tlb_kernel_page(ptablep);
nocache_page(ptablep);
return ptablep; last_pte_table = pte_table;
}
last_pte_table += PTRS_PER_PTE;
return pte_table;
} }
static pmd_t *last_pgtable __initdata = NULL; static pmd_t *last_pmd_table __initdata = NULL;
pmd_t *zero_pgtable __initdata = NULL;
static pmd_t * __init kernel_ptr_table(void) static pmd_t * __init kernel_ptr_table(void)
{ {
if (!last_pgtable) { if (!last_pmd_table) {
unsigned long pmd, last; unsigned long pmd, last;
int i; int i;
@ -91,33 +242,29 @@ static pmd_t * __init kernel_ptr_table(void)
last = pmd; last = pmd;
} }
last_pgtable = (pmd_t *)last; last_pmd_table = (pmd_t *)last;
#ifdef DEBUG #ifdef DEBUG
printk("kernel_ptr_init: %p\n", last_pgtable); printk("kernel_ptr_init: %p\n", last_pmd_table);
#endif #endif
} }
last_pgtable += PTRS_PER_PMD; last_pmd_table += PTRS_PER_PMD;
if (((unsigned long)last_pgtable & ~PAGE_MASK) == 0) { if (((unsigned long)last_pmd_table & ~PAGE_MASK) == 0) {
last_pgtable = (pmd_t *)memblock_alloc_low(PAGE_SIZE, last_pmd_table = (pmd_t *)memblock_alloc_low(PAGE_SIZE,
PAGE_SIZE); PAGE_SIZE);
if (!last_pgtable) if (!last_pmd_table)
panic("%s: Failed to allocate %lu bytes align=%lx\n", panic("%s: Failed to allocate %lu bytes align=%lx\n",
__func__, PAGE_SIZE, PAGE_SIZE); __func__, PAGE_SIZE, PAGE_SIZE);
clear_page(last_pgtable); clear_page(last_pmd_table);
__flush_page_to_ram(last_pgtable); mmu_page_ctor(last_pmd_table);
flush_tlb_kernel_page(last_pgtable);
nocache_page(last_pgtable);
} }
return last_pgtable; return last_pmd_table;
} }
static void __init map_node(int node) static void __init map_node(int node)
{ {
#define PTRTREESIZE (256*1024)
#define ROOTTREESIZE (32*1024*1024)
unsigned long physaddr, virtaddr, size; unsigned long physaddr, virtaddr, size;
pgd_t *pgd_dir; pgd_t *pgd_dir;
p4d_t *p4d_dir; p4d_t *p4d_dir;
@ -135,21 +282,21 @@ static void __init map_node(int node)
while (size > 0) { while (size > 0) {
#ifdef DEBUG #ifdef DEBUG
if (!(virtaddr & (PTRTREESIZE-1))) if (!(virtaddr & (PMD_SIZE-1)))
printk ("\npa=%#lx va=%#lx ", physaddr & PAGE_MASK, printk ("\npa=%#lx va=%#lx ", physaddr & PAGE_MASK,
virtaddr); virtaddr);
#endif #endif
pgd_dir = pgd_offset_k(virtaddr); pgd_dir = pgd_offset_k(virtaddr);
if (virtaddr && CPU_IS_020_OR_030) { if (virtaddr && CPU_IS_020_OR_030) {
if (!(virtaddr & (ROOTTREESIZE-1)) && if (!(virtaddr & (PGDIR_SIZE-1)) &&
size >= ROOTTREESIZE) { size >= PGDIR_SIZE) {
#ifdef DEBUG #ifdef DEBUG
printk ("[very early term]"); printk ("[very early term]");
#endif #endif
pgd_val(*pgd_dir) = physaddr; pgd_val(*pgd_dir) = physaddr;
size -= ROOTTREESIZE; size -= PGDIR_SIZE;
virtaddr += ROOTTREESIZE; virtaddr += PGDIR_SIZE;
physaddr += ROOTTREESIZE; physaddr += PGDIR_SIZE;
continue; continue;
} }
} }
@ -169,24 +316,23 @@ static void __init map_node(int node)
#ifdef DEBUG #ifdef DEBUG
printk ("[early term]"); printk ("[early term]");
#endif #endif
pmd_dir->pmd[(virtaddr/PTRTREESIZE) & 15] = physaddr; pmd_val(*pmd_dir) = physaddr;
physaddr += PTRTREESIZE; physaddr += PMD_SIZE;
} else { } else {
int i; int i;
#ifdef DEBUG #ifdef DEBUG
printk ("[zero map]"); printk ("[zero map]");
#endif #endif
zero_pgtable = kernel_ptr_table(); pte_dir = kernel_page_table();
pte_dir = (pte_t *)zero_pgtable; pmd_set(pmd_dir, pte_dir);
pmd_dir->pmd[0] = virt_to_phys(pte_dir) |
_PAGE_TABLE | _PAGE_ACCESSED;
pte_val(*pte_dir++) = 0; pte_val(*pte_dir++) = 0;
physaddr += PAGE_SIZE; physaddr += PAGE_SIZE;
for (i = 1; i < 64; physaddr += PAGE_SIZE, i++) for (i = 1; i < PTRS_PER_PTE; physaddr += PAGE_SIZE, i++)
pte_val(*pte_dir++) = physaddr; pte_val(*pte_dir++) = physaddr;
} }
size -= PTRTREESIZE; size -= PMD_SIZE;
virtaddr += PTRTREESIZE; virtaddr += PMD_SIZE;
} else { } else {
if (!pmd_present(*pmd_dir)) { if (!pmd_present(*pmd_dir)) {
#ifdef DEBUG #ifdef DEBUG

9
drivers/dio/dio-driver.c
View File

@ -25,7 +25,7 @@
* dio_device_id structure or %NULL if there is no match. * dio_device_id structure or %NULL if there is no match.
*/ */
const struct dio_device_id * static const struct dio_device_id *
dio_match_device(const struct dio_device_id *ids, dio_match_device(const struct dio_device_id *ids,
const struct dio_dev *d) const struct dio_dev *d)
{ {
@ -105,9 +105,9 @@ void dio_unregister_driver(struct dio_driver *drv)
* @dev: the DIO device structure to match against * @dev: the DIO device structure to match against
* @drv: the &device_driver that points to the array of DIO device id structures to search * @drv: the &device_driver that points to the array of DIO device id structures to search
* *
* Used by a driver to check whether a DIO device present in the * Used by the driver core to check whether a DIO device present in the
* system is in its list of supported devices. Returns the matching * system is in a driver's list of supported devices. Returns 1 if supported,
* dio_device_id structure or %NULL if there is no match. * and 0 if there is no match.
*/ */
static int dio_bus_match(struct device *dev, struct device_driver *drv) static int dio_bus_match(struct device *dev, struct device_driver *drv)
@ -137,7 +137,6 @@ static int __init dio_driver_init(void)
postcore_initcall(dio_driver_init); postcore_initcall(dio_driver_init);
EXPORT_SYMBOL(dio_match_device);
EXPORT_SYMBOL(dio_register_driver); EXPORT_SYMBOL(dio_register_driver);
EXPORT_SYMBOL(dio_unregister_driver); EXPORT_SYMBOL(dio_unregister_driver);
EXPORT_SYMBOL(dio_bus_type); EXPORT_SYMBOL(dio_bus_type);

12
drivers/video/fbdev/c2p_core.h
View File

@ -12,6 +12,8 @@
* for more details. * for more details.
*/ */
#include <linux/build_bug.h>
/* /*
* Basic transpose step * Basic transpose step
@ -27,8 +29,6 @@ static inline void _transp(u32 d[], unsigned int i1, unsigned int i2,
} }
extern void c2p_unsupported(void);
static __always_inline u32 get_mask(unsigned int n) static __always_inline u32 get_mask(unsigned int n)
{ {
switch (n) { switch (n) {
@ -48,7 +48,7 @@ static __always_inline u32 get_mask(unsigned int n)
return 0x0000ffff; return 0x0000ffff;
} }
c2p_unsupported(); BUILD_BUG();
return 0; return 0;
} }
@ -91,7 +91,7 @@ static __always_inline void transp8(u32 d[], unsigned int n, unsigned int m)
return; return;
} }
c2p_unsupported(); BUILD_BUG();
} }
@ -118,7 +118,7 @@ static __always_inline void transp4(u32 d[], unsigned int n, unsigned int m)
return; return;
} }
c2p_unsupported(); BUILD_BUG();
} }
@ -138,7 +138,7 @@ static __always_inline void transp4x(u32 d[], unsigned int n, unsigned int m)
return; return;
} }
c2p_unsupported(); BUILD_BUG();
} }

16
drivers/zorro/zorro-driver.c
View File

@ -28,7 +28,7 @@
* zorro_device_id structure or %NULL if there is no match. * zorro_device_id structure or %NULL if there is no match.
*/ */
const struct zorro_device_id * static const struct zorro_device_id *
zorro_match_device(const struct zorro_device_id *ids, zorro_match_device(const struct zorro_device_id *ids,
const struct zorro_dev *z) const struct zorro_dev *z)
{ {
@ -39,7 +39,6 @@ zorro_match_device(const struct zorro_device_id *ids,
} }
return NULL; return NULL;
} }
EXPORT_SYMBOL(zorro_match_device);
static int zorro_device_probe(struct device *dev) static int zorro_device_probe(struct device *dev)
@ -120,9 +119,9 @@ EXPORT_SYMBOL(zorro_unregister_driver);
* @ids: array of Zorro device id structures to search in * @ids: array of Zorro device id structures to search in
* @dev: the Zorro device structure to match against * @dev: the Zorro device structure to match against
* *
* Used by a driver to check whether a Zorro device present in the * Used by the driver core to check whether a Zorro device present in the
* system is in its list of supported devices.Returns the matching * system is in a driver's list of supported devices. Returns 1 if
* zorro_device_id structure or %NULL if there is no match. * supported, and 0 if there is no match.
*/ */
static int zorro_bus_match(struct device *dev, struct device_driver *drv) static int zorro_bus_match(struct device *dev, struct device_driver *drv)
@ -134,12 +133,7 @@ static int zorro_bus_match(struct device *dev, struct device_driver *drv)
if (!ids) if (!ids)
return 0; return 0;
while (ids->id) { return !!zorro_match_device(ids, z);
if (ids->id == ZORRO_WILDCARD || ids->id == z->id)
return 1;
ids++;
}
return 0;
} }
static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env) static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)

2
drivers/zorro/zorro.c
View File

@ -41,7 +41,7 @@ struct zorro_dev *zorro_autocon;
struct zorro_bus { struct zorro_bus {
struct device dev; struct device dev;
struct zorro_dev devices[0]; struct zorro_dev devices[];
}; };

7
drivers/zorro/zorro.h
View File

@ -1,5 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/*
* Zorro bus
*/
extern struct bus_type zorro_bus_type;
#ifdef CONFIG_ZORRO_NAMES #ifdef CONFIG_ZORRO_NAMES
extern void zorro_name_device(struct zorro_dev *z); extern void zorro_name_device(struct zorro_dev *z);
#else #else

5
include/linux/dio.h
View File

@ -247,11 +247,6 @@ extern int dio_create_sysfs_dev_files(struct dio_dev *);
/* New-style probing */ /* New-style probing */
extern int dio_register_driver(struct dio_driver *); extern int dio_register_driver(struct dio_driver *);
extern void dio_unregister_driver(struct dio_driver *); extern void dio_unregister_driver(struct dio_driver *);
extern const struct dio_device_id *dio_match_device(const struct dio_device_id *ids, const struct dio_dev *z);
static inline struct dio_driver *dio_dev_driver(const struct dio_dev *d)
{
return d->driver;
}
#define dio_resource_start(d) ((d)->resource.start) #define dio_resource_start(d) ((d)->resource.start)
#define dio_resource_end(d) ((d)->resource.end) #define dio_resource_end(d) ((d)->resource.end)

12
include/linux/zorro.h
View File

@ -40,13 +40,6 @@ struct zorro_dev {
#define to_zorro_dev(n) container_of(n, struct zorro_dev, dev) #define to_zorro_dev(n) container_of(n, struct zorro_dev, dev)
/*
* Zorro bus
*/
extern struct bus_type zorro_bus_type;
/* /*
* Zorro device drivers * Zorro device drivers
*/ */
@ -70,11 +63,6 @@ struct zorro_driver {
/* New-style probing */ /* New-style probing */
extern int zorro_register_driver(struct zorro_driver *); extern int zorro_register_driver(struct zorro_driver *);
extern void zorro_unregister_driver(struct zorro_driver *); extern void zorro_unregister_driver(struct zorro_driver *);
extern const struct zorro_device_id *zorro_match_device(const struct zorro_device_id *ids, const struct zorro_dev *z);
static inline struct zorro_driver *zorro_dev_driver(const struct zorro_dev *z)
{
return z->driver;
}
extern unsigned int zorro_num_autocon; /* # of autoconfig devices found */ extern unsigned int zorro_num_autocon; /* # of autoconfig devices found */