apm821xx: use the real default HZ value from upstream

With the "real HZ" debate out of the way, let's actually
use the apm821xx's default upstream config file at
arch/powerpc/configs/44x/bluestone_defconfig. From what
I can tell, it sets NO_HZ (well, this platform was for
NAS, so this is a bit unexpected) and remove any specific
HZ_$VALUE symbol.

Sadly, Daniel Engberg didn't run any before/after netperf
tests, because it would have been such a slam dunk across
the boards. In case of the apm821xx the tcp tx/rx
performance improved ~14% (from 600Mbps to 700Mps).
This now causes the emac to drop frames too, so let's see
if this is causes more problems or not.

This patch includes a refresh of the configuration too.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Christian Lamparter 2020-03-29 21:07:37 +02:00
parent 1b973b54ea
commit 8ce138607e

View File

@ -3,9 +3,7 @@ CONFIG_44x=y
CONFIG_460EX=y CONFIG_460EX=y
CONFIG_4xx=y CONFIG_4xx=y
CONFIG_4xx_SOC=y CONFIG_4xx_SOC=y
# CONFIG_ADIN_PHY is not set
# CONFIG_ADVANCED_OPTIONS is not set # CONFIG_ADVANCED_OPTIONS is not set
# CONFIG_AL_FIC is not set
CONFIG_APM821xx=y CONFIG_APM821xx=y
CONFIG_APOLLO3G=y CONFIG_APOLLO3G=y
# CONFIG_ARCHES is not set # CONFIG_ARCHES is not set
@ -48,7 +46,6 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
CONFIG_AUDIT_ARCH=y CONFIG_AUDIT_ARCH=y
# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
# CONFIG_BAMBOO is not set # CONFIG_BAMBOO is not set
# CONFIG_BLK_DEV_INITRD is not set # CONFIG_BLK_DEV_INITRD is not set
CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_PCI=y
@ -57,36 +54,28 @@ CONFIG_BLUESTONE=y
CONFIG_BOOKE=y CONFIG_BOOKE=y
CONFIG_BOOKE_WDT=y CONFIG_BOOKE_WDT=y
# CONFIG_CANYONLANDS is not set # CONFIG_CANYONLANDS is not set
CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_KASAN_GENERIC=y
CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
CONFIG_CLONE_BACKWARDS=y CONFIG_CLONE_BACKWARDS=y
CONFIG_CMDLINE="rootfstype=squashfs noinitrd" CONFIG_CMDLINE="rootfstype=squashfs noinitrd"
CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE_BOOL=y
CONFIG_COMPAT_32BIT_TIME=y CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COUNTER is not set
CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CRC16=y CONFIG_CRC16=y
# CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_SARWATE is not set
CONFIG_CRC32_SLICEBY8=y CONFIG_CRC32_SLICEBY8=y
CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_ACOMP2=y
# CONFIG_CRYPTO_ADIANTUM is not set
CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AKCIPHER2=y
CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTR=y
CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DEFLATE=y
# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
CONFIG_CRYPTO_DEV_PPC4XX=y CONFIG_CRYPTO_DEV_PPC4XX=y
CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_DRBG=y
CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_HMAC=y
CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_ECB=y
# CONFIG_CRYPTO_ECRDSA is not set
CONFIG_CRYPTO_ESSIV=y CONFIG_CRYPTO_ESSIV=y
CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GCM=y
CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GF128MUL=y
@ -96,8 +85,6 @@ CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_JITTERENTROPY=y CONFIG_CRYPTO_JITTERENTROPY=y
CONFIG_CRYPTO_KPP2=y
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_LZO=y
CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER=y
@ -112,11 +99,8 @@ CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_SHA1_PPC=y CONFIG_CRYPTO_SHA1_PPC=y
CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA256=y
# CONFIG_CRYPTO_STREEBOG is not set
# CONFIG_CRYPTO_XXHASH is not set
CONFIG_DATA_SHIFT=12 CONFIG_DATA_SHIFT=12
CONFIG_DEBUG_MISC=y CONFIG_DEBUG_MISC=y
# CONFIG_DEBUG_PLIST is not set
CONFIG_DMA_DIRECT_REMAP=y CONFIG_DMA_DIRECT_REMAP=y
CONFIG_DMA_REMAP=y CONFIG_DMA_REMAP=y
CONFIG_DTC=y CONFIG_DTC=y
@ -125,18 +109,13 @@ CONFIG_EARLY_PRINTK=y
# CONFIG_EBONY is not set # CONFIG_EBONY is not set
CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_ATOMIC_SCRUB=y
CONFIG_EDAC_SUPPORT=y CONFIG_EDAC_SUPPORT=y
# CONFIG_EEPROM_EE1004 is not set
# CONFIG_EIGER is not set # CONFIG_EIGER is not set
CONFIG_ETEXT_SHIFT=12 CONFIG_ETEXT_SHIFT=12
# CONFIG_EXFAT_FS is not set
CONFIG_EXTRA_TARGETS="uImage" CONFIG_EXTRA_TARGETS="uImage"
# CONFIG_FIELDBUS_DEV is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FORCE_PCI=y CONFIG_FORCE_PCI=y
CONFIG_FREEZER=y CONFIG_FREEZER=y
# CONFIG_FSL_LBC is not set # CONFIG_FSL_LBC is not set
# CONFIG_FS_VERITY is not set
# CONFIG_FW_LOADER_COMPRESS is not set
CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_PAGED_BUF=y
CONFIG_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y
# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
@ -164,13 +143,9 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
# CONFIG_GEN_RTC is not set # CONFIG_GEN_RTC is not set
# CONFIG_GLACIER is not set # CONFIG_GLACIER is not set
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
# CONFIG_GPIO_AMD_FCH is not set
# CONFIG_GPIO_CADENCE is not set
CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC=y
CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_GENERIC_PLATFORM=y
# CONFIG_GPIO_GW_PLD is not set
CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SYSFS=y
# CONFIG_HABANA_AI is not set
CONFIG_HAS_DMA=y CONFIG_HAS_DMA=y
CONFIG_HAS_IOMEM=y CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_IOPORT_MAP=y
@ -213,19 +188,12 @@ CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_RSEQ=y CONFIG_HAVE_RSEQ=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
# CONFIG_HEADERS_INSTALL is not set
# CONFIG_HEADER_TEST is not set
CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_PPC4XX=y CONFIG_HW_RANDOM_PPC4XX=y
CONFIG_HZ=1000
CONFIG_HZ_1000=y
CONFIG_HZ_PERIODIC=y
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y CONFIG_I2C_CHARDEV=y
CONFIG_I2C_IBM_IIC=y CONFIG_I2C_IBM_IIC=y
# CONFIG_I2C_NVIDIA_GPU is not set
# CONFIG_I3C is not set
CONFIG_IBM_EMAC=y CONFIG_IBM_EMAC=y
CONFIG_IBM_EMAC_EMAC4=y CONFIG_IBM_EMAC_EMAC4=y
CONFIG_IBM_EMAC_POLL_WEIGHT=32 CONFIG_IBM_EMAC_POLL_WEIGHT=32
@ -235,14 +203,7 @@ CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
CONFIG_IBM_EMAC_TAH=y CONFIG_IBM_EMAC_TAH=y
CONFIG_IBM_EMAC_TXB=128 CONFIG_IBM_EMAC_TXB=128
# CONFIG_ICON is not set # CONFIG_ICON is not set
# CONFIG_IGC is not set
# CONFIG_IKHEADERS is not set
CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_ILLEGAL_POINTER_VALUE=0
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
CONFIG_INIT_STACK_NONE=y
# CONFIG_INTERCONNECT is not set
# CONFIG_IO_URING is not set
CONFIG_IRQCHIP=y CONFIG_IRQCHIP=y
CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_FORCED_THREADING=y
@ -251,47 +212,31 @@ CONFIG_ISA_DMA_API=y
# CONFIG_JFFS2_FS is not set # CONFIG_JFFS2_FS is not set
# CONFIG_KATMAI is not set # CONFIG_KATMAI is not set
CONFIG_KERNEL_START=0xc0000000 CONFIG_KERNEL_START=0xc0000000
# CONFIG_LCD_CLASS_DEVICE is not set
# CONFIG_LEDS_AN30259A is not set
# CONFIG_LEDS_LM3532 is not set
# CONFIG_LEDS_TRIGGER_AUDIO is not set
CONFIG_LEDS_TRIGGER_MTD=y CONFIG_LEDS_TRIGGER_MTD=y
CONFIG_LEDS_TRIGGER_PATTERN=y CONFIG_LEDS_TRIGGER_PATTERN=y
CONFIG_LIBFDT=y CONFIG_LIBFDT=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y
# CONFIG_LOCK_EVENT_COUNTS is not set
CONFIG_LOWMEM_SIZE=0x30000000 CONFIG_LOWMEM_SIZE=0x30000000
CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
CONFIG_LZO_COMPRESS=y CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y CONFIG_LZO_DECOMPRESS=y
# CONFIG_MATH_EMULATION is not set # CONFIG_MATH_EMULATION is not set
CONFIG_MDIO_BUS=y CONFIG_MDIO_BUS=y
# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
CONFIG_MEMFD_CREATE=y CONFIG_MEMFD_CREATE=y
# CONFIG_MFD_MAX77650 is not set
# CONFIG_MFD_STMFX is not set
# CONFIG_MFD_STPMIC1 is not set
# CONFIG_MFD_TQMX86 is not set
CONFIG_MIGRATION=y CONFIG_MIGRATION=y
# CONFIG_MISC_ALCOR_PCI is not set
CONFIG_MODULES_USE_ELF_RELA=y CONFIG_MODULES_USE_ELF_RELA=y
CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_CFI_ADV_OPTIONS=y
# CONFIG_MTD_CFI_GEOMETRY is not set # CONFIG_MTD_CFI_GEOMETRY is not set
# CONFIG_MTD_HYPERBUS is not set
# CONFIG_MTD_RAW_NAND is not set
# CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set # CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set
CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_PER_CPU_KM=y
CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_SG_DMA_LENGTH=y
# CONFIG_NET_SCH_TAPRIO is not set
CONFIG_NET_VENDOR_GOOGLE=y
CONFIG_NET_VENDOR_PENSANDO=y
# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
CONFIG_NOT_COHERENT_CACHE=y CONFIG_NOT_COHERENT_CACHE=y
CONFIG_NO_HZ=y
CONFIG_NO_HZ_COMMON=y
CONFIG_NO_HZ_IDLE=y
CONFIG_NR_IRQS=512 CONFIG_NR_IRQS=512
# CONFIG_NULL_TTY is not set
CONFIG_NVMEM=y CONFIG_NVMEM=y
CONFIG_NVMEM_SYSFS=y CONFIG_NVMEM_SYSFS=y
CONFIG_OF=y CONFIG_OF=y
@ -320,14 +265,9 @@ CONFIG_PHYLIB=y
CONFIG_PHYSICAL_START=0x00000000 CONFIG_PHYSICAL_START=0x00000000
CONFIG_PHYS_64BIT=y CONFIG_PHYS_64BIT=y
CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_PHYS_ADDR_T_64BIT=y
# CONFIG_PHY_CADENCE_DP is not set
# CONFIG_PHY_CADENCE_DPHY is not set
# CONFIG_PHY_FSL_IMX8MQ_USB is not set
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
CONFIG_PLUGIN_HOSTCC="g++" CONFIG_PLUGIN_HOSTCC="g++"
CONFIG_PM=y CONFIG_PM=y
CONFIG_PM_AUTOSLEEP=y CONFIG_PM_AUTOSLEEP=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP=y
CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_GC=y CONFIG_PM_WAKELOCKS_GC=y
@ -363,14 +303,9 @@ CONFIG_PPC_PAGE_SHIFT=12
# CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_PTDUMP is not set
CONFIG_PPC_UDBG_16550=y CONFIG_PPC_UDBG_16550=y
CONFIG_PPC_WERROR=y CONFIG_PPC_WERROR=y
# CONFIG_PRINTK_CALLER is not set
# CONFIG_PSI is not set
CONFIG_PTE_64BIT=y CONFIG_PTE_64BIT=y
# CONFIG_PVPANIC is not set
# CONFIG_RAINIER is not set # CONFIG_RAINIER is not set
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RAS=y CONFIG_RAS=y
# CONFIG_REED_SOLOMON_TEST is not set
CONFIG_RSEQ=y CONFIG_RSEQ=y
# CONFIG_SAM440EP is not set # CONFIG_SAM440EP is not set
# CONFIG_SCOM_DEBUGFS is not set # CONFIG_SCOM_DEBUGFS is not set
@ -378,12 +313,9 @@ CONFIG_RSEQ=y
CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_FSL=y
CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_FSL_LINFLEXUART is not set
CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OF_PLATFORM=y
# CONFIG_SERIAL_SIFIVE is not set
CONFIG_SGL_ALLOC=y CONFIG_SGL_ALLOC=y
# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
CONFIG_SIMPLE_GPIO=y CONFIG_SIMPLE_GPIO=y
CONFIG_SPARSE_IRQ=y CONFIG_SPARSE_IRQ=y
CONFIG_SRCU=y CONFIG_SRCU=y
@ -393,30 +325,17 @@ CONFIG_SWPHY=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_SYSCTL_EXCEPTION_TRACE=y
# CONFIG_TAISHAN is not set # CONFIG_TAISHAN is not set
CONFIG_TASK_SIZE=0xc0000000 CONFIG_TASK_SIZE=0xc0000000
# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_MEMINIT is not set
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_VMALLOC is not set
# CONFIG_TEST_XARRAY is not set
CONFIG_THREAD_INFO_IN_TASK=y CONFIG_THREAD_INFO_IN_TASK=y
CONFIG_THREAD_SHIFT=13 CONFIG_THREAD_SHIFT=13
CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TINY_SRCU=y CONFIG_TINY_SRCU=y
# CONFIG_TI_CPSW_PHY_SEL is not set
# CONFIG_UNICODE is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_SUPPORT=y CONFIG_USB_SUPPORT=y
# CONFIG_VALIDATE_FS_PARSER is not set
CONFIG_VDSO32=y CONFIG_VDSO32=y
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_WARP is not set # CONFIG_WARP is not set
CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WNDR4700 is not set # CONFIG_WNDR4700 is not set
# CONFIG_XILINX_SDFEC is not set
# CONFIG_XILINX_SYSACE is not set # CONFIG_XILINX_SYSACE is not set
# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
CONFIG_XZ_DEC_BCJ=y CONFIG_XZ_DEC_BCJ=y