From cca63ce617da991ea4432677e036dbbb480f85d4 Mon Sep 17 00:00:00 2001 From: bob picco Date: Thu, 13 Jun 2013 10:40:02 -0400 Subject: [PATCH] sparc64 Kconfig and configs V1 I put NR_CPUS maximum at 2048 and NODES_SHIFT at 5. This should cover M5 for the moment. NR_CPUS needs some thought and analysis before going further. I've modified the config files but only tested config-sparc on bare metal T4-2 local to me. I test by copying uek-rpm/ol6/config-sparc .config, make oldconfig and accepting defaults. This doesn't mean bare metal T5 and Athena boots. It also doesn't mean an LDOM guest will boot - not likely without more commits. thanx, bob Signed-off-by: Bob Picco --- arch/sparc/Kconfig | 4 ++-- uek-rpm/ol6/config-sparc | 17 ++++++++++------- uek-rpm/ol6/config-sparc-debug | 13 +++++++------ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 7e503e46c783..a0f62a0d0ea0 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -183,7 +183,7 @@ config NR_CPUS int "Maximum number of CPUs" depends on SMP range 2 32 if SPARC32 - range 2 1024 if SPARC64 + range 2 2048 if SPARC64 default 32 if SPARC32 default 64 if SPARC64 @@ -320,7 +320,7 @@ config NUMA config NODES_SHIFT int - default "4" + default "5" depends on NEED_MULTIPLE_NODES # Some NUMA nodes have memory ranges that span diff --git a/uek-rpm/ol6/config-sparc b/uek-rpm/ol6/config-sparc index 4a1836ec4e52..0c1d46accd46 100644 --- a/uek-rpm/ol6/config-sparc +++ b/uek-rpm/ol6/config-sparc @@ -52,10 +52,12 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y +CONFIG_MAY_HAVE_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_PREFLOW_FASTEOI=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_SPARSE_IRQ=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y @@ -265,7 +267,7 @@ CONFIG_FREEZER=y # Processor type and features # CONFIG_SMP=y -CONFIG_NR_CPUS=1024 +CONFIG_NR_CPUS=2048 # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_300 is not set @@ -300,8 +302,9 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_US3_FREQ=y CONFIG_US2E_FREQ=y CONFIG_US3_MC=y +CONFIG_SPARC_PGTABLE_LEVEL4=y CONFIG_NUMA=y -CONFIG_NODES_SHIFT=4 +CONFIG_NODES_SHIFT=5 CONFIG_NODES_SPAN_OTHER_NODES=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -1208,7 +1211,7 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_ATA_OVER_ETH=m -CONFIG_SUNVDC=y +CONFIG_SUNVDC=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m @@ -1776,7 +1779,7 @@ CONFIG_SUNBMAC=m CONFIG_SUNQE=m CONFIG_SUNGEM=m CONFIG_CASSINI=m -CONFIG_SUNVNET=y +CONFIG_SUNVNET=m CONFIG_NIU=m CONFIG_NET_VENDOR_TEHUTI=y CONFIG_TEHUTI=m @@ -1884,7 +1887,7 @@ CONFIG_WLAN=y CONFIG_LIBERTAS_THINFIRM=m # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set CONFIG_LIBERTAS_THINFIRM_USB=m -CONFIG_ATMEL=m +# CONFIG_ATMEL is not set CONFIG_PCI_ATMEL=m CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m @@ -2402,7 +2405,7 @@ CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=8192 CONFIG_TCG_TPM=y # CONFIG_TCG_TIS_I2C_INFINEON is not set -CONFIG_TCG_ATMEL=m +# CONFIG_TCG_ATMEL is not set CONFIG_DEVPORT=y CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y @@ -2892,7 +2895,7 @@ CONFIG_FB_ATY128=m CONFIG_FB_ATY128_BACKLIGHT=y CONFIG_FB_ATY=m # CONFIG_FB_ATY_CT is not set -CONFIG_FB_ATY_GX=y +# CONFIG_FB_ATY_GX is not set CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_S3 is not set CONFIG_FB_SAVAGE=m diff --git a/uek-rpm/ol6/config-sparc-debug b/uek-rpm/ol6/config-sparc-debug index e621427f73b9..b30cc7f185f4 100644 --- a/uek-rpm/ol6/config-sparc-debug +++ b/uek-rpm/ol6/config-sparc-debug @@ -260,7 +260,7 @@ CONFIG_FREEZER=y # Processor type and features # CONFIG_SMP=y -CONFIG_NR_CPUS=1024 +CONFIG_NR_CPUS=2048 # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_300 is not set @@ -295,8 +295,9 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_US3_FREQ=y CONFIG_US2E_FREQ=y CONFIG_US3_MC=y +CONFIG_SPARC_PGTABLE_LEVEL4=y CONFIG_NUMA=y -CONFIG_NODES_SHIFT=4 +CONFIG_NODES_SHIFT=5 CONFIG_NODES_SPAN_OTHER_NODES=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -1204,7 +1205,7 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_ATA_OVER_ETH=m -CONFIG_SUNVDC=y +CONFIG_SUNVDC=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m @@ -1772,7 +1773,7 @@ CONFIG_SUNBMAC=m CONFIG_SUNQE=m CONFIG_SUNGEM=m CONFIG_CASSINI=m -CONFIG_SUNVNET=y +CONFIG_SUNVNET=m CONFIG_NIU=m CONFIG_NET_VENDOR_TEHUTI=y CONFIG_TEHUTI=m @@ -2398,7 +2399,7 @@ CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=8192 CONFIG_TCG_TPM=y # CONFIG_TCG_TIS_I2C_INFINEON is not set -CONFIG_TCG_ATMEL=m +# CONFIG_TCG_ATMEL is not set CONFIG_DEVPORT=y CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y @@ -2888,7 +2889,7 @@ CONFIG_FB_ATY128=m CONFIG_FB_ATY128_BACKLIGHT=y CONFIG_FB_ATY=m # CONFIG_FB_ATY_CT is not set -CONFIG_FB_ATY_GX=y +# CONFIG_FB_ATY_GX is not set CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_S3 is not set CONFIG_FB_SAVAGE=m -- 2.50.1