Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 278ecbf0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

  - switch to using the generic remapping DMA allocator

  - defconfig updates

* tag 'm68k-for-v5.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Implement arch_dma_prep_coherent()
  m68k: Use the generic dma coherent remap allocator
  m68k: defconfig: Update defconfigs for v5.2-rc1
parents dfd437a2 69878ef4

arch/m68k/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ config M68K 
	bool

	default y

	select ARCH_32BIT_OFF_T

	select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE

	select ARCH_HAS_DMA_PREP_COHERENT

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA

	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA

	select ARCH_NO_COHERENT_DMA_MMAP if !MMU

	select ARCH_NO_PREEMPT if !COLDFIRE

	select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE

	select HAVE_IDE

	select HAVE_AOUT if MMU

	select HAVE_DEBUG_BUGVERBOSE

arch/m68k/configs/amiga_defconfig

+7 −10
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ CONFIG_INET_AH=m 
CONFIG_INET_ESP=m

CONFIG_INET_ESP_OFFLOAD=m

CONFIG_INET_IPCOMP=m

CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_INET_RAW_DIAG=m
@@ -205,7 +202,6 @@ CONFIG_IP_SET_HASH_NETNET=m 
CONFIG_IP_SET_HASH_NETPORT=m

CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y
@@ -231,7 +227,6 @@ CONFIG_IP_NF_RAW=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -308,7 +303,6 @@ CONFIG_AF_KCM=m 
# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -436,6 +430,8 @@ CONFIG_FB_AMIGA_OCS=y 
CONFIG_FB_AMIGA_ECS=y

CONFIG_FB_AMIGA_AGA=y

CONFIG_FB_FM2=y

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=m
@@ -553,13 +549,14 @@ CONFIG_NLS_MAC_TURKISH=m 
CONFIG_DLM=m

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m
@@ -583,7 +580,6 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -626,6 +622,7 @@ CONFIG_ATOMIC64_SELFTEST=m 
CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

arch/m68k/configs/apollo_defconfig

+7 −10
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ CONFIG_INET_AH=m 
CONFIG_INET_ESP=m

CONFIG_INET_ESP_OFFLOAD=m

CONFIG_INET_IPCOMP=m

CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_INET_RAW_DIAG=m
@@ -201,7 +198,6 @@ CONFIG_IP_SET_HASH_NETNET=m 
CONFIG_IP_SET_HASH_NETPORT=m

CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y
@@ -227,7 +223,6 @@ CONFIG_IP_NF_RAW=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -304,7 +299,6 @@ CONFIG_AF_KCM=m 
# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -397,6 +391,8 @@ CONFIG_PPS_CLIENT_LDISC=m 
CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

CONFIG_FB=y

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -513,13 +509,14 @@ CONFIG_NLS_MAC_TURKISH=m 
CONFIG_DLM=m

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m
@@ -543,7 +540,6 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -586,6 +582,7 @@ CONFIG_ATOMIC64_SELFTEST=m 
CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

arch/m68k/configs/atari_defconfig

+7 −10
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ CONFIG_INET_AH=m 
CONFIG_INET_ESP=m

CONFIG_INET_ESP_OFFLOAD=m

CONFIG_INET_IPCOMP=m

CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_INET_RAW_DIAG=m
@@ -208,7 +205,6 @@ CONFIG_IP_SET_HASH_NETNET=m 
CONFIG_IP_SET_HASH_NETPORT=m

CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y
@@ -234,7 +230,6 @@ CONFIG_IP_NF_RAW=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -311,7 +306,6 @@ CONFIG_AF_KCM=m 
# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -421,6 +415,8 @@ CONFIG_PTP_1588_CLOCK=m 
# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_ATARI=y

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=m
@@ -535,13 +531,14 @@ CONFIG_NLS_MAC_TURKISH=m 
CONFIG_DLM=m

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m
@@ -565,7 +562,6 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -608,6 +604,7 @@ CONFIG_ATOMIC64_SELFTEST=m 
CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

arch/m68k/configs/bvme6000_defconfig

+7 −10
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ CONFIG_INET_AH=m 
CONFIG_INET_ESP=m

CONFIG_INET_ESP_OFFLOAD=m

CONFIG_INET_IPCOMP=m

CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_INET_RAW_DIAG=m
@@ -198,7 +195,6 @@ CONFIG_IP_SET_HASH_NETNET=m 
CONFIG_IP_SET_HASH_NETPORT=m

CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y
@@ -224,7 +220,6 @@ CONFIG_IP_NF_RAW=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -301,7 +296,6 @@ CONFIG_AF_KCM=m 
# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -394,6 +388,8 @@ CONFIG_NTP_PPS=y 
CONFIG_PPS_CLIENT_LDISC=m

CONFIG_PTP_1588_CLOCK=m

# CONFIG_HWMON is not set

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

CONFIG_HID=m

CONFIG_HIDRAW=y

CONFIG_UHID=m
@@ -506,13 +502,14 @@ CONFIG_NLS_MAC_TURKISH=m 
CONFIG_DLM=m

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m
@@ -536,7 +533,6 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -579,6 +575,7 @@ CONFIG_ATOMIC64_SELFTEST=m 
CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m