irq remapping ops for x86
Joerg Roedel
maintainer(again as a signed email)
Hi Ingo,
The following changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3:
Linux 3.4-rc6 (2012-05-06 15:07:32 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git intr-remapping-ops
or as a signed tag at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git intr-remapping-ops-for-ingo
Joerg Roedel (8):
iommu: Rename intr_remapping files to intel_intr_remapping iommu/vt-d: Make intr-remapping initialization generic iommu/vt-d: Convert missing apic.c intr-remapping call to remap_ops iommu/vt-d: Convert IR ioapic-setup to use remap_ops iommu/vt-d: Convert IR set_affinity function to remap_ops iommu/vt-d: Convert free_irte into a remap_ops callback iommu/vt-d: Convert MSI remapping setup to remap_ops x86, iommu/vt-d: Clean up interfaces for interrupt remapping
Suresh Siddha (2):
iommu: rename intr_remapping references to irq_remapping
iommu: rename intr_remapping.[ch] to irq_remapping.[ch]
arch/ia64/include/asm/irq_remapping.h | 4 +
arch/x86/include/asm/irq_remapping.h | 120 +++++--
arch/x86/kernel/apic/apic.c | 30 +-
arch/x86/kernel/apic/io_apic.c | 297 ++++-------------
drivers/iommu/Makefile | 2 +-
drivers/iommu/dmar.c | 9 +-
drivers/iommu/intel-iommu.c | 3 +-
.../{intr_remapping.c => intel_irq_remapping.c} | 355 ++++++++++++++++----
drivers/iommu/intr_remapping.h | 17 -
drivers/iommu/irq_remapping.c | 164 +++++++++
drivers/iommu/irq_remapping.h | 88 +++++
include/linux/dmar.h | 85 -----
12 files changed, 724 insertions(+), 450 deletions(-)
create mode 100644 arch/ia64/include/asm/irq_remapping.h
rename drivers/iommu/{intr_remapping.c => intel_irq_remapping.c} (66%)
delete mode 100644 drivers/iommu/intr_remapping.h
create mode 100644 drivers/iommu/irq_remapping.c
create mode 100644 drivers/iommu/irq_remapping.hThis patchset introduces a generic ops-interface for accessing interrupt remapping hardware on x86. It factors out the VT-d specific code from io_apic.c and moves it to drivers/iommu. These changes will be used to add support for AMD interrupt remapping hardware.
Please pull.
Thanks,
Joerg
_______________________________________________
iommu mailing list iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 47 lines · Joerg Roedel
(again as a signed email)
Hi Ingo,
The following changes since commit
d48b97b403d23f6df0b990cee652bdf9a52337a3:Linux 3.4-rc6 (2012-05-06 15:07:32 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.gitintr-remapping-opsor as a signed tag at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.gitintr-remapping-ops-for-ingoJoerg Roedel (8):
iommu: Renameintr_remappingfiles tointel_intr_remappingiommu/vt-d: Make intr-remapping initialization generic iommu/vt-d: Convert missingapic.cintr-remapping call toremap_opsiommu/vt-d: Convert IR ioapic-setup to useremap_opsiommu/vt-d: Convert IRset_affinityfunction toremap_opsiommu/vt-d: Convertfree_irteinto aremap_opscallback iommu/vt-d: Convert MSI remapping setup toremap_opsx86, iommu/vt-d: Clean up interfaces for interrupt remappingSuresh Siddha (2):
iommu: renameintr_remappingreferences toirq_remapping
iommu: rename intr_remapping.[ch] to irq_remapping.[ch]arch/ia64/include/asm/irq_remapping.h | 4 + arch/x86/include/asm/irq_remapping.h | 120 +++++-- arch/x86/kernel/apic/apic.c | 30 +- arch/x86/kernel/apic/io_apic.c | 297 ++++------------- drivers/iommu/Makefile | 2 +- drivers/iommu/dmar.c | 9 +- drivers/iommu/intel-iommu.c | 3 +- .../{intr_remapping.c => intel_irq_remapping.c} | 355 ++++++++++++++++---- drivers/iommu/intr_remapping.h | 17 - drivers/iommu/irq_remapping.c | 164 +++++++++ drivers/iommu/irq_remapping.h | 88 +++++ include/linux/dmar.h | 85 ----- 12 files changed, 724 insertions(+), 450 deletions(-) create mode 100644 arch/ia64/include/asm/irq_remapping.h rename drivers/iommu/{intr_remapping.c => intel_irq_remapping.c} (66%) delete mode 100644 drivers/iommu/intr_remapping.h create mode 100644 drivers/iommu/irq_remapping.c create mode 100644 drivers/iommu/irq_remapping.h
Quoted 7 lines
This patchset introduces a generic ops-interface for accessing interrupt remapping hardware on x86. It factors out the VT-d specific code from
io_apic.cand moves it todrivers/iommu. These changes will be used to add support for AMD interrupt remapping hardware.Please pull.
I've pulled it, but note that there's an UP build failure:
drivers/iommu/intel_irq_remapping.c:955:19: error: ‘struct irq_data’ has no member named ‘affinity’
config attached. This has to be fixed before I can push this towards linux-next.
Thanks,
Ingo
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.4.0-rc6 Kernel Configuration
#CONFIG_64BIT=y
# CONFIG_X86_32 is not setCONFIG_X86_64=yCONFIG_X86=yCONFIG_INSTRUCTION_DECODER=yCONFIG_OUTPUT_FORMAT="elf64-x86-64"CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"CONFIG_GENERIC_CMOS_UPDATE=yCONFIG_CLOCKSOURCE_WATCHDOG=yCONFIG_GENERIC_CLOCKEVENTS=yCONFIG_ARCH_CLOCKSOURCE_DATA=yCONFIG_GENERIC_CLOCKEVENTS_BROADCAST=yCONFIG_LOCKDEP_SUPPORT=yCONFIG_STACKTRACE_SUPPORT=yCONFIG_HAVE_LATENCYTOP_SUPPORT=yCONFIG_MMU=yCONFIG_NEED_DMA_MAP_STATE=yCONFIG_NEED_SG_DMA_LENGTH=yCONFIG_GENERIC_ISA_DMA=yCONFIG_GENERIC_HWEIGHT=yCONFIG_GENERIC_GPIO=yCONFIG_ARCH_MAY_HAVE_PC_FDC=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not setCONFIG_RWSEM_XCHGADD_ALGORITHM=yCONFIG_ARCH_HAS_CPU_IDLE_WAIT=yCONFIG_GENERIC_CALIBRATE_DELAY=yCONFIG_GENERIC_TIME_VSYSCALL=yCONFIG_ARCH_HAS_CPU_RELAX=yCONFIG_ARCH_HAS_DEFAULT_IDLE=yCONFIG_ARCH_HAS_CACHE_LINE_SIZE=yCONFIG_ARCH_HAS_CPU_AUTOPROBE=yCONFIG_HAVE_SETUP_PER_CPU_AREA=yCONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=yCONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=yCONFIG_ARCH_HIBERNATION_POSSIBLE=yCONFIG_ARCH_SUSPEND_POSSIBLE=yCONFIG_ZONE_DMA32=yCONFIG_AUDIT_ARCH=yCONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=yCONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=yCONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" # CONFIG_KTIME_SCALAR is not setCONFIG_ARCH_SUPPORTS_UPROBES=yCONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"CONFIG_HAVE_IRQ_WORK=yCONFIG_IRQ_WORK=yCONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
#CONFIG_EXPERIMENTAL=yCONFIG_BROKEN_ON_SMP=yCONFIG_INIT_ENV_ARG_LIMIT=32CONFIG_CROSS_COMPILE=""CONFIG_LOCALVERSION=""CONFIG_LOCALVERSION_AUTO=yCONFIG_HAVE_KERNEL_GZIP=yCONFIG_HAVE_KERNEL_BZIP2=yCONFIG_HAVE_KERNEL_LZMA=yCONFIG_HAVE_KERNEL_XZ=yCONFIG_HAVE_KERNEL_LZO=yCONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not setCONFIG_DEFAULT_HOSTNAME="(none)"
# CONFIG_SWAP is not set
# CONFIG_SYSVIPC is not set
# CONFIG_POSIX_MQUEUE is not setCONFIG_BSD_PROCESS_ACCT=yCONFIG_BSD_PROCESS_ACCT_V3=yCONFIG_FHANDLE=yCONFIG_TASKSTATS=yCONFIG_TASK_DELAY_ACCT=y
# CONFIG_TASK_XACCT is not setCONFIG_AUDIT=yCONFIG_AUDITSYSCALL=yCONFIG_AUDIT_WATCH=yCONFIG_AUDIT_TREE=yCONFIG_AUDIT_LOGINUID_IMMUTABLE=yCONFIG_HAVE_GENERIC_HARDIRQS=y
#
# IRQ subsystem
#CONFIG_GENERIC_HARDIRQS=yCONFIG_GENERIC_IRQ_PROBE=yCONFIG_GENERIC_IRQ_SHOW=yCONFIG_GENERIC_IRQ_CHIP=yCONFIG_IRQ_FORCED_THREADING=yCONFIG_SPARSE_IRQ=y
#
# RCU Subsystem
#CONFIG_TINY_RCU=y
# CONFIG_PREEMPT_RCU is not set
# CONFIG_TREE_RCU_TRACE is not setCONFIG_IKCONFIG=m
# CONFIG_IKCONFIG_PROC is not setCONFIG_LOG_BUF_SHIFT=20CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=yCONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not setCONFIG_CGROUP_FREEZER=yCONFIG_CGROUP_DEVICE=y
# CONFIG_CPUSETS is not setCONFIG_CGROUP_CPUACCT=y
# CONFIG_RESOURCE_COUNTERS is not set
# CONFIG_CGROUP_PERF is not setCONFIG_CGROUP_SCHED=yCONFIG_FAIR_GROUP_SCHED=yCONFIG_CFS_BANDWIDTH=y
# CONFIG_RT_GROUP_SCHED is not setCONFIG_BLK_CGROUP=mCONFIG_DEBUG_BLK_CGROUP=yCONFIG_CHECKPOINT_RESTORE=yCONFIG_NAMESPACES=y
# CONFIG_UTS_NS is not set
# CONFIG_USER_NS is not set
# CONFIG_PID_NS is not set
# CONFIG_NET_NS is not setCONFIG_SCHED_AUTOGROUP=yCONFIG_SYSFS_DEPRECATED=y
# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_RELAY is not set
# CONFIG_BLK_DEV_INITRD is not setCONFIG_CC_OPTIMIZE_FOR_SIZE=yCONFIG_SYSCTL=yCONFIG_ANON_INODES=yCONFIG_EXPERT=yCONFIG_UID16=y
# CONFIG_SYSCTL_SYSCALL is not setCONFIG_KALLSYMS=yCONFIG_KALLSYMS_ALL=yCONFIG_HOTPLUG=yCONFIG_PRINTK=y
# CONFIG_BUG is not set
# CONFIG_ELF_CORE is not setCONFIG_PCSPKR_PLATFORM=yCONFIG_HAVE_PCSPKR_PLATFORM=yCONFIG_BASE_FULL=yCONFIG_FUTEX=y
# CONFIG_EPOLL is not setCONFIG_SIGNALFD=y
# CONFIG_TIMERFD is not setCONFIG_EVENTFD=yCONFIG_SHMEM=yCONFIG_AIO=yCONFIG_EMBEDDED=yCONFIG_HAVE_PERF_EVENTS=yCONFIG_PERF_USE_VMALLOC=y
#
# Kernel Performance Events And Counters
#CONFIG_PERF_EVENTS=yCONFIG_DEBUG_PERF_USE_VMALLOC=y
# CONFIG_VM_EVENT_COUNTERS is not set
# CONFIG_PCI_QUIRKS is not setCONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not setCONFIG_SLUB=y
# CONFIG_SLOB is not setCONFIG_PROFILING=yCONFIG_TRACEPOINTS=y
# CONFIG_OPROFILE is not setCONFIG_HAVE_OPROFILE=yCONFIG_OPROFILE_NMI_TIMER=y
# CONFIG_KPROBES is not set
# CONFIG_JUMP_LABEL is not setCONFIG_UPROBES=yCONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=yCONFIG_USER_RETURN_NOTIFIER=yCONFIG_HAVE_IOREMAP_PROT=yCONFIG_HAVE_KPROBES=yCONFIG_HAVE_KRETPROBES=yCONFIG_HAVE_OPTPROBES=yCONFIG_HAVE_ARCH_TRACEHOOK=yCONFIG_HAVE_DMA_ATTRS=yCONFIG_GENERIC_SMP_IDLE_THREAD=yCONFIG_HAVE_REGS_AND_STACK_ACCESS_API=yCONFIG_HAVE_DMA_API_DEBUG=yCONFIG_HAVE_HW_BREAKPOINT=yCONFIG_HAVE_MIXED_BREAKPOINTS_REGS=yCONFIG_HAVE_USER_RETURN_NOTIFIER=yCONFIG_HAVE_PERF_EVENTS_NMI=yCONFIG_HAVE_ARCH_JUMP_LABEL=yCONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=yCONFIG_HAVE_ALIGNED_STRUCT_PAGE=yCONFIG_HAVE_CMPXCHG_LOCAL=yCONFIG_HAVE_CMPXCHG_DOUBLE=yCONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
#
# GCOV-based kernel profiling
#
# CONFIG_GCOV_KERNEL is not set
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not setCONFIG_SLABINFO=yCONFIG_RT_MUTEXES=yCONFIG_BASE_SMALL=0CONFIG_MODULES=y
# CONFIG_MODULE_FORCE_LOAD is not setCONFIG_MODULE_UNLOAD=yCONFIG_MODULE_FORCE_UNLOAD=yCONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not setCONFIG_BLOCK=yCONFIG_BLK_DEV_BSG=yCONFIG_BLK_DEV_BSGLIB=yCONFIG_BLK_DEV_INTEGRITY=y
#
# Partition Types
#CONFIG_PARTITION_ADVANCED=yCONFIG_ACORN_PARTITION=y
# CONFIG_ACORN_PARTITION_CUMANA is not setCONFIG_ACORN_PARTITION_EESOX=yCONFIG_ACORN_PARTITION_ICS=y
# CONFIG_ACORN_PARTITION_ADFS is not setCONFIG_ACORN_PARTITION_POWERTEC=y
# CONFIG_ACORN_PARTITION_RISCIX is not set
# CONFIG_OSF_PARTITION is not setCONFIG_AMIGA_PARTITION=y
# CONFIG_ATARI_PARTITION is not setCONFIG_MAC_PARTITION=yCONFIG_MSDOS_PARTITION=yCONFIG_BSD_DISKLABEL=yCONFIG_MINIX_SUBPARTITION=y
# CONFIG_SOLARIS_X86_PARTITION is not setCONFIG_UNIXWARE_DISKLABEL=y
# CONFIG_LDM_PARTITION is not setCONFIG_SGI_PARTITION=yCONFIG_ULTRIX_PARTITION=y
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
# CONFIG_SYSV68_PARTITION is not setCONFIG_BLOCK_COMPAT=y
#
# IO Schedulers
#CONFIG_IOSCHED_NOOP=y
# CONFIG_IOSCHED_DEADLINE is not set CONFIG_IOSCHED_CFQ=m
# CONFIG_CFQ_GROUP_IOSCHED is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" CONFIG_PREEMPT_NOTIFIERS=y
# CONFIG_INLINE_SPIN_TRYLOCK is not set
# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK is not set
# CONFIG_INLINE_SPIN_LOCK_BH is not set
# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set CONFIG_UNINLINE_SPIN_UNLOCK=y
# CONFIG_INLINE_SPIN_UNLOCK_BH is not set # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_READ_TRYLOCK is not set
# CONFIG_INLINE_READ_LOCK is not set
# CONFIG_INLINE_READ_LOCK_BH is not set
# CONFIG_INLINE_READ_LOCK_IRQ is not set
# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set # CONFIG_INLINE_READ_UNLOCK is not set
# CONFIG_INLINE_READ_UNLOCK_BH is not set # CONFIG_INLINE_READ_UNLOCK_IRQ is not set # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_WRITE_TRYLOCK is not set
# CONFIG_INLINE_WRITE_LOCK is not set
# CONFIG_INLINE_WRITE_LOCK_BH is not set
# CONFIG_INLINE_WRITE_LOCK_IRQ is not set # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set # CONFIG_INLINE_WRITE_UNLOCK is not set
# CONFIG_INLINE_WRITE_UNLOCK_BH is not set # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y
#
# Processor type and features
#
# CONFIG_ZONE_DMA is not setCONFIG_TICK_ONESHOT=yCONFIG_NO_HZ=y
# CONFIG_HIGH_RES_TIMERS is not setCONFIG_GENERIC_CLOCKEVENTS_BUILD=yCONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
# CONFIG_SMP is not setCONFIG_X86_X2APIC=y
# CONFIG_X86_MPPARSE is not set
# CONFIG_X86_EXTENDED_PLATFORM is not setCONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_SCHED_OMIT_FRAME_POINTER is not set
# CONFIG_KVMTOOL_TEST_ENABLE is not set
# CONFIG_PARAVIRT_GUEST is not setCONFIG_NO_BOOTMEM=y
# CONFIG_MEMTEST is not set
# CONFIG_MK8 is not set
# CONFIG_MPSC is not set
# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not setCONFIG_GENERIC_CPU=yCONFIG_X86_INTERNODE_CACHE_SHIFT=6CONFIG_X86_CMPXCHG=yCONFIG_X86_L1_CACHE_SHIFT=6CONFIG_X86_XADD=yCONFIG_X86_WP_WORKS_OK=yCONFIG_X86_TSC=yCONFIG_X86_CMPXCHG64=yCONFIG_X86_CMOV=yCONFIG_X86_MINIMUM_CPU_FAMILY=64CONFIG_X86_DEBUGCTLMSR=yCONFIG_PROCESSOR_SELECT=yCONFIG_CPU_SUP_INTEL=yCONFIG_CPU_SUP_AMD=y
# CONFIG_CPU_SUP_CENTAUR is not setCONFIG_HPET_TIMER=yCONFIG_HPET_EMULATE_RTC=yCONFIG_DMI=yCONFIG_GART_IOMMU=yCONFIG_CALGARY_IOMMU=yCONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=yCONFIG_SWIOTLB=yCONFIG_IOMMU_HELPER=yCONFIG_NR_CPUS=1
# CONFIG_IRQ_TIME_ACCOUNTING is not setCONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not setCONFIG_X86_LOCAL_APIC=yCONFIG_X86_IO_APIC=yCONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=yCONFIG_X86_MCE=y
# CONFIG_X86_MCE_INTEL is not setCONFIG_X86_MCE_AMD=yCONFIG_X86_MCE_THRESHOLD=yCONFIG_X86_MCE_INJECT=mCONFIG_I8K=m
# CONFIG_MICROCODE is not setCONFIG_X86_MSR=m
# CONFIG_X86_CPUID is not setCONFIG_ARCH_PHYS_ADDR_T_64BIT=yCONFIG_ARCH_DMA_ADDR_T_64BIT=y
# CONFIG_DIRECT_GBPAGES is not setCONFIG_ARCH_SPARSEMEM_ENABLE=yCONFIG_ARCH_SPARSEMEM_DEFAULT=yCONFIG_ARCH_SELECT_MEMORY_MODEL=yCONFIG_ARCH_PROC_KCORE_TEXT=yCONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000CONFIG_SELECT_MEMORY_MODEL=yCONFIG_SPARSEMEM_MANUAL=yCONFIG_SPARSEMEM=yCONFIG_HAVE_MEMORY_PRESENT=yCONFIG_SPARSEMEM_EXTREME=yCONFIG_SPARSEMEM_VMEMMAP_ENABLE=yCONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=yCONFIG_SPARSEMEM_VMEMMAP=yCONFIG_HAVE_MEMBLOCK=yCONFIG_HAVE_MEMBLOCK_NODE_MAP=yCONFIG_ARCH_DISCARD_MEMBLOCK=y
# CONFIG_MEMORY_HOTPLUG is not setCONFIG_PAGEFLAGS_EXTENDED=yCONFIG_SPLIT_PTLOCK_CPUS=999999
# CONFIG_COMPACTION is not setCONFIG_PHYS_ADDR_T_64BIT=yCONFIG_ZONE_DMA_FLAG=0CONFIG_VIRT_TO_BUS=yCONFIG_MMU_NOTIFIER=y
# CONFIG_KSM is not setCONFIG_DEFAULT_MMAP_MIN_ADDR=4096CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_MEMORY_FAILURE is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not setCONFIG_NEED_PER_CPU_KM=yCONFIG_CLEANCACHE=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not setCONFIG_X86_RESERVE_LOW=64CONFIG_MTRR=yCONFIG_MTRR_SANITIZER=yCONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
# CONFIG_X86_PAT is not set
# CONFIG_ARCH_RANDOM is not setCONFIG_EFI=yCONFIG_EFI_STUB=yCONFIG_SECCOMP=y
# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not setCONFIG_HZ_1000=yCONFIG_HZ=1000
# CONFIG_SCHED_HRTICK is not set
# CONFIG_KEXEC is not setCONFIG_CRASH_DUMP=yCONFIG_PHYSICAL_START=0x1000000CONFIG_RELOCATABLE=yCONFIG_PHYSICAL_ALIGN=0x1000000
# CONFIG_COMPAT_VDSO is not setCONFIG_CMDLINE_BOOL=yCONFIG_CMDLINE=""
# CONFIG_CMDLINE_OVERRIDE is not setCONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
#
# Power management and ACPI options
#CONFIG_SUSPEND=yCONFIG_SUSPEND_FREEZER=yCONFIG_PM_SLEEP=yCONFIG_PM_RUNTIME=yCONFIG_PM=y
# CONFIG_PM_DEBUG is not setCONFIG_ACPI=yCONFIG_ACPI_SLEEP=yCONFIG_ACPI_PROCFS=yCONFIG_ACPI_PROCFS_POWER=y
# CONFIG_ACPI_EC_DEBUGFS is not set
# CONFIG_ACPI_PROC_EVENT is not setCONFIG_ACPI_AC=mCONFIG_ACPI_BATTERY=m
# CONFIG_ACPI_BUTTON is not setCONFIG_ACPI_VIDEO=mCONFIG_ACPI_FAN=m
# CONFIG_ACPI_DOCK is not setCONFIG_ACPI_PROCESSOR=mCONFIG_ACPI_IPMI=mCONFIG_ACPI_PROCESSOR_AGGREGATOR=m
# CONFIG_ACPI_THERMAL is not set
# CONFIG_ACPI_CUSTOM_DSDT is not setCONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not setCONFIG_ACPI_PCI_SLOT=mCONFIG_X86_PM_TIMER=yCONFIG_ACPI_CONTAINER=mCONFIG_ACPI_SBS=mCONFIG_ACPI_HED=y
# CONFIG_ACPI_CUSTOM_METHOD is not set
# CONFIG_ACPI_BGRT is not setCONFIG_ACPI_APEI=yCONFIG_ACPI_APEI_GHES=y
# CONFIG_ACPI_APEI_EINJ is not set
# CONFIG_ACPI_APEI_ERST_DEBUG is not setCONFIG_SFI=y
#
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ is not setCONFIG_CPU_IDLE=yCONFIG_CPU_IDLE_GOV_LADDER=yCONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_INTEL_IDLE is not set
#
# Memory power savings
#CONFIG_I7300_IDLE_IOAT_CHANNEL=yCONFIG_I7300_IDLE=m
#
# Bus options (PCI etc.)
#CONFIG_PCI=yCONFIG_PCI_DIRECT=yCONFIG_PCI_MMCONFIG=yCONFIG_PCI_DOMAINS=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
# CONFIG_PCIEPORTBUS is not setCONFIG_ARCH_SUPPORTS_MSI=yCONFIG_PCI_MSI=yCONFIG_PCI_DEBUG=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not setCONFIG_PCI_STUB=mCONFIG_HT_IRQ=yCONFIG_PCI_ATS=y
# CONFIG_PCI_IOV is not setCONFIG_PCI_PRI=yCONFIG_PCI_PASID=yCONFIG_PCI_IOAPIC=mCONFIG_PCI_LABEL=yCONFIG_ISA_DMA_API=yCONFIG_AMD_NB=yCONFIG_PCCARD=m
# CONFIG_PCMCIA is not set
# CONFIG_CARDBUS is not set
#
# PC-card bridges
#
# CONFIG_YENTA is not set
# CONFIG_HOTPLUG_PCI is not set
# CONFIG_RAPIDIO is not set
#
# Executable file formats / Emulations
#CONFIG_BINFMT_ELF=yCONFIG_COMPAT_BINFMT_ELF=yCONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
# CONFIG_HAVE_AOUT is not set
# CONFIG_BINFMT_MISC is not setCONFIG_IA32_EMULATION=y
# CONFIG_IA32_AOUT is not set
# CONFIG_X86_X32 is not setCONFIG_COMPAT=yCONFIG_COMPAT_FOR_U64_ALIGNMENT=yCONFIG_KEYS_COMPAT=yCONFIG_HAVE_TEXT_POKE_SMP=yCONFIG_X86_DEV_DMA_OPS=yCONFIG_NET=y
#
# Networking options
#CONFIG_PACKET=yCONFIG_UNIX=y
# CONFIG_UNIX_DIAG is not setCONFIG_XFRM=y
# CONFIG_XFRM_USER is not setCONFIG_XFRM_SUB_POLICY=yCONFIG_XFRM_MIGRATE=yCONFIG_XFRM_STATISTICS=yCONFIG_NET_KEY=m
# CONFIG_NET_KEY_MIGRATE is not setCONFIG_INET=y
# CONFIG_IP_MULTICAST is not setCONFIG_IP_ADVANCED_ROUTER=yCONFIG_IP_FIB_TRIE_STATS=yCONFIG_IP_MULTIPLE_TABLES=yCONFIG_IP_ROUTE_MULTIPATH=y
# CONFIG_IP_ROUTE_VERBOSE is not setCONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_BOOTP is not setCONFIG_IP_PNP_RARP=y
# CONFIG_NET_IPIP is not setCONFIG_NET_IPGRE_DEMUX=m
# CONFIG_NET_IPGRE is not setCONFIG_ARPD=y
# CONFIG_SYN_COOKIES is not set
# CONFIG_INET_AH is not setCONFIG_INET_ESP=m
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
# CONFIG_INET_TUNNEL is not setCONFIG_INET_XFRM_MODE_TRANSPORT=m
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not setCONFIG_INET_LRO=mCONFIG_INET_DIAG=mCONFIG_INET_TCP_DIAG=mCONFIG_INET_UDP_DIAG=mCONFIG_TCP_CONG_ADVANCED=yCONFIG_TCP_CONG_BIC=m
# CONFIG_TCP_CONG_CUBIC is not set
# CONFIG_TCP_CONG_WESTWOOD is not set
# CONFIG_TCP_CONG_HTCP is not setCONFIG_TCP_CONG_HSTCP=m
# CONFIG_TCP_CONG_HYBLA is not setCONFIG_TCP_CONG_VEGAS=m
# CONFIG_TCP_CONG_SCALABLE is not set
# CONFIG_TCP_CONG_LP is not setCONFIG_TCP_CONG_VENO=m
# CONFIG_TCP_CONG_YEAH is not set
# CONFIG_TCP_CONG_ILLINOIS is not setCONFIG_DEFAULT_RENO=yCONFIG_DEFAULT_TCP_CONG="reno"CONFIG_TCP_MD5SIG=y
# CONFIG_IPV6 is not setCONFIG_NETLABEL=yCONFIG_NETWORK_SECMARK=yCONFIG_NETWORK_PHY_TIMESTAMPING=yCONFIG_NETFILTER=yCONFIG_NETFILTER_DEBUG=y
# CONFIG_NETFILTER_ADVANCED is not set
#
# Core Netfilter Configuration
#CONFIG_NETFILTER_NETLINK=mCONFIG_NETFILTER_NETLINK_LOG=mCONFIG_NF_CONNTRACK=mCONFIG_NF_CONNTRACK_SECMARK=y
# CONFIG_NF_CONNTRACK_PROCFS is not setCONFIG_NF_CONNTRACK_FTP=mCONFIG_NF_CONNTRACK_IRC=mCONFIG_NF_CONNTRACK_BROADCAST=mCONFIG_NF_CONNTRACK_NETBIOS_NS=mCONFIG_NF_CONNTRACK_SIP=m
# CONFIG_NF_CT_NETLINK is not setCONFIG_NETFILTER_XTABLES=m
#
# Xtables combined modules
#
# CONFIG_NETFILTER_XT_MARK is not set
#
# Xtables targets
#CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
# CONFIG_NETFILTER_XT_TARGET_LOG is not setCONFIG_NETFILTER_XT_TARGET_NFLOG=mCONFIG_NETFILTER_XT_TARGET_NOTRACK=m
# CONFIG_NETFILTER_XT_TARGET_SECMARK is not setCONFIG_NETFILTER_XT_TARGET_TCPMSS=m
#
# Xtables matches
#CONFIG_NETFILTER_XT_MATCH_CONNTRACK=mCONFIG_NETFILTER_XT_MATCH_POLICY=mCONFIG_NETFILTER_XT_MATCH_STATE=mCONFIG_IP_SET=mCONFIG_IP_SET_MAX=256CONFIG_IP_SET_BITMAP_IP=m
# CONFIG_IP_SET_BITMAP_IPMAC is not set
# CONFIG_IP_SET_BITMAP_PORT is not setCONFIG_IP_SET_HASH_IP=mCONFIG_IP_SET_HASH_IPPORT=mCONFIG_IP_SET_HASH_IPPORTIP=m
# CONFIG_IP_SET_HASH_IPPORTNET is not set
# CONFIG_IP_SET_HASH_NET is not setCONFIG_IP_SET_HASH_NETPORT=mCONFIG_IP_SET_HASH_NETIFACE=m
# CONFIG_IP_SET_LIST_SET is not setCONFIG_IP_VS=m
# CONFIG_IP_VS_DEBUG is not setCONFIG_IP_VS_TAB_BITS=12
#
# IPVS transport protocol load balancing support
#
# CONFIG_IP_VS_PROTO_TCP is not setCONFIG_IP_VS_PROTO_UDP=yCONFIG_IP_VS_PROTO_AH_ESP=yCONFIG_IP_VS_PROTO_ESP=y
# CONFIG_IP_VS_PROTO_AH is not setCONFIG_IP_VS_PROTO_SCTP=y
#
# IPVS scheduler
#
# CONFIG_IP_VS_RR is not setCONFIG_IP_VS_WRR=mCONFIG_IP_VS_LC=m
# CONFIG_IP_VS_WLC is not setCONFIG_IP_VS_LBLC=mCONFIG_IP_VS_LBLCR=m
# CONFIG_IP_VS_DH is not setCONFIG_IP_VS_SH=m
# CONFIG_IP_VS_SED is not setCONFIG_IP_VS_NQ=m
#
# IPVS SH scheduler
#CONFIG_IP_VS_SH_TAB_BITS=8
#
# IPVS application helper
#CONFIG_IP_VS_NFCT=y
# CONFIG_IP_VS_PE_SIP is not set
#
# IP: Netfilter Configuration
#CONFIG_NF_DEFRAG_IPV4=mCONFIG_NF_CONNTRACK_IPV4=mCONFIG_IP_NF_IPTABLES=mCONFIG_IP_NF_FILTER=mCONFIG_IP_NF_TARGET_REJECT=mCONFIG_IP_NF_TARGET_ULOG=mCONFIG_NF_NAT=mCONFIG_NF_NAT_NEEDED=yCONFIG_IP_NF_TARGET_MASQUERADE=mCONFIG_NF_NAT_FTP=mCONFIG_NF_NAT_IRC=m
# CONFIG_NF_NAT_TFTP is not set
# CONFIG_NF_NAT_AMANDA is not set
# CONFIG_NF_NAT_PPTP is not set
# CONFIG_NF_NAT_H323 is not setCONFIG_NF_NAT_SIP=mCONFIG_IP_NF_MANGLE=mCONFIG_IP_NF_RAW=mCONFIG_BRIDGE_NF_EBTABLES=mCONFIG_BRIDGE_EBT_BROUTE=mCONFIG_BRIDGE_EBT_T_FILTER=mCONFIG_BRIDGE_EBT_T_NAT=mCONFIG_BRIDGE_EBT_802_3=mCONFIG_BRIDGE_EBT_AMONG=m
# CONFIG_BRIDGE_EBT_ARP is not set
# CONFIG_BRIDGE_EBT_IP is not setCONFIG_BRIDGE_EBT_LIMIT=mCONFIG_BRIDGE_EBT_MARK=m
# CONFIG_BRIDGE_EBT_PKTTYPE is not set
# CONFIG_BRIDGE_EBT_STP is not setCONFIG_BRIDGE_EBT_VLAN=m
# CONFIG_BRIDGE_EBT_ARPREPLY is not set
# CONFIG_BRIDGE_EBT_DNAT is not setCONFIG_BRIDGE_EBT_MARK_T=m
# CONFIG_BRIDGE_EBT_REDIRECT is not set
# CONFIG_BRIDGE_EBT_SNAT is not set
# CONFIG_BRIDGE_EBT_LOG is not set
# CONFIG_BRIDGE_EBT_ULOG is not set
# CONFIG_BRIDGE_EBT_NFLOG is not set
# CONFIG_IP_DCCP is not setCONFIG_IP_SCTP=mCONFIG_SCTP_DBG_MSG=yCONFIG_SCTP_DBG_OBJCNT=y
# CONFIG_SCTP_HMAC_NONE is not setCONFIG_SCTP_HMAC_SHA1=y
# CONFIG_SCTP_HMAC_MD5 is not set
# CONFIG_RDS is not set
# CONFIG_TIPC is not setCONFIG_ATM=mCONFIG_ATM_CLIP=m
# CONFIG_ATM_CLIP_NO_ICMP is not setCONFIG_ATM_LANE=mCONFIG_ATM_MPOA=m
# CONFIG_ATM_BR2684 is not set
# CONFIG_L2TP is not setCONFIG_STP=mCONFIG_BRIDGE=mCONFIG_BRIDGE_IGMP_SNOOPING=y
# CONFIG_NET_DSA is not set
# CONFIG_VLAN_8021Q is not setCONFIG_DECNET=mCONFIG_DECNET_ROUTER=yCONFIG_LLC=y
# CONFIG_LLC2 is not setCONFIG_IPX=mCONFIG_IPX_INTERN=y
# CONFIG_ATALK is not setCONFIG_X25=mCONFIG_LAPB=mCONFIG_ECONET=mCONFIG_ECONET_AUNUDP=yCONFIG_ECONET_NATIVE=y
# CONFIG_WAN_ROUTER is not setCONFIG_PHONET=mCONFIG_IEEE802154=m
# CONFIG_NET_SCHED is not setCONFIG_DCB=yCONFIG_DNS_RESOLVER=m
# CONFIG_BATMAN_ADV is not setCONFIG_OPENVSWITCH=mCONFIG_NETPRIO_CGROUP=mCONFIG_BQL=yCONFIG_HAVE_BPF_JIT=yCONFIG_BPF_JIT=y
#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_NET_DROP_MONITOR is not setCONFIG_HAMRADIO=y
#
# Packet Radio protocols
#
# CONFIG_AX25 is not setCONFIG_CAN=mCONFIG_CAN_RAW=m
# CONFIG_CAN_BCM is not set
# CONFIG_CAN_GW is not set
#
# CAN Device Drivers
#
# CONFIG_CAN_VCAN is not setCONFIG_CAN_SLCAN=m
# CONFIG_CAN_DEV is not setCONFIG_CAN_DEBUG_DEVICES=yCONFIG_IRDA=m
#
# IrDA protocols
#CONFIG_IRLAN=m
# CONFIG_IRNET is not setCONFIG_IRCOMM=m
# CONFIG_IRDA_ULTRA is not set
#
# IrDA options
#CONFIG_IRDA_CACHE_LAST_LSAP=y
# CONFIG_IRDA_FAST_RR is not set
# CONFIG_IRDA_DEBUG is not set
#
# Infrared-port device drivers
#
#
# SIR device drivers
#
# CONFIG_IRTTY_SIR is not set
#
# Dongle support
#
# CONFIG_KINGSUN_DONGLE is not setCONFIG_KSDAZZLE_DONGLE=mCONFIG_KS959_DONGLE=m
#
# FIR device drivers
#CONFIG_USB_IRDA=m
# CONFIG_SIGMATEL_FIR is not set
# CONFIG_NSC_FIR is not setCONFIG_WINBOND_FIR=mCONFIG_SMC_IRCC_FIR=m
# CONFIG_ALI_FIR is not set
# CONFIG_VLSI_FIR is not setCONFIG_VIA_FIR=m
# CONFIG_MCS_FIR is not set
# CONFIG_BT is not setCONFIG_AF_RXRPC=mCONFIG_AF_RXRPC_DEBUG=y
# CONFIG_RXKAD is not setCONFIG_FIB_RULES=y
# CONFIG_WIRELESS is not set
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not setCONFIG_RFKILL_REGULATOR=m
# CONFIG_NET_9P is not setCONFIG_CAIF=m
# CONFIG_CAIF_DEBUG is not set
# CONFIG_CAIF_NETDEV is not set
# CONFIG_CAIF_USB is not setCONFIG_CEPH_LIB=mCONFIG_CEPH_LIB_PRETTYDEBUG=yCONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
# CONFIG_NFC is not set
#
# Device Drivers
#
#
# Generic Driver Options
#CONFIG_UEVENT_HELPER_PATH=""CONFIG_DEVTMPFS=yCONFIG_DEVTMPFS_MOUNT=yCONFIG_STANDALONE=yCONFIG_PREVENT_FIRMWARE_BUILD=yCONFIG_FW_LOADER=m
# CONFIG_FIRMWARE_IN_KERNEL is not setCONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not setCONFIG_REGMAP=yCONFIG_REGMAP_I2C=m
# CONFIG_DMA_SHARED_BUFFER is not set
# CONFIG_CONNECTOR is not set
# CONFIG_MTD is not set
# CONFIG_PARPORT is not setCONFIG_PNP=yCONFIG_PNP_DEBUG_MESSAGES=y
#
# Protocols
#CONFIG_PNPACPI=yCONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not setCONFIG_BLK_CPQ_DA=yCONFIG_BLK_CPQ_CISS_DA=mCONFIG_CISS_SCSI_TAPE=yCONFIG_BLK_DEV_DAC960=mCONFIG_BLK_DEV_UMEM=m
# CONFIG_BLK_DEV_COW_COMMON is not setCONFIG_BLK_DEV_LOOP=mCONFIG_BLK_DEV_LOOP_MIN_COUNT=8CONFIG_BLK_DEV_CRYPTOLOOP=m
#
# DRBD disabled because PROC_FS, INET or CONNECTOR not selected #CONFIG_BLK_DEV_NBD=mCONFIG_BLK_DEV_NVME=m
# CONFIG_BLK_DEV_SX8 is not setCONFIG_BLK_DEV_UB=mCONFIG_BLK_DEV_RAM=mCONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096CONFIG_BLK_DEV_XIP=yCONFIG_CDROM_PKTCDVD=mCONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD_WCACHE=y
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_VIRTIO_BLK is not set
# CONFIG_BLK_DEV_HD is not setCONFIG_BLK_DEV_RBD=m
#
# Misc devices
#CONFIG_SENSORS_LIS3LV02D=mCONFIG_AD525X_DPOT=m
# CONFIG_AD525X_DPOT_I2C is not setCONFIG_IBM_ASM=m
# CONFIG_PHANTOM is not set
# CONFIG_INTEL_MID_PTI is not set
# CONFIG_SGI_IOC4 is not setCONFIG_TIFM_CORE=m
# CONFIG_TIFM_7XX1 is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not setCONFIG_CS5535_MFGPT=mCONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
# CONFIG_CS5535_CLOCK_EVENT_SRC is not set
# CONFIG_HP_ILO is not setCONFIG_APDS9802ALS=m
# CONFIG_ISL29003 is not set
# CONFIG_ISL29020 is not set
# CONFIG_SENSORS_TSL2550 is not setCONFIG_SENSORS_BH1780=mCONFIG_SENSORS_BH1770=mCONFIG_SENSORS_APDS990X=mCONFIG_HMC6352=m
# CONFIG_DS1682 is not setCONFIG_VMWARE_BALLOON=m
# CONFIG_BMP085 is not set
# CONFIG_PCH_PHUB is not setCONFIG_USB_SWITCH_FSA9480=m
# CONFIG_C2PORT is not set
#
# EEPROM support
#CONFIG_EEPROM_AT24=m
# CONFIG_EEPROM_LEGACY is not setCONFIG_EEPROM_MAX6875=mCONFIG_EEPROM_93CX6=mCONFIG_CB710_CORE=mCONFIG_CB710_DEBUG=yCONFIG_CB710_DEBUG_ASSUMPTIONS=y
# CONFIG_IWMC3200TOP is not set
#
# Texas Instruments shared transport line discipline #CONFIG_TI_ST=mCONFIG_SENSORS_LIS3_I2C=m
#
# Altera FPGA firmware download module
#
# CONFIG_ALTERA_STAPL is not setCONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
#
# SCSI device support
#CONFIG_SCSI_MOD=y
# CONFIG_RAID_ATTRS is not setCONFIG_SCSI=yCONFIG_SCSI_DMA=y
# CONFIG_SCSI_TGT is not setCONFIG_SCSI_NETLINK=y
# CONFIG_SCSI_PROC_FS is not set
#
# SCSI support type (disk, tape, CD-ROM)
#CONFIG_BLK_DEV_SD=yCONFIG_CHR_DEV_ST=mCONFIG_CHR_DEV_OSST=mCONFIG_BLK_DEV_SR=mCONFIG_BLK_DEV_SR_VENDOR=y
# CONFIG_CHR_DEV_SG is not setCONFIG_CHR_DEV_SCH=mCONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
# CONFIG_SCSI_SCAN_ASYNC is not setCONFIG_SCSI_WAIT_SCAN=m
#
# SCSI Transports
#CONFIG_SCSI_SPI_ATTRS=yCONFIG_SCSI_FC_ATTRS=mCONFIG_SCSI_ISCSI_ATTRS=mCONFIG_SCSI_SAS_ATTRS=mCONFIG_SCSI_SAS_LIBSAS=mCONFIG_SCSI_SAS_ATA=yCONFIG_SCSI_SAS_HOST_SMP=yCONFIG_SCSI_SRP_ATTRS=mCONFIG_SCSI_LOWLEVEL=y
# CONFIG_ISCSI_TCP is not setCONFIG_ISCSI_BOOT_SYSFS=mCONFIG_SCSI_CXGB3_ISCSI=m
# CONFIG_SCSI_CXGB4_ISCSI is not setCONFIG_SCSI_BNX2_ISCSI=m
# CONFIG_SCSI_BNX2X_FCOE is not setCONFIG_BE2ISCSI=mCONFIG_BLK_DEV_3W_XXXX_RAID=m
# CONFIG_SCSI_HPSA is not setCONFIG_SCSI_3W_9XXX=m
# CONFIG_SCSI_3W_SAS is not setCONFIG_SCSI_ACARD=mCONFIG_SCSI_AACRAID=mCONFIG_SCSI_AIC7XXX=yCONFIG_AIC7XXX_CMDS_PER_DEVICE=32CONFIG_AIC7XXX_RESET_DELAY_MS=5000CONFIG_AIC7XXX_DEBUG_ENABLE=yCONFIG_AIC7XXX_DEBUG_MASK=0
# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
# CONFIG_SCSI_AIC7XXX_OLD is not setCONFIG_SCSI_AIC79XX=mCONFIG_AIC79XX_CMDS_PER_DEVICE=32CONFIG_AIC79XX_RESET_DELAY_MS=5000
# CONFIG_AIC79XX_DEBUG_ENABLE is not setCONFIG_AIC79XX_DEBUG_MASK=0CONFIG_AIC79XX_REG_PRETTY_PRINT=y
# CONFIG_SCSI_AIC94XX is not set
# CONFIG_SCSI_MVSAS is not set
# CONFIG_SCSI_MVUMI is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not setCONFIG_SCSI_ARCMSR=m
# CONFIG_MEGARAID_NEWGEN is not setCONFIG_MEGARAID_LEGACY=mCONFIG_MEGARAID_SAS=m
# CONFIG_SCSI_MPT2SAS is not setCONFIG_SCSI_UFSHCD=m
# CONFIG_SCSI_HPTIOP is not setCONFIG_SCSI_BUSLOGIC=m
# CONFIG_VMWARE_PVSCSI is not setCONFIG_LIBFC=mCONFIG_LIBFCOE=mCONFIG_FCOE=mCONFIG_FCOE_FNIC=mCONFIG_SCSI_DMX3191D=mCONFIG_SCSI_EATA=mCONFIG_SCSI_EATA_TAGGED_QUEUE=yCONFIG_SCSI_EATA_LINKED_COMMANDS=yCONFIG_SCSI_EATA_MAX_TAGS=16
# CONFIG_SCSI_FUTURE_DOMAIN is not setCONFIG_SCSI_GDTH=m
# CONFIG_SCSI_ISCI is not set
# CONFIG_SCSI_IPS is not setCONFIG_SCSI_INITIO=m
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_STEX is not set
# CONFIG_SCSI_SYM53C8XX_2 is not setCONFIG_SCSI_IPR=mCONFIG_SCSI_IPR_TRACE=yCONFIG_SCSI_IPR_DUMP=y
# CONFIG_SCSI_QLOGIC_1280 is not setCONFIG_SCSI_QLA_FC=mCONFIG_SCSI_QLA_ISCSI=m
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not setCONFIG_SCSI_DEBUG=m
# CONFIG_SCSI_PMCRAID is not setCONFIG_SCSI_PM8001=m
# CONFIG_SCSI_SRP is not setCONFIG_SCSI_BFA_FC=mCONFIG_SCSI_VIRTIO=m
# CONFIG_SCSI_DH is not set
# CONFIG_SCSI_OSD_INITIATOR is not setCONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not setCONFIG_ATA_VERBOSE_ERROR=y
# CONFIG_ATA_ACPI is not set
# CONFIG_SATA_PMP is not set
#
# Controllers with non-SFF native interface
#CONFIG_SATA_AHCI=y
# CONFIG_SATA_AHCI_PLATFORM is not set
# CONFIG_SATA_INIC162X is not set
# CONFIG_SATA_ACARD_AHCI is not setCONFIG_SATA_SIL24=mCONFIG_ATA_SFF=y
#
# SFF controllers with custom DMA interface
#CONFIG_PDC_ADMA=m
# CONFIG_SATA_QSTOR is not set
# CONFIG_SATA_SX4 is not setCONFIG_ATA_BMDMA=y
#
# SATA SFF controllers with BMDMA
#CONFIG_ATA_PIIX=y
# CONFIG_SATA_MV is not setCONFIG_SATA_NV=yCONFIG_SATA_PROMISE=mCONFIG_SATA_SIL=mCONFIG_SATA_SIS=m
# CONFIG_SATA_SVW is not setCONFIG_SATA_ULI=m
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
#
# PATA SFF controllers with BMDMA
#CONFIG_PATA_ALI=mCONFIG_PATA_AMD=yCONFIG_PATA_ARASAN_CF=m
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_ATP867X is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not setCONFIG_PATA_CS5530=mCONFIG_PATA_CS5536=mCONFIG_PATA_CYPRESS=mCONFIG_PATA_EFAR=m
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not setCONFIG_PATA_IT8213=m
# CONFIG_PATA_IT821X is not setCONFIG_PATA_JMICRON=m
# CONFIG_PATA_MARVELL is not setCONFIG_PATA_NETCELL=mCONFIG_PATA_NINJA32=m
# CONFIG_PATA_NS87415 is not setCONFIG_PATA_OLDPIIX=yCONFIG_PATA_OPTIDMA=m
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not setCONFIG_PATA_RDC=m
# CONFIG_PATA_SC1200 is not set
# CONFIG_PATA_SCH is not setCONFIG_PATA_SERVERWORKS=mCONFIG_PATA_SIL680=mCONFIG_PATA_SIS=mCONFIG_PATA_TOSHIBA=m
# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
#
# PIO-only SFF controllers
#CONFIG_PATA_CMD640_PCI=m
# CONFIG_PATA_MPIIX is not set
# CONFIG_PATA_NS87410 is not setCONFIG_PATA_OPTI=m
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RZ1000 is not set
#
# Generic fallback / legacy drivers
#
# CONFIG_ATA_GENERIC is not setCONFIG_PATA_LEGACY=mCONFIG_MD=yCONFIG_BLK_DEV_MD=m
# CONFIG_MD_LINEAR is not set
# CONFIG_MD_RAID0 is not setCONFIG_MD_RAID1=m
# CONFIG_MD_RAID10 is not setCONFIG_MD_RAID456=m
# CONFIG_MD_MULTIPATH is not setCONFIG_MD_FAULTY=mCONFIG_BLK_DEV_DM=mCONFIG_DM_DEBUG=yCONFIG_DM_BUFIO=mCONFIG_DM_PERSISTENT_DATA=m
# CONFIG_DM_CRYPT is not setCONFIG_DM_SNAPSHOT=mCONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
# CONFIG_DM_DEBUG_SPACE_MAPS is not set
# CONFIG_DM_MIRROR is not set
# CONFIG_DM_RAID is not set
# CONFIG_DM_ZERO is not setCONFIG_DM_MULTIPATH=m
# CONFIG_DM_MULTIPATH_QL is not set
# CONFIG_DM_MULTIPATH_ST is not setCONFIG_DM_DELAY=m
# CONFIG_DM_UEVENT is not setCONFIG_DM_FLAKEY=mCONFIG_DM_VERITY=m
# CONFIG_TARGET_CORE is not set
# CONFIG_FUSION is not set
#
# IEEE 1394 (FireWire) support
#
# CONFIG_FIREWIRE is not setCONFIG_FIREWIRE_NOSY=m
# CONFIG_I2O is not setCONFIG_MACINTOSH_DRIVERS=yCONFIG_MAC_EMUMOUSEBTN=mCONFIG_NETDEVICES=yCONFIG_NET_CORE=y
# CONFIG_BONDING is not set
# CONFIG_DUMMY is not setCONFIG_EQUALIZER=mCONFIG_NET_FC=yCONFIG_MII=y
# CONFIG_IEEE802154_DRIVERS is not set
# CONFIG_NET_TEAM is not set
# CONFIG_MACVLAN is not setCONFIG_NETCONSOLE=yCONFIG_NETPOLL=y
# CONFIG_NETPOLL_TRAP is not setCONFIG_NET_POLL_CONTROLLER=y
# CONFIG_TUN is not set
# CONFIG_VETH is not setCONFIG_VIRTIO_NET=m
# CONFIG_ARCNET is not set
# CONFIG_ATM_DRIVERS is not set
#
# CAIF transport drivers
#
# CONFIG_CAIF_TTY is not setCONFIG_CAIF_SPI_SLAVE=m
# CONFIG_CAIF_SPI_SYNC is not set
# CONFIG_CAIF_HSI is not setCONFIG_ETHERNET=yCONFIG_MDIO=m
# CONFIG_NET_VENDOR_3COM is not setCONFIG_NET_VENDOR_ADAPTEC=y
# CONFIG_ADAPTEC_STARFIRE is not setCONFIG_NET_VENDOR_ALTEON=y
# CONFIG_ACENIC is not setCONFIG_NET_VENDOR_AMD=yCONFIG_AMD8111_ETH=mCONFIG_PCNET32=m
# CONFIG_NET_VENDOR_ATHEROS is not setCONFIG_NET_VENDOR_BROADCOM=yCONFIG_B44=mCONFIG_B44_PCI_AUTOSELECT=yCONFIG_B44_PCICORE_AUTOSELECT=yCONFIG_B44_PCI=yCONFIG_BNX2=mCONFIG_CNIC=mCONFIG_TIGON3=y
# CONFIG_BNX2X is not setCONFIG_NET_VENDOR_BROCADE=yCONFIG_BNA=mCONFIG_NET_CALXEDA_XGMAC=mCONFIG_NET_VENDOR_CHELSIO=yCONFIG_CHELSIO_T1=mCONFIG_CHELSIO_T1_1G=yCONFIG_CHELSIO_T3=mCONFIG_CHELSIO_T4=mCONFIG_CHELSIO_T4VF=m
# CONFIG_NET_VENDOR_CISCO is not set
# CONFIG_DNET is not set
# CONFIG_NET_VENDOR_DEC is not set
# CONFIG_NET_VENDOR_DLINK is not setCONFIG_NET_VENDOR_EMULEX=yCONFIG_BE2NET=m
# CONFIG_NET_VENDOR_EXAR is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_INTEL is not setCONFIG_IP1000=mCONFIG_JME=m
# CONFIG_NET_VENDOR_MARVELL is not setCONFIG_NET_VENDOR_MELLANOX=yCONFIG_MLX4_EN=mCONFIG_MLX4_CORE=m
# CONFIG_MLX4_DEBUG is not setCONFIG_NET_VENDOR_MICREL=yCONFIG_KS8842=mCONFIG_KS8851_MLL=mCONFIG_KSZ884X_PCI=mCONFIG_NET_VENDOR_MYRI=y
# CONFIG_MYRI10GE is not set
# CONFIG_FEALNX is not set
# CONFIG_NET_VENDOR_NATSEMI is not setCONFIG_NET_VENDOR_NVIDIA=yCONFIG_FORCEDETH=y
# CONFIG_NET_VENDOR_OKI is not set
# CONFIG_ETHOC is not setCONFIG_NET_PACKET_ENGINE=yCONFIG_HAMACHI=m
# CONFIG_YELLOWFIN is not set
# CONFIG_NET_VENDOR_QLOGIC is not set
# CONFIG_NET_VENDOR_REALTEK is not set
# CONFIG_NET_VENDOR_RDC is not setCONFIG_NET_VENDOR_SEEQ=yCONFIG_SEEQ8005=m
# CONFIG_NET_VENDOR_SILAN is not set
# CONFIG_NET_VENDOR_SIS is not setCONFIG_SFC=m
# CONFIG_SFC_MCDI_MON is not setCONFIG_NET_VENDOR_SMSC=yCONFIG_EPIC100=m
# CONFIG_SMSC9420 is not setCONFIG_NET_VENDOR_STMICRO=y
# CONFIG_STMMAC_ETH is not setCONFIG_NET_VENDOR_SUN=yCONFIG_HAPPYMEAL=m
# CONFIG_SUNGEM is not setCONFIG_CASSINI=mCONFIG_NIU=mCONFIG_NET_VENDOR_TEHUTI=yCONFIG_TEHUTI=m
# CONFIG_NET_VENDOR_TI is not set
# CONFIG_NET_VENDOR_VIA is not setCONFIG_FDDI=mCONFIG_DEFXX=mCONFIG_DEFXX_MMIO=yCONFIG_SKFP=m
# CONFIG_HIPPI is not set
# CONFIG_NET_SB1000 is not setCONFIG_PHYLIB=y
#
# MII PHY device drivers
#CONFIG_AMD_PHY=m
# CONFIG_MARVELL_PHY is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_QSEMI_PHY is not setCONFIG_LXT_PHY=mCONFIG_CICADA_PHY=mCONFIG_VITESSE_PHY=m
# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_PHY is not set
# CONFIG_NATIONAL_PHY is not set
# CONFIG_STE10XP is not set
# CONFIG_LSI_ET1011C_PHY is not set
# CONFIG_MICREL_PHY is not setCONFIG_FIXED_PHY=y
# CONFIG_MDIO_BITBANG is not setCONFIG_PPP=mCONFIG_PPP_BSDCOMP=mCONFIG_PPP_DEFLATE=m
# CONFIG_PPP_FILTER is not setCONFIG_PPP_MPPE=m
# CONFIG_PPP_MULTILINK is not setCONFIG_PPPOATM=mCONFIG_PPPOE=m
# CONFIG_PPTP is not set
# CONFIG_PPP_ASYNC is not setCONFIG_PPP_SYNC_TTY=m
# CONFIG_SLIP is not setCONFIG_SLHC=mCONFIG_TR=yCONFIG_WANT_LLC=yCONFIG_IBMOL=mCONFIG_3C359=mCONFIG_TMS380TR=m
# CONFIG_TMSPCI is not set
# CONFIG_ABYSS is not set
#
# USB Network Adapters
#CONFIG_USB_CATC=mCONFIG_USB_KAWETH=mCONFIG_USB_PEGASUS=m
# CONFIG_USB_RTL8150 is not setCONFIG_USB_USBNET=m
# CONFIG_USB_NET_AX8817X is not setCONFIG_USB_NET_CDCETHER=m
# CONFIG_USB_NET_CDC_EEM is not set
# CONFIG_USB_NET_CDC_NCM is not set
# CONFIG_USB_NET_DM9601 is not setCONFIG_USB_NET_SMSC75XX=mCONFIG_USB_NET_SMSC95XX=mCONFIG_USB_NET_GL620A=m
# CONFIG_USB_NET_NET1080 is not setCONFIG_USB_NET_PLUSB=mCONFIG_USB_NET_MCS7830=mCONFIG_USB_NET_RNDIS_HOST=mCONFIG_USB_NET_CDC_SUBSET=mCONFIG_USB_ALI_M5632=y
# CONFIG_USB_AN2720 is not set
# CONFIG_USB_BELKIN is not setCONFIG_USB_ARMLINUX=y
# CONFIG_USB_EPSON2888 is not setCONFIG_USB_KC2190=y
# CONFIG_USB_NET_ZAURUS is not setCONFIG_USB_NET_CX82310_ETH=mCONFIG_USB_NET_KALMIA=m
# CONFIG_USB_NET_QMI_WWAN is not set
# CONFIG_USB_NET_INT51X1 is not setCONFIG_USB_CDC_PHONET=m
# CONFIG_USB_IPHETH is not set
# CONFIG_USB_SIERRA_NET is not setCONFIG_USB_VL600=m
# CONFIG_WLAN is not set
#
# Enable WiMAX (Networking options) to see the WiMAX drivers #
# CONFIG_WAN is not set
# CONFIG_VMXNET3 is not setCONFIG_ISDN=y
# CONFIG_ISDN_I4L is not set
# CONFIG_ISDN_CAPI is not set
# CONFIG_ISDN_DRV_GIGASET is not set
# CONFIG_HYSDN is not set
# CONFIG_MISDN is not set
#
# Input device support
#CONFIG_INPUT=yCONFIG_INPUT_FF_MEMLESS=mCONFIG_INPUT_POLLDEV=yCONFIG_INPUT_SPARSEKMAP=m
#
# Userland interfaces
#CONFIG_INPUT_MOUSEDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not setCONFIG_INPUT_MOUSEDEV_SCREEN_X=1024CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not setCONFIG_INPUT_EVDEV=mCONFIG_INPUT_EVBUG=m
#
# Input Device Drivers
#CONFIG_INPUT_KEYBOARD=y
# CONFIG_KEYBOARD_ADP5588 is not setCONFIG_KEYBOARD_ADP5589=mCONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_LKKBD is not setCONFIG_KEYBOARD_GPIO=m
# CONFIG_KEYBOARD_GPIO_POLLED is not setCONFIG_KEYBOARD_TCA6416=mCONFIG_KEYBOARD_TCA8418=m
# CONFIG_KEYBOARD_MATRIX is not setCONFIG_KEYBOARD_LM8323=mCONFIG_KEYBOARD_MAX7359=m
# CONFIG_KEYBOARD_MCS is not set
# CONFIG_KEYBOARD_MPR121 is not setCONFIG_KEYBOARD_NEWTON=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not setCONFIG_KEYBOARD_SUNKBD=mCONFIG_KEYBOARD_OMAP4=m
# CONFIG_KEYBOARD_XTKBD is not setCONFIG_INPUT_MOUSE=y
# CONFIG_MOUSE_PS2 is not setCONFIG_MOUSE_SERIAL=m
# CONFIG_MOUSE_APPLETOUCH is not set
# CONFIG_MOUSE_BCM5974 is not set
# CONFIG_MOUSE_VSXXXAA is not setCONFIG_MOUSE_GPIO=mCONFIG_MOUSE_SYNAPTICS_I2C=mCONFIG_MOUSE_SYNAPTICS_USB=m
# CONFIG_INPUT_JOYSTICK is not setCONFIG_INPUT_TABLET=yCONFIG_TABLET_USB_ACECAD=m
# CONFIG_TABLET_USB_AIPTEK is not set
# CONFIG_TABLET_USB_GTCO is not setCONFIG_TABLET_USB_HANWANG=mCONFIG_TABLET_USB_KBTAB=mCONFIG_TABLET_USB_WACOM=mCONFIG_INPUT_TOUCHSCREEN=yCONFIG_TOUCHSCREEN_AD7879=m
# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not setCONFIG_TOUCHSCREEN_BU21013=m
# CONFIG_TOUCHSCREEN_CY8CTMG110 is not setCONFIG_TOUCHSCREEN_CYTTSP_CORE=m
# CONFIG_TOUCHSCREEN_CYTTSP_I2C is not setCONFIG_TOUCHSCREEN_DYNAPRO=mCONFIG_TOUCHSCREEN_HAMPSHIRE=m
# CONFIG_TOUCHSCREEN_EETI is not set
# CONFIG_TOUCHSCREEN_EGALAX is not setCONFIG_TOUCHSCREEN_FUJITSU=m
# CONFIG_TOUCHSCREEN_ILI210X is not set
# CONFIG_TOUCHSCREEN_GUNZE is not setCONFIG_TOUCHSCREEN_ELO=m
# CONFIG_TOUCHSCREEN_WACOM_W8001 is not setCONFIG_TOUCHSCREEN_MAX11801=m
# CONFIG_TOUCHSCREEN_MCS5000 is not setCONFIG_TOUCHSCREEN_MTOUCH=m
# CONFIG_TOUCHSCREEN_INEXIO is not setCONFIG_TOUCHSCREEN_MK712=mCONFIG_TOUCHSCREEN_PENMOUNT=mCONFIG_TOUCHSCREEN_TOUCHRIGHT=m
# CONFIG_TOUCHSCREEN_TOUCHWIN is not setCONFIG_TOUCHSCREEN_PIXCIR=mCONFIG_TOUCHSCREEN_USB_COMPOSITE=mCONFIG_TOUCHSCREEN_USB_EGALAX=y
# CONFIG_TOUCHSCREEN_USB_PANJIT is not setCONFIG_TOUCHSCREEN_USB_3M=yCONFIG_TOUCHSCREEN_USB_ITM=y
# CONFIG_TOUCHSCREEN_USB_ETURBO is not set
# CONFIG_TOUCHSCREEN_USB_GUNZE is not setCONFIG_TOUCHSCREEN_USB_DMC_TSC10=yCONFIG_TOUCHSCREEN_USB_IRTOUCH=yCONFIG_TOUCHSCREEN_USB_IDEALTEK=y
# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not setCONFIG_TOUCHSCREEN_USB_GOTOP=y
# CONFIG_TOUCHSCREEN_USB_JASTEC is not setCONFIG_TOUCHSCREEN_USB_ELO=yCONFIG_TOUCHSCREEN_USB_E2I=y
# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set
# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not setCONFIG_TOUCHSCREEN_USB_NEXIO=yCONFIG_TOUCHSCREEN_USB_EASYTOUCH=yCONFIG_TOUCHSCREEN_TOUCHIT213=m
# CONFIG_TOUCHSCREEN_TSC_SERIO is not setCONFIG_TOUCHSCREEN_TSC2007=m
# CONFIG_TOUCHSCREEN_ST1232 is not setCONFIG_TOUCHSCREEN_TPS6507X=m
# CONFIG_INPUT_MISC is not set
#
# Hardware I/O ports
#CONFIG_SERIO=yCONFIG_SERIO_I8042=y
# CONFIG_SERIO_SERPORT is not set
# CONFIG_SERIO_CT82C710 is not setCONFIG_SERIO_PCIPS2=mCONFIG_SERIO_LIBPS2=yCONFIG_SERIO_RAW=m
# CONFIG_SERIO_ALTERA_PS2 is not set
# CONFIG_SERIO_PS2MULT is not setCONFIG_GAMEPORT=mCONFIG_GAMEPORT_NS558=mCONFIG_GAMEPORT_L4=m
# CONFIG_GAMEPORT_EMU10K1 is not set
# CONFIG_GAMEPORT_FM801 is not set
#
# Character devices
#CONFIG_VT=y
# CONFIG_CONSOLE_TRANSLATIONS is not setCONFIG_VT_CONSOLE=yCONFIG_VT_CONSOLE_SLEEP=yCONFIG_HW_CONSOLE=yCONFIG_VT_HW_CONSOLE_BINDING=yCONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_NOZOMI is not setCONFIG_N_GSM=mCONFIG_TRACE_ROUTER=mCONFIG_TRACE_SINK=m
# CONFIG_DEVKMEM is not set
#
# Serial drivers
#CONFIG_SERIAL_8250=yCONFIG_SERIAL_8250_CONSOLE=yCONFIG_FIX_EARLYCON_MEM=y
# CONFIG_SERIAL_8250_PCI is not setCONFIG_SERIAL_8250_PNP=mCONFIG_SERIAL_8250_NR_UARTS=4CONFIG_SERIAL_8250_RUNTIME_UARTS=4CONFIG_SERIAL_8250_EXTENDED=yCONFIG_SERIAL_8250_MANY_PORTS=yCONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
# CONFIG_SERIAL_8250_RSA is not set
#
# Non-8250 serial port support
#
# CONFIG_SERIAL_MFD_HSU is not set
# CONFIG_SERIAL_UARTLITE is not setCONFIG_SERIAL_CORE=yCONFIG_SERIAL_CORE_CONSOLE=yCONFIG_SERIAL_JSM=mCONFIG_SERIAL_TIMBERDALE=m
# CONFIG_SERIAL_ALTERA_JTAGUART is not setCONFIG_SERIAL_ALTERA_UART=mCONFIG_SERIAL_ALTERA_UART_MAXPORTS=4CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200CONFIG_SERIAL_PCH_UART=mCONFIG_SERIAL_XILINX_PS_UART=m
# CONFIG_TTY_PRINTK is not set
# CONFIG_VIRTIO_CONSOLE is not setCONFIG_IPMI_HANDLER=mCONFIG_IPMI_PANIC_EVENT=y
# CONFIG_IPMI_PANIC_STRING is not set
# CONFIG_IPMI_DEVICE_INTERFACE is not setCONFIG_IPMI_SI=mCONFIG_IPMI_WATCHDOG=m
# CONFIG_IPMI_POWEROFF is not setCONFIG_HW_RANDOM=m
# CONFIG_HW_RANDOM_TIMERIOMEM is not setCONFIG_HW_RANDOM_INTEL=mCONFIG_HW_RANDOM_AMD=mCONFIG_HW_RANDOM_VIA=mCONFIG_HW_RANDOM_VIRTIO=mCONFIG_NVRAM=mCONFIG_RTC=m
# CONFIG_GEN_RTC is not setCONFIG_R3964=mCONFIG_APPLICOM=m
# CONFIG_MWAVE is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_HPET is not set
# CONFIG_HANGCHECK_TIMER is not set
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not setCONFIG_DEVPORT=y
# CONFIG_RAMOOPS is not setCONFIG_I2C=mCONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not set
# CONFIG_I2C_CHARDEV is not set
# CONFIG_I2C_MUX is not set
# CONFIG_I2C_HELPER_AUTO is not setCONFIG_I2C_SMBUS=m
#
# I2C Algorithms
#CONFIG_I2C_ALGOBIT=mCONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALGOPCA is not set
#
# I2C Hardware Bus support
#
#
# PC SMBus host controller drivers
#CONFIG_I2C_ALI1535=m
# CONFIG_I2C_ALI1563 is not setCONFIG_I2C_ALI15X3=m
# CONFIG_I2C_AMD756 is not set
# CONFIG_I2C_AMD8111 is not setCONFIG_I2C_I801=m
# CONFIG_I2C_ISCH is not setCONFIG_I2C_PIIX4=mCONFIG_I2C_NFORCE2=mCONFIG_I2C_NFORCE2_S4985=mCONFIG_I2C_SIS5595=mCONFIG_I2C_SIS630=mCONFIG_I2C_SIS96X=m
# CONFIG_I2C_VIA is not setCONFIG_I2C_VIAPRO=m
#
# ACPI drivers
#
# CONFIG_I2C_SCMI is not set
#
# I2C system bus drivers (mostly embedded / system-on-chip) #CONFIG_I2C_DESIGNWARE_PCI=m
# CONFIG_I2C_EG20T is not set
# CONFIG_I2C_GPIO is not set CONFIG_I2C_INTEL_MID=m
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PXA_PCI is not set CONFIG_I2C_SIMTEC=m
# CONFIG_I2C_XILINX is not set
#
# External I2C/SMBus adapter drivers
#CONFIG_I2C_DIOLAN_U2C=mCONFIG_I2C_PARPORT_LIGHT=m
# CONFIG_I2C_TAOS_EVM is not set
# CONFIG_I2C_TINY_USB is not set
#
# Other I2C/SMBus bus drivers
#CONFIG_I2C_STUB=mCONFIG_I2C_DEBUG_CORE=yCONFIG_I2C_DEBUG_ALGO=yCONFIG_I2C_DEBUG_BUS=y
# CONFIG_SPI is not setCONFIG_HSI=mCONFIG_HSI_BOARDINFO=y
#
# HSI clients
#
# CONFIG_HSI_CHAR is not set
#
# PPS support
#CONFIG_PPS=mCONFIG_PPS_DEBUG=y
#
# PPS clients support
#CONFIG_PPS_CLIENT_KTIMER=m
# CONFIG_PPS_CLIENT_LDISC is not set
# CONFIG_PPS_CLIENT_GPIO is not set
#
# PPS generators support
#
#
# PTP clock support
#CONFIG_PTP_1588_CLOCK=m
# CONFIG_DP83640_PHY is not setCONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=yCONFIG_GPIOLIB=yCONFIG_DEBUG_GPIO=yCONFIG_GPIO_SYSFS=yCONFIG_GPIO_GENERIC=m
#
# Memory mapped GPIO drivers:
#CONFIG_GPIO_GENERIC_PLATFORM=mCONFIG_GPIO_IT8761E=m
# CONFIG_GPIO_SCH is not setCONFIG_GPIO_VX855=m
#
# I2C GPIO expanders:
#
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX732X is not setCONFIG_GPIO_PCA953X=mCONFIG_GPIO_PCF857X=m
# CONFIG_GPIO_ADP5588 is not set
#
# PCI GPIO expanders:
#CONFIG_GPIO_CS5535=m
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_LANGWELL is not set
# CONFIG_GPIO_PCH is not setCONFIG_GPIO_ML_IOH=mCONFIG_GPIO_TIMBERDALE=yCONFIG_GPIO_RDC321X=m
#
# SPI GPIO expanders:
#
# CONFIG_GPIO_MCP23S08 is not set
#
# AC97 GPIO expanders:
#
#
# MODULbus GPIO expanders:
#CONFIG_W1=m
#
# 1-wire Bus Masters
#
# CONFIG_W1_MASTER_MATROX is not set
# CONFIG_W1_MASTER_DS2490 is not set
# CONFIG_W1_MASTER_DS2482 is not set
# CONFIG_W1_MASTER_DS1WM is not set
# CONFIG_W1_MASTER_GPIO is not set
#
# 1-wire Slaves
#CONFIG_W1_SLAVE_THERM=mCONFIG_W1_SLAVE_SMEM=mCONFIG_W1_SLAVE_DS2408=m
# CONFIG_W1_SLAVE_DS2423 is not set
# CONFIG_W1_SLAVE_DS2431 is not setCONFIG_W1_SLAVE_DS2433=mCONFIG_W1_SLAVE_DS2433_CRC=yCONFIG_W1_SLAVE_DS2760=mCONFIG_W1_SLAVE_DS2780=mCONFIG_W1_SLAVE_DS2781=m
# CONFIG_W1_SLAVE_BQ27000 is not setCONFIG_POWER_SUPPLY=mCONFIG_POWER_SUPPLY_DEBUG=y
# CONFIG_PDA_POWER is not setCONFIG_TEST_POWER=mCONFIG_BATTERY_DS2760=m
# CONFIG_BATTERY_DS2780 is not setCONFIG_BATTERY_DS2781=m
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_SBS is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_CHARGER_ISP1704 is not setCONFIG_CHARGER_MAX8903=m
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not setCONFIG_CHARGER_SMB347=mCONFIG_HWMON=mCONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
# Native drivers
#
# CONFIG_SENSORS_ABITUGURU is not setCONFIG_SENSORS_ABITUGURU3=mCONFIG_SENSORS_AD7414=mCONFIG_SENSORS_AD7418=m
# CONFIG_SENSORS_ADM1021 is not setCONFIG_SENSORS_ADM1025=m
# CONFIG_SENSORS_ADM1026 is not setCONFIG_SENSORS_ADM1029=mCONFIG_SENSORS_ADM1031=mCONFIG_SENSORS_ADM9240=mCONFIG_SENSORS_ADT7411=mCONFIG_SENSORS_ADT7462=m
# CONFIG_SENSORS_ADT7470 is not setCONFIG_SENSORS_ADT7475=mCONFIG_SENSORS_ASC7621=m
# CONFIG_SENSORS_K8TEMP is not setCONFIG_SENSORS_K10TEMP=mCONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_ASB100 is not set
# CONFIG_SENSORS_ATXP1 is not setCONFIG_SENSORS_DS620=m
# CONFIG_SENSORS_DS1621 is not setCONFIG_SENSORS_I5K_AMB=mCONFIG_SENSORS_F71805F=mCONFIG_SENSORS_F71882FG=m
# CONFIG_SENSORS_F75375S is not setCONFIG_SENSORS_FSCHMD=mCONFIG_SENSORS_G760A=m
# CONFIG_SENSORS_GL518SM is not setCONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
# CONFIG_SENSORS_CORETEMP is not setCONFIG_SENSORS_IBMAEM=m
# CONFIG_SENSORS_IBMPEX is not set
# CONFIG_SENSORS_IT87 is not setCONFIG_SENSORS_JC42=mCONFIG_SENSORS_LINEAGE=mCONFIG_SENSORS_LM63=mCONFIG_SENSORS_LM73=mCONFIG_SENSORS_LM75=m
# CONFIG_SENSORS_LM77 is not setCONFIG_SENSORS_LM78=mCONFIG_SENSORS_LM80=mCONFIG_SENSORS_LM83=mCONFIG_SENSORS_LM85=m
# CONFIG_SENSORS_LM87 is not set
# CONFIG_SENSORS_LM90 is not setCONFIG_SENSORS_LM92=m
# CONFIG_SENSORS_LM93 is not setCONFIG_SENSORS_LTC4151=mCONFIG_SENSORS_LTC4215=mCONFIG_SENSORS_LTC4245=mCONFIG_SENSORS_LTC4261=m
# CONFIG_SENSORS_LM95241 is not setCONFIG_SENSORS_LM95245=mCONFIG_SENSORS_MAX16065=mCONFIG_SENSORS_MAX1619=m
# CONFIG_SENSORS_MAX1668 is not set
# CONFIG_SENSORS_MAX6639 is not setCONFIG_SENSORS_MAX6642=m
# CONFIG_SENSORS_MAX6650 is not set
# CONFIG_SENSORS_MCP3021 is not set
# CONFIG_SENSORS_NTC_THERMISTOR is not set
# CONFIG_SENSORS_PC87360 is not setCONFIG_SENSORS_PC87427=mCONFIG_SENSORS_PCF8591=m
# CONFIG_PMBUS is not set
# CONFIG_SENSORS_SHT15 is not setCONFIG_SENSORS_SHT21=mCONFIG_SENSORS_SIS5595=m
# CONFIG_SENSORS_SMM665 is not set
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_EMC1403 is not setCONFIG_SENSORS_EMC2103=mCONFIG_SENSORS_EMC6W201=mCONFIG_SENSORS_SMSC47M1=m
# CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_ADS1015 is not setCONFIG_SENSORS_ADS7828=mCONFIG_SENSORS_AMC6821=mCONFIG_SENSORS_THMC50=m
# CONFIG_SENSORS_TMP102 is not setCONFIG_SENSORS_TMP401=mCONFIG_SENSORS_TMP421=m
# CONFIG_SENSORS_VIA_CPUTEMP is not set
# CONFIG_SENSORS_VIA686A is not setCONFIG_SENSORS_VT1211=mCONFIG_SENSORS_VT8231=m
# CONFIG_SENSORS_W83781D is not set
# CONFIG_SENSORS_W83791D is not setCONFIG_SENSORS_W83792D=m
# CONFIG_SENSORS_W83793 is not set
# CONFIG_SENSORS_W83795 is not set
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not setCONFIG_SENSORS_APPLESMC=m
#
# ACPI drivers
#
# CONFIG_SENSORS_ACPI_POWER is not setCONFIG_SENSORS_ATK0110=mCONFIG_THERMAL=mCONFIG_THERMAL_HWMON=y
# CONFIG_WATCHDOG is not setCONFIG_SSB_POSSIBLE=y
#
# Sonics Silicon Backplane
#CONFIG_SSB=mCONFIG_SSB_SPROM=yCONFIG_SSB_PCIHOST_POSSIBLE=yCONFIG_SSB_PCIHOST=y
# CONFIG_SSB_B43_PCI_BRIDGE is not setCONFIG_SSB_SDIOHOST_POSSIBLE=yCONFIG_SSB_SDIOHOST=y
# CONFIG_SSB_SILENT is not set
# CONFIG_SSB_DEBUG is not setCONFIG_SSB_DRIVER_PCICORE_POSSIBLE=yCONFIG_SSB_DRIVER_PCICORE=yCONFIG_BCMA_POSSIBLE=y
#
# Broadcom specific AMBA
#
# CONFIG_BCMA is not set
#
# Multifunction device drivers
#CONFIG_MFD_CORE=mCONFIG_MFD_SM501=m
# CONFIG_MFD_SM501_GPIO is not set
# CONFIG_HTC_PASIC3 is not setCONFIG_TPS6105X=m
# CONFIG_TPS65010 is not setCONFIG_TPS6507X=m
# CONFIG_MFD_TPS65217 is not set
# CONFIG_MFD_TMIO is not setCONFIG_MFD_WM8400=m
# CONFIG_MFD_PCF50633 is not set
# CONFIG_ABX500_CORE is not setCONFIG_MFD_CS5535=mCONFIG_MFD_TIMBERDALE=m
# CONFIG_LPC_SCH is not setCONFIG_MFD_RDC321X=m
# CONFIG_MFD_JANZ_CMODIO is not setCONFIG_MFD_VX855=m
# CONFIG_MFD_WL1273_CORE is not setCONFIG_REGULATOR=yCONFIG_REGULATOR_DEBUG=yCONFIG_REGULATOR_DUMMY=yCONFIG_REGULATOR_FIXED_VOLTAGE=mCONFIG_REGULATOR_VIRTUAL_CONSUMER=mCONFIG_REGULATOR_USERSPACE_CONSUMER=mCONFIG_REGULATOR_GPIO=m
# CONFIG_REGULATOR_AD5398 is not setCONFIG_REGULATOR_ISL6271A=m
# CONFIG_REGULATOR_MAX1586 is not setCONFIG_REGULATOR_MAX8649=mCONFIG_REGULATOR_MAX8660=m
# CONFIG_REGULATOR_MAX8952 is not set
# CONFIG_REGULATOR_LP3971 is not set
# CONFIG_REGULATOR_LP3972 is not setCONFIG_REGULATOR_TPS6105X=m
# CONFIG_REGULATOR_TPS62360 is not setCONFIG_REGULATOR_TPS65023=mCONFIG_REGULATOR_TPS6507X=mCONFIG_REGULATOR_WM8400=m
# CONFIG_MEDIA_SUPPORT is not set
#
# Graphics support
#CONFIG_AGP=mCONFIG_AGP_AMD64=m
# CONFIG_AGP_INTEL is not setCONFIG_AGP_SIS=m
# CONFIG_AGP_VIA is not set
# CONFIG_VGA_ARB is not set
# CONFIG_VGA_SWITCHEROO is not set
# CONFIG_DRM is not set
# CONFIG_STUB_POULSBO is not setCONFIG_VGASTATE=mCONFIG_VIDEO_OUTPUT_CONTROL=mCONFIG_FB=mCONFIG_FIRMWARE_EDID=yCONFIG_FB_DDC=m
# CONFIG_FB_BOOT_VESA_SUPPORT is not setCONFIG_FB_CFB_FILLRECT=mCONFIG_FB_CFB_COPYAREA=mCONFIG_FB_CFB_IMAGEBLIT=m
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not setCONFIG_FB_SYS_FILLRECT=mCONFIG_FB_SYS_COPYAREA=mCONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_FOREIGN_ENDIAN is not setCONFIG_FB_SYS_FOPS=m
# CONFIG_FB_WMT_GE_ROPS is not setCONFIG_FB_DEFERRED_IO=yCONFIG_FB_HECUBA=mCONFIG_FB_SVGALIB=m
# CONFIG_FB_MACMODES is not setCONFIG_FB_BACKLIGHT=yCONFIG_FB_MODE_HELPERS=yCONFIG_FB_TILEBLITTING=y
#
# Frame buffer hardware drivers
#
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not setCONFIG_FB_CYBER2000=mCONFIG_FB_CYBER2000_DDC=yCONFIG_FB_ARC=m
# CONFIG_FB_VGA16 is not setCONFIG_FB_N411=m
# CONFIG_FB_HGA is not set
# CONFIG_FB_S1D13XXX is not setCONFIG_FB_NVIDIA=m
# CONFIG_FB_NVIDIA_I2C is not set
# CONFIG_FB_NVIDIA_DEBUG is not set
# CONFIG_FB_NVIDIA_BACKLIGHT is not setCONFIG_FB_RIVA=m
# CONFIG_FB_RIVA_I2C is not setCONFIG_FB_RIVA_DEBUG=y
# CONFIG_FB_RIVA_BACKLIGHT is not setCONFIG_FB_I740=mCONFIG_FB_LE80578=m
# CONFIG_FB_CARILLO_RANCH is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not setCONFIG_FB_ATY=mCONFIG_FB_ATY_CT=y
# CONFIG_FB_ATY_GENERIC_LCD is not setCONFIG_FB_ATY_GX=yCONFIG_FB_ATY_BACKLIGHT=yCONFIG_FB_S3=mCONFIG_FB_S3_DDC=y
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not setCONFIG_FB_VIA=m
# CONFIG_FB_VIA_DIRECT_PROCFS is not set
# CONFIG_FB_VIA_X_COMPATIBILITY is not setCONFIG_FB_NEOMAGIC=mCONFIG_FB_KYRO=mCONFIG_FB_3DFX=mCONFIG_FB_3DFX_ACCEL=yCONFIG_FB_3DFX_I2C=y
# CONFIG_FB_VOODOO1 is not setCONFIG_FB_VT8623=m
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
# CONFIG_FB_CARMINE is not setCONFIG_FB_GEODE=y
# CONFIG_FB_GEODE_LX is not setCONFIG_FB_GEODE_GX=m
# CONFIG_FB_GEODE_GX1 is not set
# CONFIG_FB_TMIO is not setCONFIG_FB_SM501=mCONFIG_FB_SMSCUFX=mCONFIG_FB_UDL=m
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not setCONFIG_FB_MB862XX=mCONFIG_FB_MB862XX_PCI_GDC=y
# CONFIG_FB_MB862XX_I2C is not setCONFIG_FB_BROADSHEET=mCONFIG_EXYNOS_VIDEO=yCONFIG_BACKLIGHT_LCD_SUPPORT=yCONFIG_LCD_CLASS_DEVICE=mCONFIG_LCD_PLATFORM=mCONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_GENERIC is not setCONFIG_BACKLIGHT_PROGEAR=mCONFIG_BACKLIGHT_CARILLO_RANCH=m
# CONFIG_BACKLIGHT_APPLE is not set
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not setCONFIG_BACKLIGHT_ADP8870=m
# CONFIG_BACKLIGHT_LP855X is not setCONFIG_BACKLIGHT_OT200=m
#
# Console display driver support
#CONFIG_VGA_CONSOLE=y
# CONFIG_VGACON_SOFT_SCROLLBACK is not setCONFIG_DUMMY_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE is not setCONFIG_LOGO=yCONFIG_LOGO_LINUX_MONO=yCONFIG_LOGO_LINUX_VGA16=yCONFIG_LOGO_LINUX_CLUT224=y
# CONFIG_SOUND is not setCONFIG_HID_SUPPORT=yCONFIG_HID=m
# CONFIG_HID_BATTERY_STRENGTH is not set
# CONFIG_HIDRAW is not set
#
# USB Input Devices
#CONFIG_USB_HID=mCONFIG_HID_PID=yCONFIG_USB_HIDDEV=y
#
# USB HID Boot Protocol drivers
#CONFIG_USB_KBD=mCONFIG_USB_MOUSE=y
#
# Special HID drivers
#
# CONFIG_HID_A4TECH is not set
# CONFIG_HID_ACRUX is not setCONFIG_HID_APPLE=mCONFIG_HID_BELKIN=m
# CONFIG_HID_CHERRY is not set
# CONFIG_HID_CHICONY is not set
# CONFIG_HID_CYPRESS is not set
# CONFIG_HID_DRAGONRISE is not setCONFIG_HID_EMS_FF=m
# CONFIG_HID_EZKEY is not setCONFIG_HID_HOLTEK=mCONFIG_HOLTEK_FF=y
# CONFIG_HID_KEYTOUCH is not setCONFIG_HID_KYE=mCONFIG_HID_UCLOGIC=m
# CONFIG_HID_WALTOP is not set
# CONFIG_HID_GYRATION is not setCONFIG_HID_TWINHAN=mCONFIG_HID_KENSINGTON=mCONFIG_HID_LCPOWER=m
# CONFIG_HID_LOGITECH is not set
# CONFIG_HID_MICROSOFT is not set
# CONFIG_HID_MONTEREY is not setCONFIG_HID_MULTITOUCH=m
# CONFIG_HID_NTRIG is not set
# CONFIG_HID_ORTEK is not setCONFIG_HID_PANTHERLORD=mCONFIG_PANTHERLORD_FF=yCONFIG_HID_PETALYNX=mCONFIG_HID_PICOLCD=m
# CONFIG_HID_PICOLCD_FB is not set
# CONFIG_HID_PICOLCD_BACKLIGHT is not setCONFIG_HID_PICOLCD_LCD=yCONFIG_HID_PICOLCD_LEDS=y
# CONFIG_HID_PRIMAX is not set
# CONFIG_HID_ROCCAT is not setCONFIG_HID_SAITEK=m
# CONFIG_HID_SAMSUNG is not setCONFIG_HID_SONY=mCONFIG_HID_SPEEDLINK=m
# CONFIG_HID_SUNPLUS is not setCONFIG_HID_GREENASIA=mCONFIG_GREENASIA_FF=y
# CONFIG_HID_SMARTJOYPLUS is not set
# CONFIG_HID_TIVO is not setCONFIG_HID_TOPSEED=mCONFIG_HID_THRUSTMASTER=m
# CONFIG_THRUSTMASTER_FF is not setCONFIG_HID_ZEROPLUS=m
# CONFIG_ZEROPLUS_FF is not set
# CONFIG_HID_ZYDACRON is not setCONFIG_USB_ARCH_HAS_OHCI=yCONFIG_USB_ARCH_HAS_EHCI=yCONFIG_USB_ARCH_HAS_XHCI=yCONFIG_USB_SUPPORT=yCONFIG_USB_COMMON=yCONFIG_USB_ARCH_HAS_HCD=yCONFIG_USB=y
# CONFIG_USB_DEBUG is not setCONFIG_USB_ANNOUNCE_NEW_DEVICES=y
#
# Miscellaneous USB options
#CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not setCONFIG_USB_DYNAMIC_MINORS=y
# CONFIG_USB_SUSPEND is not setCONFIG_USB_OTG_WHITELIST=yCONFIG_USB_OTG_BLACKLIST_HUB=yCONFIG_USB_DWC3=m
# CONFIG_USB_DWC3_DEBUG is not setCONFIG_USB_MON=mCONFIG_USB_WUSB=m
# CONFIG_USB_WUSB_CBAF is not set
#
# USB Host Controller Drivers
#CONFIG_USB_C67X00_HCD=mCONFIG_USB_XHCI_HCD=mCONFIG_USB_XHCI_PLATFORM=m
# CONFIG_USB_XHCI_HCD_DEBUGGING is not setCONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not setCONFIG_USB_ISP1760_HCD=m
# CONFIG_USB_ISP1362_HCD is not setCONFIG_USB_OHCI_HCD=yCONFIG_USB_OHCI_HCD_PLATFORM=yCONFIG_USB_EHCI_HCD_PLATFORM=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not setCONFIG_USB_OHCI_LITTLE_ENDIAN=yCONFIG_USB_UHCI_HCD=yCONFIG_USB_U132_HCD=m
# CONFIG_USB_SL811_HCD is not setCONFIG_USB_R8A66597_HCD=m
# CONFIG_USB_WHCI_HCD is not setCONFIG_USB_HWA_HCD=m
# CONFIG_USB_MUSB_HDRC is not set
# CONFIG_USB_RENESAS_USBHS is not set
#
# USB Device Class drivers
#CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not setCONFIG_USB_TMC=m
#
# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may #
#
# also be needed; see USB_STORAGE Help for more info # # CONFIG_USB_STORAGE is not set CONFIG_USB_UAS=m # CONFIG_USB_LIBUSUAL is not set
#
# USB Imaging devices
#CONFIG_USB_MDC800=m
# CONFIG_USB_MICROTEK is not set
#
# USB port drivers
#
# CONFIG_USB_SERIAL is not set
#
# USB Miscellaneous drivers
#
# CONFIG_USB_EMI62 is not setCONFIG_USB_EMI26=m
# CONFIG_USB_ADUTUX is not setCONFIG_USB_SEVSEG=mCONFIG_USB_RIO500=m
# CONFIG_USB_LEGOTOWER is not setCONFIG_USB_LCD=mCONFIG_USB_LED=mCONFIG_USB_CYPRESS_CY7C63=m
# CONFIG_USB_CYTHERM is not set
# CONFIG_USB_IDMOUSE is not setCONFIG_USB_FTDI_ELAN=mCONFIG_USB_APPLEDISPLAY=mCONFIG_USB_SISUSBVGA=m
# CONFIG_USB_SISUSBVGA_CON is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not setCONFIG_USB_ISIGHTFW=m
# CONFIG_USB_YUREX is not setCONFIG_USB_ATM=mCONFIG_USB_SPEEDTOUCH=mCONFIG_USB_CXACRU=mCONFIG_USB_UEAGLEATM=mCONFIG_USB_XUSBATM=mCONFIG_USB_GADGET=mCONFIG_USB_GADGET_DEBUG=y
# CONFIG_USB_GADGET_DEBUG_FILES is not setCONFIG_USB_GADGET_DEBUG_FS=yCONFIG_USB_GADGET_VBUS_DRAW=2CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2CONFIG_USB_R8A66597=m
# CONFIG_USB_MV_UDC is not setCONFIG_USB_M66592=mCONFIG_USB_AMD5536UDC=m
# CONFIG_USB_CI13XXX_PCI is not setCONFIG_USB_NET2272=mCONFIG_USB_NET2272_DMA=yCONFIG_USB_NET2280=mCONFIG_USB_GOKU=m
# CONFIG_USB_EG20T is not set
# CONFIG_USB_DUMMY_HCD is not setCONFIG_USB_GADGET_DUALSPEED=yCONFIG_USB_GADGET_SUPERSPEED=y
# CONFIG_USB_ZERO is not setCONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not setCONFIG_USB_ETH_EEM=yCONFIG_USB_G_NCM=mCONFIG_USB_GADGETFS=mCONFIG_USB_FUNCTIONFS=mCONFIG_USB_FUNCTIONFS_ETH=yCONFIG_USB_FUNCTIONFS_RNDIS=yCONFIG_USB_FUNCTIONFS_GENERIC=y
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_MASS_STORAGE is not set
# CONFIG_USB_G_SERIAL is not setCONFIG_USB_G_PRINTER=m
# CONFIG_USB_CDC_COMPOSITE is not set
# CONFIG_USB_G_NOKIA is not setCONFIG_USB_G_ACM_MS=m
# CONFIG_USB_G_MULTI is not setCONFIG_USB_G_HID=mCONFIG_USB_G_DBGP=m
# CONFIG_USB_G_DBGP_PRINTK is not setCONFIG_USB_G_DBGP_SERIAL=y
#
# OTG and related infrastructure
#CONFIG_USB_OTG_UTILS=yCONFIG_USB_GPIO_VBUS=m
# CONFIG_NOP_USB_XCEIV is not setCONFIG_UWB=mCONFIG_UWB_HWA=mCONFIG_UWB_WHCI=mCONFIG_UWB_I1480U=mCONFIG_MMC=mCONFIG_MMC_DEBUG=yCONFIG_MMC_UNSAFE_RESUME=y
# CONFIG_MMC_CLKGATE is not set
#
# MMC/SD/SDIO Card Drivers
#
# CONFIG_MMC_BLOCK is not set
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
#
# MMC/SD/SDIO Host Controller Drivers
#CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_PCI is not setCONFIG_MMC_SDHCI_PLTFM=mCONFIG_MMC_WBSD=mCONFIG_MMC_TIFM_SD=mCONFIG_MMC_CB710=mCONFIG_MMC_VIA_SDMMC=m
# CONFIG_MMC_VUB300 is not setCONFIG_MMC_USHC=m
# CONFIG_MEMSTICK is not setCONFIG_NEW_LEDS=yCONFIG_LEDS_CLASS=m
#
# LED drivers
#
# CONFIG_LEDS_LM3530 is not set
# CONFIG_LEDS_PCA9532 is not setCONFIG_LEDS_GPIO=mCONFIG_LEDS_LP3944=m
# CONFIG_LEDS_LP5521 is not setCONFIG_LEDS_LP5523=m
# CONFIG_LEDS_CLEVO_MAIL is not setCONFIG_LEDS_PCA955X=m
# CONFIG_LEDS_PCA9633 is not setCONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_BD2802 is not setCONFIG_LEDS_INTEL_SS4200=m
# CONFIG_LEDS_LT3593 is not setCONFIG_LEDS_DELL_NETBOOKS=mCONFIG_LEDS_TCA6507=m
# CONFIG_LEDS_OT200 is not set
# CONFIG_LEDS_TRIGGERS is not set
#
# LED Triggers
#
# CONFIG_ACCESSIBILITY is not setCONFIG_INFINIBAND=mCONFIG_INFINIBAND_USER_MAD=mCONFIG_INFINIBAND_USER_ACCESS=mCONFIG_INFINIBAND_USER_MEM=yCONFIG_INFINIBAND_ADDR_TRANS=y
# CONFIG_INFINIBAND_MTHCA is not setCONFIG_INFINIBAND_IPATH=m
# CONFIG_INFINIBAND_QIB is not setCONFIG_INFINIBAND_AMSO1100=m
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
# CONFIG_INFINIBAND_CXGB3 is not setCONFIG_INFINIBAND_CXGB4=mCONFIG_MLX4_INFINIBAND=mCONFIG_INFINIBAND_NES=mCONFIG_INFINIBAND_NES_DEBUG=yCONFIG_INFINIBAND_IPOIB=m
# CONFIG_INFINIBAND_IPOIB_CM is not set
# CONFIG_INFINIBAND_IPOIB_DEBUG is not setCONFIG_INFINIBAND_SRP=mCONFIG_INFINIBAND_ISER=mCONFIG_EDAC=y
#
# Reporting subsystems
#
# CONFIG_EDAC_DEBUG is not setCONFIG_EDAC_DECODE_MCE=mCONFIG_EDAC_MCE_INJ=mCONFIG_EDAC_MM_EDAC=mCONFIG_EDAC_AMD64=mCONFIG_EDAC_AMD64_ERROR_INJECTION=y
# CONFIG_EDAC_E752X is not setCONFIG_EDAC_I82975X=m
# CONFIG_EDAC_I3000 is not set
# CONFIG_EDAC_I3200 is not setCONFIG_EDAC_X38=mCONFIG_EDAC_I5400=mCONFIG_EDAC_I5000=mCONFIG_EDAC_I5100=mCONFIG_EDAC_I7300=m
# CONFIG_RTC_CLASS is not setCONFIG_DMADEVICES=yCONFIG_DMADEVICES_DEBUG=y
# CONFIG_DMADEVICES_VDEBUG is not set
#
# DMA Devices
#
# CONFIG_INTEL_MID_DMAC is not set
# CONFIG_INTEL_IOATDMA is not set
# CONFIG_TIMB_DMA is not setCONFIG_PCH_DMA=mCONFIG_DMA_ENGINE=y
#
# DMA Clients
#
# CONFIG_NET_DMA is not setCONFIG_ASYNC_TX_DMA=yCONFIG_DMATEST=m
# CONFIG_AUXDISPLAY is not setCONFIG_UIO=m
# CONFIG_UIO_CIF is not setCONFIG_UIO_PDRV=mCONFIG_UIO_PDRV_GENIRQ=mCONFIG_UIO_AEC=mCONFIG_UIO_SERCOS3=mCONFIG_UIO_PCI_GENERIC=mCONFIG_UIO_NETX=mCONFIG_VIRTIO=mCONFIG_VIRTIO_RING=m
#
# Virtio drivers
#CONFIG_VIRTIO_PCI=m
# CONFIG_VIRTIO_BALLOON is not set
# CONFIG_VIRTIO_MMIO is not set
#
# Microsoft Hyper-V guest support
#
# CONFIG_HYPERV is not set
# CONFIG_STAGING is not setCONFIG_X86_PLATFORM_DEVICES=y
# CONFIG_ACER_WMI is not set
# CONFIG_ACERHDF is not set
# CONFIG_ASUS_LAPTOP is not setCONFIG_DELL_LAPTOP=m
# CONFIG_DELL_WMI is not setCONFIG_DELL_WMI_AIO=mCONFIG_FUJITSU_LAPTOP=m
# CONFIG_FUJITSU_LAPTOP_DEBUG is not setCONFIG_FUJITSU_TABLET=m
# CONFIG_HP_ACCEL is not set
# CONFIG_HP_WMI is not set
# CONFIG_PANASONIC_LAPTOP is not setCONFIG_THINKPAD_ACPI=m
# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
# CONFIG_THINKPAD_ACPI_DEBUG is not set
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
# CONFIG_THINKPAD_ACPI_VIDEO is not setCONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
# CONFIG_SENSORS_HDAPS is not setCONFIG_ACPI_WMI=m
# CONFIG_MSI_WMI is not setCONFIG_TOPSTAR_LAPTOP=m
# CONFIG_ACPI_TOSHIBA is not setCONFIG_TOSHIBA_BT_RFKILL=m
# CONFIG_ACPI_CMPC is not setCONFIG_INTEL_IPS=mCONFIG_IBM_RTL=m
# CONFIG_XO15_EBOOK is not setCONFIG_SAMSUNG_LAPTOP=mCONFIG_MXM_WMI=mCONFIG_SAMSUNG_Q10=mCONFIG_APPLE_GMUX=m
#
# Hardware Spinlock drivers
#CONFIG_CLKEVT_I8253=yCONFIG_I8253_LOCK=yCONFIG_CLKBLD_I8253=yCONFIG_IOMMU_API=yCONFIG_IOMMU_SUPPORT=yCONFIG_AMD_IOMMU=y
# CONFIG_AMD_IOMMU_STATS is not setCONFIG_AMD_IOMMU_V2=mCONFIG_DMAR_TABLE=y
# CONFIG_INTEL_IOMMU is not setCONFIG_IRQ_REMAP=y
#
# Remoteproc drivers (EXPERIMENTAL)
#
#
# Rpmsg drivers (EXPERIMENTAL)
#
# CONFIG_VIRT_DRIVERS is not setCONFIG_PM_DEVFREQ=y
#
# DEVFREQ Governors
#CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=yCONFIG_DEVFREQ_GOV_PERFORMANCE=y
# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
# CONFIG_DEVFREQ_GOV_USERSPACE is not set
#
# DEVFREQ Drivers
#
#
# Firmware Drivers
#CONFIG_EDD=mCONFIG_EDD_OFF=yCONFIG_FIRMWARE_MEMMAP=y
# CONFIG_EFI_VARS is not set
# CONFIG_DELL_RBU is not setCONFIG_DCDBAS=m
# CONFIG_DMIID is not setCONFIG_DMI_SYSFS=m
# CONFIG_ISCSI_IBFT_FIND is not setCONFIG_GOOGLE_FIRMWARE=y
#
# Google Firmware Drivers
#
# CONFIG_GOOGLE_SMI is not set
# CONFIG_GOOGLE_MEMCONSOLE is not set
#
# File systems
#CONFIG_DCACHE_WORD_ACCESS=yCONFIG_EXT2_FS=m
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not setCONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not setCONFIG_EXT3_FS_XATTR=yCONFIG_EXT3_FS_POSIX_ACL=yCONFIG_EXT3_FS_SECURITY=y
# CONFIG_EXT4_FS is not setCONFIG_JBD=y
# CONFIG_JBD_DEBUG is not setCONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not setCONFIG_XFS_FS=m
# CONFIG_XFS_QUOTA is not setCONFIG_XFS_POSIX_ACL=yCONFIG_XFS_RT=yCONFIG_XFS_DEBUG=yCONFIG_GFS2_FS=m
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not setCONFIG_FS_POSIX_ACL=yCONFIG_EXPORTFS=y
# CONFIG_FILE_LOCKING is not setCONFIG_FSNOTIFY=y
# CONFIG_DNOTIFY is not set
# CONFIG_INOTIFY_USER is not setCONFIG_FANOTIFY=yCONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
# CONFIG_QUOTA is not set
# CONFIG_QUOTA_NETLINK_INTERFACE is not setCONFIG_QUOTACTL=yCONFIG_QUOTACTL_COMPAT=y
# CONFIG_AUTOFS4_FS is not setCONFIG_FUSE_FS=m
# CONFIG_CUSE is not set
#
# Caches
#
# CONFIG_FSCACHE is not set
#
# CD-ROM/DVD Filesystems
#
# CONFIG_ISO9660_FS is not set
# CONFIG_UDF_FS is not set
#
# DOS/FAT/NT Filesystems
#
# CONFIG_MSDOS_FS is not set
# CONFIG_VFAT_FS is not setCONFIG_NTFS_FS=mCONFIG_NTFS_DEBUG=y
# CONFIG_NTFS_RW is not set
#
# Pseudo filesystems
#CONFIG_PROC_FS=yCONFIG_PROC_KCORE=yCONFIG_PROC_VMCORE=yCONFIG_PROC_SYSCTL=yCONFIG_PROC_PAGE_MONITOR=yCONFIG_SYSFS=y
# CONFIG_TMPFS is not setCONFIG_HUGETLBFS=yCONFIG_HUGETLB_PAGE=y
# CONFIG_CONFIGFS_FS is not setCONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not setCONFIG_ECRYPT_FS=mCONFIG_HFS_FS=m
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not setCONFIG_BFS_FS=mCONFIG_EFS_FS=mCONFIG_LOGFS=m
# CONFIG_CRAMFS is not setCONFIG_SQUASHFS=mCONFIG_SQUASHFS_XATTR=yCONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
# CONFIG_SQUASHFS_XZ is not setCONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
# CONFIG_SQUASHFS_EMBEDDED is not setCONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3CONFIG_VXFS_FS=mCONFIG_MINIX_FS=m
# CONFIG_OMFS_FS is not setCONFIG_HPFS_FS=m
# CONFIG_QNX4FS_FS is not setCONFIG_QNX6FS_FS=mCONFIG_QNX6FS_DEBUG=y
# CONFIG_ROMFS_FS is not setCONFIG_PSTORE=yCONFIG_SYSV_FS=m
# CONFIG_UFS_FS is not setCONFIG_NETWORK_FILESYSTEMS=yCONFIG_CEPH_FS=mCONFIG_CIFS=mCONFIG_CIFS_STATS=yCONFIG_CIFS_STATS2=yCONFIG_CIFS_WEAK_PW_HASH=yCONFIG_CIFS_UPCALL=y
# CONFIG_CIFS_XATTR is not setCONFIG_CIFS_DEBUG2=y
# CONFIG_CIFS_DFS_UPCALL is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not setCONFIG_NLS=yCONFIG_NLS_DEFAULT="iso8859-1"CONFIG_NLS_CODEPAGE_437=mCONFIG_NLS_CODEPAGE_737=m
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not setCONFIG_NLS_CODEPAGE_852=mCONFIG_NLS_CODEPAGE_855=mCONFIG_NLS_CODEPAGE_857=mCONFIG_NLS_CODEPAGE_860=mCONFIG_NLS_CODEPAGE_861=mCONFIG_NLS_CODEPAGE_862=m
# CONFIG_NLS_CODEPAGE_863 is not setCONFIG_NLS_CODEPAGE_864=m
# CONFIG_NLS_CODEPAGE_865 is not setCONFIG_NLS_CODEPAGE_866=mCONFIG_NLS_CODEPAGE_869=mCONFIG_NLS_CODEPAGE_936=mCONFIG_NLS_CODEPAGE_950=m
# CONFIG_NLS_CODEPAGE_932 is not set
# CONFIG_NLS_CODEPAGE_949 is not setCONFIG_NLS_CODEPAGE_874=mCONFIG_NLS_ISO8859_8=m
# CONFIG_NLS_CODEPAGE_1250 is not setCONFIG_NLS_CODEPAGE_1251=mCONFIG_NLS_ASCII=m
# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not setCONFIG_NLS_ISO8859_4=m
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
# CONFIG_NLS_ISO8859_9 is not setCONFIG_NLS_ISO8859_13=mCONFIG_NLS_ISO8859_14=m
# CONFIG_NLS_ISO8859_15 is not setCONFIG_NLS_KOI8_R=m
# CONFIG_NLS_KOI8_U is not setCONFIG_NLS_UTF8=m
#
# Kernel hacking
#CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_PRINTK_TIME is not set CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
# CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=2048 CONFIG_MAGIC_SYSRQ=y CONFIG_STRIP_ASM_SYMS=y CONFIG_READABLE_ASM=y CONFIG_UNUSED_SYMBOLS=yCONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_KERNEL=yCONFIG_DEBUG_SHIRQ=y
# CONFIG_LOCKUP_DETECTOR is not set
# CONFIG_HARDLOCKUP_DETECTOR is not set CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_ON_OOPS_VALUE=1 CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHED_DEBUG=yCONFIG_SCHEDSTATS=yCONFIG_TIMER_STATS=y CONFIG_DEBUG_OBJECTS=y
# CONFIG_DEBUG_OBJECTS_SELFTEST is not set CONFIG_DEBUG_OBJECTS_FREE=y CONFIG_DEBUG_OBJECTS_TIMERS=y CONFIG_DEBUG_OBJECTS_WORK=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=y CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set CONFIG_DEBUG_KMEMLEAK=y CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=400
# CONFIG_DEBUG_KMEMLEAK_TEST is not set
# CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF is not set # CONFIG_DEBUG_RT_MUTEXES is not set CONFIG_RT_MUTEX_TESTER=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=yCONFIG_PROVE_RCU=y
# CONFIG_PROVE_RCU_REPEATEDLY is not set CONFIG_SPARSE_RCU_POINTER=y CONFIG_LOCKDEP=y
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_LOCKDEP is not set CONFIG_TRACE_IRQFLAGS=y
# CONFIG_DEBUG_ATOMIC_SLEEP is not set CONFIG_DEBUG_LOCKING_API_SELFTESTS=y CONFIG_STACKTRACE=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set CONFIG_DEBUG_VIRTUAL=y
# CONFIG_DEBUG_WRITECOUNT is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
# CONFIG_DEBUG_LIST is not set
# CONFIG_TEST_LIST_SORT is not set
# CONFIG_DEBUG_SG is not set CONFIG_DEBUG_NOTIFIERS=y
# CONFIG_DEBUG_CREDENTIALS is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_TRACE=y CONFIG_BACKTRACE_SELF_TEST=m
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
# CONFIG_LKDTM is not set CONFIG_FAULT_INJECTION=yCONFIG_FAILSLAB=y
# CONFIG_FAIL_PAGE_ALLOC is not set
# CONFIG_FAIL_MAKE_REQUEST is not set CONFIG_FAIL_IO_TIMEOUT=y CONFIG_FAIL_MMC_REQUEST=y
# CONFIG_FAULT_INJECTION_DEBUG_FS is not set CONFIG_LATENCYTOP=y CONFIG_DEBUG_PAGEALLOC=y CONFIG_WANT_PAGE_DEBUG_FLAGS=y CONFIG_PAGE_GUARD=y CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y
# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_TRACING=yCONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=yCONFIG_FTRACE=y
# CONFIG_FUNCTION_TRACER is not set
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
# CONFIG_FTRACE_SYSCALLS is not set CONFIG_TRACE_BRANCH_PROFILING=y
# CONFIG_BRANCH_PROFILE_NONE is not set
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILE_ALL_BRANCHES=y CONFIG_TRACING_BRANCHES=y CONFIG_BRANCH_TRACER=y
# CONFIG_STACK_TRACER is not set
# CONFIG_BLK_DEV_IO_TRACE is not set CONFIG_UPROBE_EVENT=y CONFIG_PROBE_EVENTS=y
# CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set CONFIG_DYNAMIC_DEBUG=y
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_ASYNC_RAID6_TEST is not set
# CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_STRICT_DEVMEM is not set
# CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_X86_PTDUMP is not set
# CONFIG_DEBUG_RODATA is not set
# CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 CONFIG_IO_DELAY_TYPE_NONE=3
# CONFIG_IO_DELAY_0X80 is not set
# CONFIG_IO_DELAY_0XED is not set CONFIG_IO_DELAY_UDELAY=y
# CONFIG_IO_DELAY_NONE is not set CONFIG_DEFAULT_IO_DELAY_TYPE=2 CONFIG_DEBUG_BOOT_PARAMS=y
# CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y
# CONFIG_DEBUG_NMI_SELFTEST is not set
#
# Security options
#CONFIG_KEYS=yCONFIG_ENCRYPTED_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=yCONFIG_SECURITYFS=yCONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_PATH=y
# CONFIG_SECURITY_SELINUX is not set
# CONFIG_SECURITY_SMACK is not set CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 CONFIG_SECURITY_YAMA=yCONFIG_INTEGRITY=y
# CONFIG_INTEGRITY_SIGNATURE is not set
# CONFIG_IMA is not setCONFIG_EVM=yCONFIG_DEFAULT_SECURITY_TOMOYO=y
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
# CONFIG_DEFAULT_SECURITY_YAMA is not set
# CONFIG_DEFAULT_SECURITY_DAC is not set CONFIG_DEFAULT_SECURITY="tomoyo" CONFIG_XOR_BLOCKS=mCONFIG_ASYNC_CORE=mCONFIG_ASYNC_MEMCPY=mCONFIG_ASYNC_XOR=mCONFIG_ASYNC_PQ=mCONFIG_ASYNC_RAID6_RECOV=mCONFIG_CRYPTO=y
#
# Crypto core or helper
#CONFIG_CRYPTO_FIPS=yCONFIG_CRYPTO_ALGAPI=yCONFIG_CRYPTO_ALGAPI2=yCONFIG_CRYPTO_AEAD=mCONFIG_CRYPTO_AEAD2=yCONFIG_CRYPTO_BLKCIPHER=yCONFIG_CRYPTO_BLKCIPHER2=yCONFIG_CRYPTO_HASH=yCONFIG_CRYPTO_HASH2=yCONFIG_CRYPTO_RNG=yCONFIG_CRYPTO_RNG2=yCONFIG_CRYPTO_PCOMP2=yCONFIG_CRYPTO_MANAGER=yCONFIG_CRYPTO_MANAGER2=yCONFIG_CRYPTO_USER=m
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not setCONFIG_CRYPTO_GF128MUL=mCONFIG_CRYPTO_NULL=mCONFIG_CRYPTO_WORKQUEUE=yCONFIG_CRYPTO_CRYPTD=mCONFIG_CRYPTO_AUTHENC=mCONFIG_CRYPTO_TEST=m
#
# Authenticated Encryption with Associated Data
#
# CONFIG_CRYPTO_CCM is not set
# CONFIG_CRYPTO_GCM is not set
# CONFIG_CRYPTO_SEQIV is not set
#
# Block modes
#CONFIG_CRYPTO_CBC=y
# CONFIG_CRYPTO_CTR is not set
# CONFIG_CRYPTO_CTS is not setCONFIG_CRYPTO_ECB=mCONFIG_CRYPTO_LRW=m
# CONFIG_CRYPTO_PCBC is not setCONFIG_CRYPTO_XTS=m
#
# Hash modes
#CONFIG_CRYPTO_HMAC=yCONFIG_CRYPTO_XCBC=m
# CONFIG_CRYPTO_VMAC is not set
#
# Digest
#CONFIG_CRYPTO_CRC32C=mCONFIG_CRYPTO_CRC32C_INTEL=mCONFIG_CRYPTO_GHASH=mCONFIG_CRYPTO_MD4=mCONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_MICHAEL_MIC is not setCONFIG_CRYPTO_RMD128=m
# CONFIG_CRYPTO_RMD160 is not setCONFIG_CRYPTO_RMD256=m
# CONFIG_CRYPTO_RMD320 is not setCONFIG_CRYPTO_SHA1=yCONFIG_CRYPTO_SHA1_SSSE3=mCONFIG_CRYPTO_SHA256=yCONFIG_CRYPTO_SHA512=m
# CONFIG_CRYPTO_TGR192 is not setCONFIG_CRYPTO_WP512=m
# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
#
# Ciphers
#CONFIG_CRYPTO_AES=y
# CONFIG_CRYPTO_AES_X86_64 is not set
# CONFIG_CRYPTO_AES_NI_INTEL is not setCONFIG_CRYPTO_ANUBIS=mCONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_BLOWFISH_X86_64 is not setCONFIG_CRYPTO_CAMELLIA=m
# CONFIG_CRYPTO_CAMELLIA_X86_64 is not setCONFIG_CRYPTO_CAST5=mCONFIG_CRYPTO_CAST6=mCONFIG_CRYPTO_DES=mCONFIG_CRYPTO_FCRYPT=mCONFIG_CRYPTO_KHAZAD=m
# CONFIG_CRYPTO_SALSA20 is not setCONFIG_CRYPTO_SALSA20_X86_64=m
# CONFIG_CRYPTO_SEED is not setCONFIG_CRYPTO_SERPENT=mCONFIG_CRYPTO_SERPENT_SSE2_X86_64=mCONFIG_CRYPTO_TEA=mCONFIG_CRYPTO_TWOFISH=mCONFIG_CRYPTO_TWOFISH_COMMON=mCONFIG_CRYPTO_TWOFISH_X86_64=mCONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
#
# Compression
#
# CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_ZLIB is not setCONFIG_CRYPTO_LZO=m
#
# Random Number Generation
#CONFIG_CRYPTO_ANSI_CPRNG=mCONFIG_CRYPTO_USER_API=mCONFIG_CRYPTO_USER_API_HASH=m
# CONFIG_CRYPTO_USER_API_SKCIPHER is not setCONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_PADLOCK is not setCONFIG_HAVE_KVM=yCONFIG_HAVE_KVM_IRQCHIP=yCONFIG_HAVE_KVM_EVENTFD=yCONFIG_KVM_APIC_ARCHITECTURE=yCONFIG_KVM_MMIO=yCONFIG_KVM_ASYNC_PF=yCONFIG_VIRTUALIZATION=yCONFIG_KVM=m
# CONFIG_KVM_INTEL is not set
# CONFIG_KVM_AMD is not set
# CONFIG_KVM_MMU_AUDIT is not set
# CONFIG_VHOST_NET is not setCONFIG_BINARY_PRINTF=y
#
# Library routines
#CONFIG_RAID6_PQ=mCONFIG_BITREVERSE=yCONFIG_GENERIC_FIND_FIRST_BIT=yCONFIG_GENERIC_PCI_IOMAP=yCONFIG_GENERIC_IOMAP=yCONFIG_GENERIC_IO=yCONFIG_CRC_CCITT=mCONFIG_CRC16=mCONFIG_CRC_T10DIF=yCONFIG_CRC_ITU_T=mCONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
# CONFIG_CRC32_SLICEBY8 is not set
# CONFIG_CRC32_SLICEBY4 is not set
# CONFIG_CRC32_SARWATE is not setCONFIG_CRC32_BIT=yCONFIG_CRC7=mCONFIG_LIBCRC32C=mCONFIG_CRC8=mCONFIG_ZLIB_INFLATE=mCONFIG_ZLIB_DEFLATE=mCONFIG_LZO_COMPRESS=yCONFIG_LZO_DECOMPRESS=y
# CONFIG_XZ_DEC is not set
# CONFIG_XZ_DEC_BCJ is not setCONFIG_GENERIC_ALLOCATOR=yCONFIG_BTREE=yCONFIG_HAS_IOMEM=yCONFIG_HAS_IOPORT=yCONFIG_HAS_DMA=yCONFIG_CHECK_SIGNATURE=yCONFIG_DQL=yCONFIG_NLATTR=yCONFIG_AVERAGE=y
# CONFIG_CORDIC is not set
PATCH 1/3 irq_remap: fix compiler warning with !CONFIG_IRQ_REMAP
Fix the below compiler warning:arch/x86/include/asm/irq_remapping.h:72:19: warning: ‘struct IO_APIC_route_entry’ declared inside parameter list [enabled by default]
--- arch/x86/include/asm/irq_remapping.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
arch/x86/include/asm/irq_remapping.h +2 -4
@@ -22,11 +22,9 @@#ifndef __X86_IRQ_REMAPPING_H#define __X86_IRQ_REMAPPING_H -#ifdef CONFIG_IRQ_REMAP +#include <asm/io_apic.h> -struct IO_APIC_route_entry ; -struct io_apic_irq_attr ; -struct pci_dev ; +#ifdef CONFIG_IRQ_REMAP extern int irq_remapping_enabled;
Signature · 1 line
1.7.6.5
PATCH 2/3 irq_remap: fix the UP build failure
Fix the below UP build failure with CONFIG_IRQ_REMAP enabled.
drivers/iommu/intel_irq_remapping.c:955:19: error: ‘struct irq_data’ has no member named ‘affinity’
--- drivers/iommu/intel_irq_remapping.c | 4 ++++ drivers/iommu/irq_remapping.c | 2 ++ drivers/iommu/irq_remapping.h | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-)
drivers/iommu/intel_irq_remapping.c +4 -0
@@ -902,6 +902,7 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } +#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -955,6 +956,7 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } +#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1056,7 +1058,9 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, +#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, +#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -0
@@ -111,6 +111,7 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } +#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -119,6 +120,7 @@ int set_remapped_irq_affinity(struct irq_data *data, const struct cpumask *mask, return remap_ops->set_affinity(data, mask, force); } +#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +2 -0
@@ -59,9 +59,11 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); +#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); +#endif /* Free an IRQ */ int (*free_irq)(int );
Signature · 1 line
1.7.6.5
PATCH 3/3 irq_remap: fix the 'sub_handle' uninitialized warning
In reply to Suresh SiddhaFix the uninitialized warning:
drivers/iommu/intel_irq_remapping.c:986:12: warning: ‘sub_handle’ may be used uninitialized in this function [-Wuninitialized]
--- drivers/iommu/intel_irq_remapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/iommu/intel_irq_remapping.c +1 -1
@@ -964,7 +964,7 @@ static void intel_compose_msi_msg(struct pci_dev *pdev, {struct irq_cfg *cfg;struct irte irte; -u16 sub_handle; +u16 sub_handle =0 ;int ir_index; cfg =irq_get_chip_data (irq);
Signature · 1 line
1.7.6.5
Re: [PATCH 2/3] irq_remap: fix the UP build failure
In reply to Suresh SiddhaQuoted 3 lines · Suresh Siddha
Fix the below UP build failure with
CONFIG_IRQ_REMAPenabled.
drivers/iommu/intel_irq_remapping.c:955:19: error: ‘struct irq_data’ has no member named ‘affinity’
hm:
Review
Quoted 9 lines
+++
b/drivers/iommu/intel_irq_remapping.c(quoted diff) +8
-0+#ifdef CONFIG_SMP +#endif +#ifdef CONFIG_SMP +#endif +#ifdef CONFIG_SMP +#endif +#ifdef CONFIG_SMP +#endif
Adding this many #ifdefs is a bit sad. Could we not make the UP side have the (supposedly zero length!) affinity cpumask instead, or so, and make sure that the SMP functions compile to something sensible on UP?
Thanks,
Ingo
Re: [PATCH 3/3] irq_remap: fix the 'sub_handle' uninitialized warning
In reply to Suresh Siddhaanother problem is that drivers/iommu/intel_irq_remapping.c is supplied with comments rather poorly - I have to page down almost 300 lines to see the first substantial comment! Copyright notices would be nice as well.
So lets do a better job and document this thing a bit better. Please also align structure definitions vertically, like we typically to do in new code.
The file names should probably also be standardized (but that should come via a Git space pull request, using git mv and such). What we have currently is pretty random: 'dmar.c' should probably be dma_remap.c, and *irq_remapping.c should probably be *irq_remap.c.
Thanks,
Ingo
[tip:core/iommu] irq_remap: Fix compiler warning with CONFIG_IRQ_REMAP=y
In reply to Suresh SiddhaCommit-ID: 399988eea194a8453e283fdd2da968d1fd39a7cf Gitweb: http://git.kernel.org/tip/399988eea194a8453e283fdd2da968d1fd39a7cf Author: Suresh Siddha <[email protected]> AuthorDate: Tue, 8 May 2012 00:08:52 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 8 May 2012 11:17:29 +0200
irq_remap: Fix compiler warning with CONFIG_IRQ_REMAP=y
Fix the below compiler warning:
arch/x86/include/asm/irq_remapping.h:72:19: warning: ‘struct IO_APIC_route_entry’ declared inside parameter list [enabled by default]
--- arch/x86/include/asm/irq_remapping.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
arch/x86/include/asm/irq_remapping.h +2 -4
@@ -22,11 +22,9 @@#ifndef __X86_IRQ_REMAPPING_H#define __X86_IRQ_REMAPPING_H -#ifdef CONFIG_IRQ_REMAP +#include <asm/io_apic.h> -struct IO_APIC_route_entry ; -struct io_apic_irq_attr ; -struct pci_dev ; +#ifdef CONFIG_IRQ_REMAP extern int irq_remapping_enabled;
[tip:core/iommu] irq_remap: Fix UP build failure
In reply to Suresh SiddhaCommit-ID: 82b481e80d8a17720b5805393684a95184cfb6bb Gitweb: http://git.kernel.org/tip/82b481e80d8a17720b5805393684a95184cfb6bb Author: Suresh Siddha <[email protected]> AuthorDate: Tue, 8 May 2012 00:08:53 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 8 May 2012 11:17:30 +0200
irq_remap: Fix UP build failure
Fix the below UP build failure with CONFIG_IRQ_REMAP enabled.
drivers/iommu/intel_irq_remapping.c:955:19: error: ‘struct irq_data’ has no member named ‘affinity’
--- drivers/iommu/intel_irq_remapping.c | 4 ++++ drivers/iommu/irq_remapping.c | 2 ++ drivers/iommu/irq_remapping.h | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-)
drivers/iommu/intel_irq_remapping.c +4 -0
@@ -902,6 +902,7 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } +#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -955,6 +956,7 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } +#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1056,7 +1058,9 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, +#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, +#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -0
@@ -111,6 +111,7 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } +#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -119,6 +120,7 @@ int set_remapped_irq_affinity(struct irq_data *data, const struct cpumask *mask, return remap_ops->set_affinity(data, mask, force); } +#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +2 -0
@@ -59,9 +59,11 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); +#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); +#endif /* Free an IRQ */ int (*free_irq)(int );
[tip:core/iommu] irq_remap: Fix the 'sub_handle' uninitialized warning
In reply to Suresh SiddhaCommit-ID: c558df4a01a9ec7b02303aba808d1e5044822add Gitweb: http://git.kernel.org/tip/c558df4a01a9ec7b02303aba808d1e5044822add Author: Suresh Siddha <[email protected]> AuthorDate: Tue, 8 May 2012 00:08:54 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 8 May 2012 11:17:30 +0200
irq_remap: Fix the 'sub_handle' uninitialized warning
Fix this uninitialized variable warning:
drivers/iommu/intel_irq_remapping.c:986:12: warning: ‘sub_handle’ may be used uninitialized in this function [-Wuninitialized]
GCC is wrong, help it out.
--- drivers/iommu/intel_irq_remapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/iommu/intel_irq_remapping.c +1 -1
@@ -964,7 +964,7 @@ static void intel_compose_msi_msg(struct pci_dev *pdev, {struct irq_cfg *cfg;struct irte irte; -u16 sub_handle; +u16 sub_handle =0 ;int ir_index; cfg =irq_get_chip_data (irq);
Re: [PATCH 2/3] irq_remap: fix the UP build failure
In reply to Ingo MolnarQuoted 8 lines · Ingo Molnar
Quoted 3 lines · Suresh Siddha
Fix the below UP build failure with
CONFIG_IRQ_REMAPenabled.
drivers/iommu/intel_irq_remapping.c:955:19: error: ‘struct irq_data’ has no member named ‘affinity’hm:
Quoted 15 lines
Review
Quoted 9 lines
+++
b/drivers/iommu/intel_irq_remapping.c(quoted diff) +8
-0+#ifdef CONFIG_SMP +#endif +#ifdef CONFIG_SMP +#endif +#ifdef CONFIG_SMP +#endif +#ifdef CONFIG_SMP +#endifAdding this many #ifdefs is a bit sad. Could we not make the UP side have the (supposedly zero length!) affinity cpumask instead, or so, and make sure that the SMP functions compile to something sensible on UP?
How about using config_enabled() to clean this up? Something like the appended?
I first tried config_enabled(SMP) with out closely looking at the macro definition and didn't work. I had to use config_enabled(CONFIG_SMP) to really get this working. So in the appended patch I fixed config_enabled macro to accept config_enabled(SMP). If this all sounds ok, then I can split the appended patch into multiple patches.
thanks.
---
From: Suresh Siddha <[email protected]>
Subject: change config_enabled() and use it to cleanup #ifdef CONFIG_SMP
change config_enabled() to accept config_enabled(SMP) instead of config_enabled(CONFIG_SMP).
Use this to cleanup the irq_chip smp affinity routines in io_apic and irq_remapping subsystems.
--- arch/x86/kernel/apic/io_apic.c | 173 +++++++++++++++++------------------ drivers/iommu/intel_irq_remapping.c | 7 +- drivers/iommu/irq_remapping.c | 5 +- drivers/iommu/irq_remapping.h | 2 - include/linux/irq.h | 2 - include/linux/kconfig.h | 15 ++-- 6 files changed, 97 insertions(+), 107 deletions(-)
arch/x86/kernel/apic/io_apic.c +84 -89
@@ -2221,71 +2221,6 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) -{ -int apic, pin; -struct irq_pin_list *entry; -u8 vector = cfg->vector; - -for_each_irq_pin (entry, cfg->irq_2_pin) { -unsigned int reg; - - apic = entry->apic; - pin = entry->pin; -/* -* With interrupt-remapping, destination information comes -* from interrupt-remapping table entry. -*/ -if (!irq_remapped (cfg)) -io_apic_write (apic,0x11 + pin*2 , dest); - reg =io_apic_read (apic,0x10 + pin*2 ); - reg &= ~IO_APIC_REDIR_VECTOR_MASK ; - reg |= vector; -io_apic_modify (apic,0x10 + pin*2 , reg); - } -} - -/* -* Either sets data->affinity to a valid value, and returns -* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and -* leaves data->affinity untouched. -*/ -int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -unsigned int *dest_id) -{ -struct irq_cfg *cfg = data->chip_data; - -if (!cpumask_intersects (mask, cpu_online_mask)) -return -1 ; - -if (assign_irq_vector (data->irq, data->chip_data, mask)) -return -1 ; - -cpumask_copy (data->affinity, mask); - - *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); -return 0 ; -} - -static int -ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -bool force) -{ -unsigned int dest, irq = data->irq; -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&ioapic_lock, flags); - ret =__ioapic_set_affinity (data, mask, &dest); -if (!ret) { -/* Only the high 8 bits are valid. */ - dest =SET_APIC_LOGICAL_ID (dest); -__target_IO_APIC_irq (irq, dest, data->chip_data); - } -raw_spin_unlock_irqrestore (&ioapic_lock, flags); -return ret; -} - asmlinkage void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;
@@ -2373,6 +2308,78 @@ void irq_force_complete_move(int irq)static inline void irq_complete_move (struct irq_cfg *cfg) { }#endif +static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) +{ +int apic, pin; +struct irq_pin_list *entry; +u8 vector = cfg->vector; + +for_each_irq_pin (entry, cfg->irq_2_pin) { +unsigned int reg; + + apic = entry->apic; + pin = entry->pin; +/* +* With interrupt-remapping, destination information comes +* from interrupt-remapping table entry. +*/ +if (!irq_remapped (cfg)) +io_apic_write (apic,0x11 + pin*2 , dest); + reg =io_apic_read (apic,0x10 + pin*2 ); + reg &= ~IO_APIC_REDIR_VECTOR_MASK ; + reg |= vector; +io_apic_modify (apic,0x10 + pin*2 , reg); + } +} + +/* +* Either sets data->affinity to a valid value, and returns +* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and +* leaves data->affinity untouched. +*/ +int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +unsigned int *dest_id) +{ +struct irq_cfg *cfg = data->chip_data; + +if (!config_enabled (SMP )) +return -1 ; + +if (!cpumask_intersects (mask, cpu_online_mask)) +return -1 ; + +if (assign_irq_vector (data->irq, data->chip_data, mask)) +return -1 ; + +cpumask_copy (data->affinity, mask); + + *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); +return 0 ; +} + +static int +ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +bool force) +{ +unsigned int dest, irq = data->irq; +unsigned long flags; +int ret; + +if (!config_enabled (SMP )) +return -1 ; + +raw_spin_lock_irqsave (&ioapic_lock, flags); + ret =__ioapic_set_affinity (data, mask, &dest); +if (!ret) { +/* Only the high 8 bits are valid. */ + dest =SET_APIC_LOGICAL_ID (dest); +__target_IO_APIC_irq (irq, dest, data->chip_data); + } +raw_spin_unlock_irqrestore (&ioapic_lock, flags); +return ret; +} + +static void ack_apic_edge (struct irq_data *data) {irq_complete_move (data->chip_data);
@@ -2552,9 +2559,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) chip->irq_ack = ir_ack_apic_edge; chip->irq_eoi = ir_ack_apic_level; -#ifdef CONFIG_SMP chip->irq_set_affinity = set_remapped_irq_affinity; -#endif }#endif /* CONFIG_IRQ_REMAP */
@@ -2565,9 +2570,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_unmask = unmask_ioapic_irq, .irq_ack = ack_apic_edge, .irq_eoi = ack_apic_level, -#ifdef CONFIG_SMP .irq_set_affinity = ioapic_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3083,7 +3086,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,return err; } -#ifdef CONFIG_SMP static int msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3091,6 +3093,9 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct msi_msg msg;unsigned int dest; +if (!config_enabled (SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3105,7 +3110,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return 0 ; } -#endif /* CONFIG_SMP */ /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -3116,9 +3120,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3203,7 +3205,6 @@ void native_teardown_msi_irq(unsigned int irq) }#ifdef CONFIG_DMAR_TABLE -#ifdef CONFIG_SMP static int dmar_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force)
@@ -3212,6 +3213,9 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct msi_msg msg; +if (!config_enabled (SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3228,16 +3232,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,return 0 ; } -#endif /* CONFIG_SMP */ -static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .irq_unmask = dmar_msi_unmask, .irq_mask = dmar_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = dmar_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3258,7 +3258,6 @@ int arch_setup_dmar_msi(unsigned int irq)#ifdef CONFIG_HPET_TIMER -#ifdef CONFIG_SMPstatic int hpet_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3266,6 +3265,9 @@ static int hpet_msi_set_affinity(struct irq_data *data,struct msi_msg msg;unsigned int dest; +if (!config_enabled (SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3281,16 +3283,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,return 0 ; } -#endif /* CONFIG_SMP */ -static struct irq_chip hpet_msi_type = { .name ="HPET_MSI" , .irq_unmask = hpet_msi_unmask, .irq_mask = hpet_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = hpet_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3325,8 +3323,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)*/ #ifdef CONFIG_HT_IRQ -#ifdef CONFIG_SMP -static void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) {struct ht_irq_msg msg;
@@ -3347,6 +3343,9 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct irq_cfg *cfg = data->chip_data;unsigned int dest; +if (!config_enabled (SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3354,16 +3353,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return 0 ; } -#endif -static struct irq_chip ht_irq_chip = { .name ="PCI-HT" , .irq_mask = mask_ht_irq, .irq_unmask = unmask_ht_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = ht_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
drivers/iommu/intel_irq_remapping.c +3 -4
@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } -#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -925,6 +924,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct irte irte; +if (!config_enabled (CONFIG_SMP )) +return -EINVAL ; +if (!cpumask_intersects (mask, cpu_online_mask))return -EINVAL ;
@@ -956,7 +958,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } -#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1058,9 +1059,7 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, -#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, -#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -3
@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } -#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -if (!remap_ops || !remap_ops->set_affinity) +if (!config_enabled (CONFIG_SMP ) || !remap_ops || + !remap_ops->set_affinity)return 0 ;return remap_ops->set_affinity (data, mask, force); } -#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +0 -2
@@ -59,11 +59,9 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); -#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); -#endif /* Free an IRQ */ int (*free_irq)(int );
include/linux/irq.h +0 -2
@@ -150,9 +150,7 @@ struct irq_data {void *handler_data;void *chip_data;struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif };/*
include/linux/kconfig.h +8 -7
@@ -17,10 +17,11 @@* the last step cherry picks the 2nd arg, we get a zero. */ #define __ARG_PLACEHOLDER_1 0, -#define config_enabled (cfg) _config_enabled(cfg) -#define _config_enabled (value) __config_enabled(__ARG_PLACEHOLDER_##value) -#define __config_enabled (arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0) -#define ___config_enabled (__ignored, val, ...) val +#define config_enabled (cfg) _config_enabled(CONFIG_##cfg) +#define _config_enabled (cfg) __config_enabled(cfg) +#define __config_enabled (value) ___config_enabled(__ARG_PLACEHOLDER_##value) +#define ___config_enabled (arg1_or_junk) ____config_enabled(arg1_or_junk 1, 0) +#define ____config_enabled (__ignored, val, ...) val/* * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
@@ -28,19 +29,19 @@* */ #define IS_ENABLED (option) \ - (config_enabled(option) || config_enabled(option##_MODULE)) + (_config_enabled(option) || _config_enabled(option##_MODULE))/* * IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0 * otherwise. For boolean options, this is equivalent to * IS_ENABLED(CONFIG_FOO). */ -#define IS_BUILTIN (option) config_enabled(option) +#define IS_BUILTIN (option) _config_enabled(option)/* * IS_MODULE(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'm', 0 * otherwise. */ -#define IS_MODULE (option) config_enabled(option##_MODULE) +#define IS_MODULE (option) _config_enabled(option##_MODULE)#endif /* __LINUX_KCONFIG_H */
Re: [PATCH 2/3] irq_remap: fix the UP build failure
Quoted 28 lines · Suresh Siddha
Quoted 8 lines · Ingo Molnar
Quoted 3 lines · Suresh Siddha
Fix the below UP build failure with
CONFIG_IRQ_REMAPenabled.
drivers/iommu/intel_irq_remapping.c:955:19: error: ‘struct irq_data’ has no member named ‘affinity’hm:
Quoted 15 lines
Review
Quoted 9 lines
+++
b/drivers/iommu/intel_irq_remapping.c(quoted diff) +8
-0+#ifdef CONFIG_SMP +#endif +#ifdef CONFIG_SMP +#endif +#ifdef CONFIG_SMP +#endif +#ifdef CONFIG_SMP +#endifAdding this many #ifdefs is a bit sad. Could we not make the UP side have the (supposedly zero length!) affinity cpumask instead, or so, and make sure that the SMP functions compile to something sensible on UP?
How about using
config_enabled()to clean this up? Something like the appended?
Quoted 6 lines
I first tried
config_enabled(SMP)with out closely looking at the macro definition and didn't work. I had to useconfig_enabled(CONFIG_SMP)to really get this working. So in the appended patch I fixedconfig_enabledmacro to acceptconfig_enabled(SMP). If this all sounds ok, then I can split the appended patch into multiple patches.
Looks a lot cleaner!
Please split out the config_enabled() change into a separate patch and Cc: Linus on the resend.
I like your idea of allowing config_enabled(SMP) as well, there's no reason to say 'config' twice. It's too easy to get this wrong and AFAICS there's no build error if we are using a non-existent config flag, right?
Thanks,
Ingo
PATCH 1/2 kconfig: change config_enabled() to accept X instead of CONFIG_X
change config_enabled() to use it as config_enabled(SMP) instead of config_enabled(CONFIG_SMP).
--- include/linux/kconfig.h | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
include/linux/kconfig.h +8 -7
@@ -17,10 +17,11 @@* the last step cherry picks the 2nd arg, we get a zero. */ #define __ARG_PLACEHOLDER_1 0, -#define config_enabled (cfg) _config_enabled(cfg) -#define _config_enabled (value) __config_enabled(__ARG_PLACEHOLDER_##value) -#define __config_enabled (arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0) -#define ___config_enabled (__ignored, val, ...) val +#define config_enabled (cfg) _config_enabled(CONFIG_##cfg) +#define _config_enabled (cfg) __config_enabled(cfg) +#define __config_enabled (value) ___config_enabled(__ARG_PLACEHOLDER_##value) +#define ___config_enabled (arg1_or_junk) ____config_enabled(arg1_or_junk 1, 0) +#define ____config_enabled (__ignored, val, ...) val/* * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
@@ -28,19 +29,19 @@* */ #define IS_ENABLED (option) \ - (config_enabled(option) || config_enabled(option##_MODULE)) + (_config_enabled(option) || _config_enabled(option##_MODULE))/* * IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0 * otherwise. For boolean options, this is equivalent to * IS_ENABLED(CONFIG_FOO). */ -#define IS_BUILTIN (option) config_enabled(option) +#define IS_BUILTIN (option) _config_enabled(option)/* * IS_MODULE(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'm', 0 * otherwise. */ -#define IS_MODULE (option) config_enabled(option##_MODULE) +#define IS_MODULE (option) _config_enabled(option##_MODULE)#endif /* __LINUX_KCONFIG_H */
Signature · 1 line
1.7.6.5
PATCH 2/2 irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
Use config_enabled(SMP) checks for cleaning up the ifdef CONFIG_SMP around irq_set_affinity routines in io_apic and irq_remapping subsystems.
--- arch/x86/kernel/apic/io_apic.c | 173 +++++++++++++++++------------------ drivers/iommu/intel_irq_remapping.c | 7 +- drivers/iommu/irq_remapping.c | 5 +- drivers/iommu/irq_remapping.h | 2 - include/linux/irq.h | 2 - 5 files changed, 89 insertions(+), 100 deletions(-)
arch/x86/kernel/apic/io_apic.c +84 -89
@@ -2221,71 +2221,6 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) -{ -int apic, pin; -struct irq_pin_list *entry; -u8 vector = cfg->vector; - -for_each_irq_pin (entry, cfg->irq_2_pin) { -unsigned int reg; - - apic = entry->apic; - pin = entry->pin; -/* -* With interrupt-remapping, destination information comes -* from interrupt-remapping table entry. -*/ -if (!irq_remapped (cfg)) -io_apic_write (apic,0x11 + pin*2 , dest); - reg =io_apic_read (apic,0x10 + pin*2 ); - reg &= ~IO_APIC_REDIR_VECTOR_MASK ; - reg |= vector; -io_apic_modify (apic,0x10 + pin*2 , reg); - } -} - -/* -* Either sets data->affinity to a valid value, and returns -* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and -* leaves data->affinity untouched. -*/ -int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -unsigned int *dest_id) -{ -struct irq_cfg *cfg = data->chip_data; - -if (!cpumask_intersects (mask, cpu_online_mask)) -return -1 ; - -if (assign_irq_vector (data->irq, data->chip_data, mask)) -return -1 ; - -cpumask_copy (data->affinity, mask); - - *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); -return 0 ; -} - -static int -ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -bool force) -{ -unsigned int dest, irq = data->irq; -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&ioapic_lock, flags); - ret =__ioapic_set_affinity (data, mask, &dest); -if (!ret) { -/* Only the high 8 bits are valid. */ - dest =SET_APIC_LOGICAL_ID (dest); -__target_IO_APIC_irq (irq, dest, data->chip_data); - } -raw_spin_unlock_irqrestore (&ioapic_lock, flags); -return ret; -} - asmlinkage void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;
@@ -2373,6 +2308,78 @@ void irq_force_complete_move(int irq)static inline void irq_complete_move (struct irq_cfg *cfg) { }#endif +static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) +{ +int apic, pin; +struct irq_pin_list *entry; +u8 vector = cfg->vector; + +for_each_irq_pin (entry, cfg->irq_2_pin) { +unsigned int reg; + + apic = entry->apic; + pin = entry->pin; +/* +* With interrupt-remapping, destination information comes +* from interrupt-remapping table entry. +*/ +if (!irq_remapped (cfg)) +io_apic_write (apic,0x11 + pin*2 , dest); + reg =io_apic_read (apic,0x10 + pin*2 ); + reg &= ~IO_APIC_REDIR_VECTOR_MASK ; + reg |= vector; +io_apic_modify (apic,0x10 + pin*2 , reg); + } +} + +/* +* Either sets data->affinity to a valid value, and returns +* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and +* leaves data->affinity untouched. +*/ +int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +unsigned int *dest_id) +{ +struct irq_cfg *cfg = data->chip_data; + +if (!config_enabled (SMP )) +return -1 ; + +if (!cpumask_intersects (mask, cpu_online_mask)) +return -1 ; + +if (assign_irq_vector (data->irq, data->chip_data, mask)) +return -1 ; + +cpumask_copy (data->affinity, mask); + + *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); +return 0 ; +} + +static int +ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +bool force) +{ +unsigned int dest, irq = data->irq; +unsigned long flags; +int ret; + +if (!config_enabled (SMP )) +return -1 ; + +raw_spin_lock_irqsave (&ioapic_lock, flags); + ret =__ioapic_set_affinity (data, mask, &dest); +if (!ret) { +/* Only the high 8 bits are valid. */ + dest =SET_APIC_LOGICAL_ID (dest); +__target_IO_APIC_irq (irq, dest, data->chip_data); + } +raw_spin_unlock_irqrestore (&ioapic_lock, flags); +return ret; +} + +static void ack_apic_edge (struct irq_data *data) {irq_complete_move (data->chip_data);
@@ -2552,9 +2559,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) chip->irq_ack = ir_ack_apic_edge; chip->irq_eoi = ir_ack_apic_level; -#ifdef CONFIG_SMP chip->irq_set_affinity = set_remapped_irq_affinity; -#endif }#endif /* CONFIG_IRQ_REMAP */
@@ -2565,9 +2570,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_unmask = unmask_ioapic_irq, .irq_ack = ack_apic_edge, .irq_eoi = ack_apic_level, -#ifdef CONFIG_SMP .irq_set_affinity = ioapic_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3083,7 +3086,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,return err; } -#ifdef CONFIG_SMP static int msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3091,6 +3093,9 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct msi_msg msg;unsigned int dest; +if (!config_enabled (SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3105,7 +3110,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return 0 ; } -#endif /* CONFIG_SMP */ /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -3116,9 +3120,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3203,7 +3205,6 @@ void native_teardown_msi_irq(unsigned int irq) }#ifdef CONFIG_DMAR_TABLE -#ifdef CONFIG_SMP static int dmar_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force)
@@ -3212,6 +3213,9 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct msi_msg msg; +if (!config_enabled (SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3228,16 +3232,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,return 0 ; } -#endif /* CONFIG_SMP */ -static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .irq_unmask = dmar_msi_unmask, .irq_mask = dmar_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = dmar_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3258,7 +3258,6 @@ int arch_setup_dmar_msi(unsigned int irq)#ifdef CONFIG_HPET_TIMER -#ifdef CONFIG_SMPstatic int hpet_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3266,6 +3265,9 @@ static int hpet_msi_set_affinity(struct irq_data *data,struct msi_msg msg;unsigned int dest; +if (!config_enabled (SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3281,16 +3283,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,return 0 ; } -#endif /* CONFIG_SMP */ -static struct irq_chip hpet_msi_type = { .name ="HPET_MSI" , .irq_unmask = hpet_msi_unmask, .irq_mask = hpet_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = hpet_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3325,8 +3323,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)*/ #ifdef CONFIG_HT_IRQ -#ifdef CONFIG_SMP -static void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) {struct ht_irq_msg msg;
@@ -3347,6 +3343,9 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct irq_cfg *cfg = data->chip_data;unsigned int dest; +if (!config_enabled (SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3354,16 +3353,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return 0 ; } -#endif -static struct irq_chip ht_irq_chip = { .name ="PCI-HT" , .irq_mask = mask_ht_irq, .irq_unmask = unmask_ht_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = ht_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
drivers/iommu/intel_irq_remapping.c +3 -4
@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } -#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -925,6 +924,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct irte irte; +if (!config_enabled (CONFIG_SMP )) +return -EINVAL ; +if (!cpumask_intersects (mask, cpu_online_mask))return -EINVAL ;
@@ -956,7 +958,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } -#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1058,9 +1059,7 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, -#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, -#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -3
@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } -#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -if (!remap_ops || !remap_ops->set_affinity) +if (!config_enabled (CONFIG_SMP ) || !remap_ops || + !remap_ops->set_affinity)return 0 ;return remap_ops->set_affinity (data, mask, force); } -#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +0 -2
@@ -59,11 +59,9 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); -#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); -#endif /* Free an IRQ */ int (*free_irq)(int );
include/linux/irq.h +0 -2
@@ -150,9 +150,7 @@ struct irq_data {void *handler_data;void *chip_data;struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif };/*
Signature · 1 line
1.7.6.5
Re: [PATCH 1/2] kconfig: change config_enabled() to accept X instead of CONFIG_X
In reply to Suresh SiddhaQuoted 2 lines · Suresh Siddha
change
config_enabled()to use it asconfig_enabled(SMP)instead ofconfig_enabled(CONFIG_SMP).
You are breaking all existing users.
And CONFIG_ was included to allow better grepability.
If you insist on having a CONFIG less variant
introduce a new variant for this.
Sam
Re: [PATCH 1/2] kconfig: change config_enabled() to accept X instead of CONFIG_X
In reply to Suresh SiddhaQuoted 2 lines · Suresh Siddha
change
config_enabled()to use it asconfig_enabled(SMP)instead ofconfig_enabled(CONFIG_SMP).
People hated this when I suggested it, and I kind of understand why.
It breaks greppability of CONFIG_xyz.
So I think I'd have to NAK this.
Linus
Re: [PATCH 1/2] kconfig: change config_enabled() to accept X instead of CONFIG_X
In reply to Sam RavnborgQuoted 5 lines · Sam Ravnborg
Quoted 2 lines · Suresh Siddha
change
config_enabled()to use it asconfig_enabled(SMP)instead ofconfig_enabled(CONFIG_SMP).You are breaking all existing users.
I checked the mainline and there were no users as far as I checked. Referring to some upcoming code? Just curious to see why I missed.
Quoted 1 line
And
CONFIG_was included to allow better grepability.
Ok.
Quoted 2 lines
If you insist on having a CONFIG less variant
introduce a new variant for this.
I will drop this for now.
thanks,
suresh
Re: [PATCH 2/2] irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
In reply to Suresh SiddhaQuoted 3 lines · Suresh Siddha
Use
config_enabled(SMP)checks for cleaning up the ifdefCONFIG_SMParoundirq_set_affinityroutines inio_apicandirq_remappingsubsystems.
Switched to IS_BUILTIN() instead. Thanks.
---
From: Suresh Siddha <[email protected]>
Subject: irq: use IS_BUILTIN(CONFIG_SMP) checks to cleanup irq_set_affinity() for UP
Use IS_BUILTIN(CONFIG_SMP) checks for cleaning up the ifdef CONFIG_SMP around irq_set_affinity routines in io_apic and irq_remapping subsystems.
--- arch/x86/kernel/apic/io_apic.c | 173 +++++++++++++++++------------------ drivers/iommu/intel_irq_remapping.c | 7 +- drivers/iommu/irq_remapping.c | 5 +- drivers/iommu/irq_remapping.h | 2 - include/linux/irq.h | 2 - 5 files changed, 89 insertions(+), 100 deletions(-)
arch/x86/kernel/apic/io_apic.c +84 -89
@@ -2221,71 +2221,6 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) -{ -int apic, pin; -struct irq_pin_list *entry; -u8 vector = cfg->vector; - -for_each_irq_pin (entry, cfg->irq_2_pin) { -unsigned int reg; - - apic = entry->apic; - pin = entry->pin; -/* -* With interrupt-remapping, destination information comes -* from interrupt-remapping table entry. -*/ -if (!irq_remapped (cfg)) -io_apic_write (apic,0x11 + pin*2 , dest); - reg =io_apic_read (apic,0x10 + pin*2 ); - reg &= ~IO_APIC_REDIR_VECTOR_MASK ; - reg |= vector; -io_apic_modify (apic,0x10 + pin*2 , reg); - } -} - -/* -* Either sets data->affinity to a valid value, and returns -* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and -* leaves data->affinity untouched. -*/ -int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -unsigned int *dest_id) -{ -struct irq_cfg *cfg = data->chip_data; - -if (!cpumask_intersects (mask, cpu_online_mask)) -return -1 ; - -if (assign_irq_vector (data->irq, data->chip_data, mask)) -return -1 ; - -cpumask_copy (data->affinity, mask); - - *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); -return 0 ; -} - -static int -ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -bool force) -{ -unsigned int dest, irq = data->irq; -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&ioapic_lock, flags); - ret =__ioapic_set_affinity (data, mask, &dest); -if (!ret) { -/* Only the high 8 bits are valid. */ - dest =SET_APIC_LOGICAL_ID (dest); -__target_IO_APIC_irq (irq, dest, data->chip_data); - } -raw_spin_unlock_irqrestore (&ioapic_lock, flags); -return ret; -} - asmlinkage void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;
@@ -2373,6 +2308,78 @@ void irq_force_complete_move(int irq)static inline void irq_complete_move (struct irq_cfg *cfg) { }#endif +static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) +{ +int apic, pin; +struct irq_pin_list *entry; +u8 vector = cfg->vector; + +for_each_irq_pin (entry, cfg->irq_2_pin) { +unsigned int reg; + + apic = entry->apic; + pin = entry->pin; +/* +* With interrupt-remapping, destination information comes +* from interrupt-remapping table entry. +*/ +if (!irq_remapped (cfg)) +io_apic_write (apic,0x11 + pin*2 , dest); + reg =io_apic_read (apic,0x10 + pin*2 ); + reg &= ~IO_APIC_REDIR_VECTOR_MASK ; + reg |= vector; +io_apic_modify (apic,0x10 + pin*2 , reg); + } +} + +/* +* Either sets data->affinity to a valid value, and returns +* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and +* leaves data->affinity untouched. +*/ +int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +unsigned int *dest_id) +{ +struct irq_cfg *cfg = data->chip_data; + +if (!IS_BUILTIN (CONFIG_SMP )) +return -1 ; + +if (!cpumask_intersects (mask, cpu_online_mask)) +return -1 ; + +if (assign_irq_vector (data->irq, data->chip_data, mask)) +return -1 ; + +cpumask_copy (data->affinity, mask); + + *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); +return 0 ; +} + +static int +ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +bool force) +{ +unsigned int dest, irq = data->irq; +unsigned long flags; +int ret; + +if (!IS_BUILTIN (CONFIG_SMP )) +return -1 ; + +raw_spin_lock_irqsave (&ioapic_lock, flags); + ret =__ioapic_set_affinity (data, mask, &dest); +if (!ret) { +/* Only the high 8 bits are valid. */ + dest =SET_APIC_LOGICAL_ID (dest); +__target_IO_APIC_irq (irq, dest, data->chip_data); + } +raw_spin_unlock_irqrestore (&ioapic_lock, flags); +return ret; +} + +static void ack_apic_edge (struct irq_data *data) {irq_complete_move (data->chip_data);
@@ -2552,9 +2559,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) chip->irq_ack = ir_ack_apic_edge; chip->irq_eoi = ir_ack_apic_level; -#ifdef CONFIG_SMP chip->irq_set_affinity = set_remapped_irq_affinity; -#endif }#endif /* CONFIG_IRQ_REMAP */
@@ -2565,9 +2570,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_unmask = unmask_ioapic_irq, .irq_ack = ack_apic_edge, .irq_eoi = ack_apic_level, -#ifdef CONFIG_SMP .irq_set_affinity = ioapic_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3083,7 +3086,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,return err; } -#ifdef CONFIG_SMP static int msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3091,6 +3093,9 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct msi_msg msg;unsigned int dest; +if (!IS_BUILTIN (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3105,7 +3110,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return 0 ; } -#endif /* CONFIG_SMP */ /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -3116,9 +3120,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3203,7 +3205,6 @@ void native_teardown_msi_irq(unsigned int irq) }#ifdef CONFIG_DMAR_TABLE -#ifdef CONFIG_SMP static int dmar_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force)
@@ -3212,6 +3213,9 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct msi_msg msg; +if (!IS_BUILTIN (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3228,16 +3232,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,return 0 ; } -#endif /* CONFIG_SMP */ -static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .irq_unmask = dmar_msi_unmask, .irq_mask = dmar_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = dmar_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3258,7 +3258,6 @@ int arch_setup_dmar_msi(unsigned int irq)#ifdef CONFIG_HPET_TIMER -#ifdef CONFIG_SMPstatic int hpet_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3266,6 +3265,9 @@ static int hpet_msi_set_affinity(struct irq_data *data,struct msi_msg msg;unsigned int dest; +if (!IS_BUILTIN (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3281,16 +3283,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,return 0 ; } -#endif /* CONFIG_SMP */ -static struct irq_chip hpet_msi_type = { .name ="HPET_MSI" , .irq_unmask = hpet_msi_unmask, .irq_mask = hpet_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = hpet_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3325,8 +3323,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)*/ #ifdef CONFIG_HT_IRQ -#ifdef CONFIG_SMP -static void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) {struct ht_irq_msg msg;
@@ -3347,6 +3343,9 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct irq_cfg *cfg = data->chip_data;unsigned int dest; +if (!IS_BUILTIN (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3354,16 +3353,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return 0 ; } -#endif -static struct irq_chip ht_irq_chip = { .name ="PCI-HT" , .irq_mask = mask_ht_irq, .irq_unmask = unmask_ht_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = ht_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
drivers/iommu/intel_irq_remapping.c +3 -4
@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } -#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -925,6 +924,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct irte irte; +if (!IS_BUILTIN (CONFIG_SMP )) +return -EINVAL ; +if (!cpumask_intersects (mask, cpu_online_mask))return -EINVAL ;
@@ -956,7 +958,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } -#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1058,9 +1059,7 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, -#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, -#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -3
@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } -#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -if (!remap_ops || !remap_ops->set_affinity) +if (!IS_BUILTIN (CONFIG_SMP ) || !remap_ops || + !remap_ops->set_affinity)return 0 ;return remap_ops->set_affinity (data, mask, force); } -#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +0 -2
@@ -59,11 +59,9 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); -#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); -#endif /* Free an IRQ */ int (*free_irq)(int );
include/linux/irq.h +0 -2
@@ -150,9 +150,7 @@ struct irq_data {void *handler_data;void *chip_data;struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif };/*
Signature · 1 line
1.7.6.5
Re: [PATCH 1/2] kconfig: change config_enabled() to accept X instead of CONFIG_X
In reply to Suresh SiddhaQuoted 9 lines · Suresh Siddha
Quoted 5 lines · Sam Ravnborg
Quoted 2 lines · Suresh Siddha
change
config_enabled()to use it asconfig_enabled(SMP)instead ofconfig_enabled(CONFIG_SMP).You are breaking all existing users.
I checked the mainline and there were no users as far as I checked. Referring to some upcoming code? Just curious to see why I missed.
I assume that as it is in the tree someone has used it. There are no users in the upstream kernel but I did not check -next.
Sam
Re: [PATCH 1/2] kconfig: change config_enabled() to accept X instead of CONFIG_X
In reply to Sam RavnborgQuoted 6 lines · Sam Ravnborg
Quoted 2 lines · Suresh Siddha
change
config_enabled()to use it asconfig_enabled(SMP)instead ofconfig_enabled(CONFIG_SMP).You are breaking all existing users.
AndCONFIG_was included to allow better grepability.
Indeed.
Quoted 2 lines
If you insist on having a CONFIG less variant
introduce a new variant for this.
It's already bad enough that you have to usegit grep -w FOO $(git ls-files "*Kconf*") [*] to find the non-prefixed symbols in the Kconfig logic, followed by git grep -w CONFIG_FOO for the rest.
[*] Doh, recently I discovered that `git grep -w FOO -- "*Kconf*"' also works, but my fingers are not yet used to it...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 2/2] irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
In reply to Suresh SiddhaQuoted 6 lines · Suresh Siddha
Quoted 3 lines · Suresh Siddha
Use
config_enabled(SMP)checks for cleaning up the ifdefCONFIG_SMParoundirq_set_affinityroutines inio_apicandirq_remappingsubsystems.Switched to
IS_BUILTIN()instead. Thanks.
Hm, what was wrong with config_enabled(CONFIG_SMP)?
The IS_BUILTIN() macro is 1) shouting loud, needlessly 2) somewhat confusing for the CONFIG_SMP case: of course SMP is 'built in', not modular - and the fact that 'built in' also implies 'enabled' is lost in that naming variant.
So I think IS_BUILTIN() makes more sense for genuine tri-state config knobs, and bools like CONFIG_SMP should se config_enabled()..
Thanks,
Ingo
Re: [PATCH 2/2] irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
Quoted 10 lines · Ingo Molnar
Quoted 6 lines · Suresh Siddha
Quoted 3 lines · Suresh Siddha
Use
config_enabled(SMP)checks for cleaning up the ifdefCONFIG_SMParoundirq_set_affinityroutines inio_apicandirq_remappingsubsystems.Switched to
IS_BUILTIN()instead. Thanks.Hm, what was wrong with
config_enabled(CONFIG_SMP)?
For some reason, didn't like the sound of it. But I am not too picky on this.
Quoted 8 lines
The
IS_BUILTIN()macro is 1) shouting loud, needlessly 2) somewhat confusing for theCONFIG_SMPcase: of course SMP is 'built in', not modular - and the fact that 'built in' also implies 'enabled' is lost in that naming variant.So I think
IS_BUILTIN()makes more sense for genuine tri-state config knobs, and bools likeCONFIG_SMPshould seconfig_enabled()..
yes was thinking about this but preferred the sound of IS_BUILTIN() than two configs ;) Anyways I am not too insistent on this. Appended the patch with config_enabled(CONFIG_SMP).
Thanks.
---
From: Suresh Siddha <[email protected]>
Subject: irq: use config_enabled(CONFIG_SMP) checks to cleanup irq_set_affinity() for UP
Use config_enabled(CONFIG_SMP) checks for cleaning up the ifdef CONFIG_SMP around irq_set_affinity routines in io_apic and irq_remapping subsystems.
--- arch/x86/kernel/apic/io_apic.c | 173 +++++++++++++++++------------------ drivers/iommu/intel_irq_remapping.c | 7 +- drivers/iommu/irq_remapping.c | 5 +- drivers/iommu/irq_remapping.h | 2 - include/linux/irq.h | 2 - 5 files changed, 89 insertions(+), 100 deletions(-)
arch/x86/kernel/apic/io_apic.c +84 -89
@@ -2221,71 +2221,6 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) -{ -int apic, pin; -struct irq_pin_list *entry; -u8 vector = cfg->vector; - -for_each_irq_pin (entry, cfg->irq_2_pin) { -unsigned int reg; - - apic = entry->apic; - pin = entry->pin; -/* -* With interrupt-remapping, destination information comes -* from interrupt-remapping table entry. -*/ -if (!irq_remapped (cfg)) -io_apic_write (apic,0x11 + pin*2 , dest); - reg =io_apic_read (apic,0x10 + pin*2 ); - reg &= ~IO_APIC_REDIR_VECTOR_MASK ; - reg |= vector; -io_apic_modify (apic,0x10 + pin*2 , reg); - } -} - -/* -* Either sets data->affinity to a valid value, and returns -* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and -* leaves data->affinity untouched. -*/ -int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -unsigned int *dest_id) -{ -struct irq_cfg *cfg = data->chip_data; - -if (!cpumask_intersects (mask, cpu_online_mask)) -return -1 ; - -if (assign_irq_vector (data->irq, data->chip_data, mask)) -return -1 ; - -cpumask_copy (data->affinity, mask); - - *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); -return 0 ; -} - -static int -ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -bool force) -{ -unsigned int dest, irq = data->irq; -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&ioapic_lock, flags); - ret =__ioapic_set_affinity (data, mask, &dest); -if (!ret) { -/* Only the high 8 bits are valid. */ - dest =SET_APIC_LOGICAL_ID (dest); -__target_IO_APIC_irq (irq, dest, data->chip_data); - } -raw_spin_unlock_irqrestore (&ioapic_lock, flags); -return ret; -} - asmlinkage void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;
@@ -2373,6 +2308,78 @@ void irq_force_complete_move(int irq)static inline void irq_complete_move (struct irq_cfg *cfg) { }#endif +static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) +{ +int apic, pin; +struct irq_pin_list *entry; +u8 vector = cfg->vector; + +for_each_irq_pin (entry, cfg->irq_2_pin) { +unsigned int reg; + + apic = entry->apic; + pin = entry->pin; +/* +* With interrupt-remapping, destination information comes +* from interrupt-remapping table entry. +*/ +if (!irq_remapped (cfg)) +io_apic_write (apic,0x11 + pin*2 , dest); + reg =io_apic_read (apic,0x10 + pin*2 ); + reg &= ~IO_APIC_REDIR_VECTOR_MASK ; + reg |= vector; +io_apic_modify (apic,0x10 + pin*2 , reg); + } +} + +/* +* Either sets data->affinity to a valid value, and returns +* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and +* leaves data->affinity untouched. +*/ +int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +unsigned int *dest_id) +{ +struct irq_cfg *cfg = data->chip_data; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +if (!cpumask_intersects (mask, cpu_online_mask)) +return -1 ; + +if (assign_irq_vector (data->irq, data->chip_data, mask)) +return -1 ; + +cpumask_copy (data->affinity, mask); + + *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); +return 0 ; +} + +static int +ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +bool force) +{ +unsigned int dest, irq = data->irq; +unsigned long flags; +int ret; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +raw_spin_lock_irqsave (&ioapic_lock, flags); + ret =__ioapic_set_affinity (data, mask, &dest); +if (!ret) { +/* Only the high 8 bits are valid. */ + dest =SET_APIC_LOGICAL_ID (dest); +__target_IO_APIC_irq (irq, dest, data->chip_data); + } +raw_spin_unlock_irqrestore (&ioapic_lock, flags); +return ret; +} + +static void ack_apic_edge (struct irq_data *data) {irq_complete_move (data->chip_data);
@@ -2552,9 +2559,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) chip->irq_ack = ir_ack_apic_edge; chip->irq_eoi = ir_ack_apic_level; -#ifdef CONFIG_SMP chip->irq_set_affinity = set_remapped_irq_affinity; -#endif }#endif /* CONFIG_IRQ_REMAP */
@@ -2565,9 +2570,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_unmask = unmask_ioapic_irq, .irq_ack = ack_apic_edge, .irq_eoi = ack_apic_level, -#ifdef CONFIG_SMP .irq_set_affinity = ioapic_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3083,7 +3086,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,return err; } -#ifdef CONFIG_SMP static int msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3091,6 +3093,9 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct msi_msg msg;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3105,7 +3110,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return 0 ; } -#endif /* CONFIG_SMP */ /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -3116,9 +3120,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3203,7 +3205,6 @@ void native_teardown_msi_irq(unsigned int irq) }#ifdef CONFIG_DMAR_TABLE -#ifdef CONFIG_SMP static int dmar_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force)
@@ -3212,6 +3213,9 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct msi_msg msg; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3228,16 +3232,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,return 0 ; } -#endif /* CONFIG_SMP */ -static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .irq_unmask = dmar_msi_unmask, .irq_mask = dmar_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = dmar_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3258,7 +3258,6 @@ int arch_setup_dmar_msi(unsigned int irq)#ifdef CONFIG_HPET_TIMER -#ifdef CONFIG_SMPstatic int hpet_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3266,6 +3265,9 @@ static int hpet_msi_set_affinity(struct irq_data *data,struct msi_msg msg;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3281,16 +3283,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,return 0 ; } -#endif /* CONFIG_SMP */ -static struct irq_chip hpet_msi_type = { .name ="HPET_MSI" , .irq_unmask = hpet_msi_unmask, .irq_mask = hpet_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = hpet_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3325,8 +3323,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)*/ #ifdef CONFIG_HT_IRQ -#ifdef CONFIG_SMP -static void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) {struct ht_irq_msg msg;
@@ -3347,6 +3343,9 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct irq_cfg *cfg = data->chip_data;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3354,16 +3353,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return 0 ; } -#endif -static struct irq_chip ht_irq_chip = { .name ="PCI-HT" , .irq_mask = mask_ht_irq, .irq_unmask = unmask_ht_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = ht_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
drivers/iommu/intel_irq_remapping.c +3 -4
@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } -#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -925,6 +924,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct irte irte; +if (!config_enabled (CONFIG_SMP )) +return -EINVAL ; +if (!cpumask_intersects (mask, cpu_online_mask))return -EINVAL ;
@@ -956,7 +958,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } -#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1058,9 +1059,7 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, -#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, -#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -3
@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } -#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -if (!remap_ops || !remap_ops->set_affinity) +if (!config_enabled (CONFIG_SMP ) || !remap_ops || + !remap_ops->set_affinity)return 0 ;return remap_ops->set_affinity (data, mask, force); } -#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +0 -2
@@ -59,11 +59,9 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); -#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); -#endif /* Free an IRQ */ int (*free_irq)(int );
include/linux/irq.h +0 -2
@@ -150,9 +150,7 @@ struct irq_data {void *handler_data;void *chip_data;struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif };/*
Signature · 1 line
1.7.6.5
PATCH 1/1 irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
In reply to Ingo MolnarOn Ingo's request, re-basing the previous version
(http://marc.info/?l=linux-kernel&m=133667389223282) to the latest -tip tree. Thanks.
---
From: Suresh Siddha <[email protected]>
Subject: irq: use config_enabled(CONFIG_SMP) checks to cleanup irq_set_affinity() for UP
Use config_enabled(CONFIG_SMP) checks for cleaning up the ifdef CONFIG_SMP around irq_set_affinity routines in io_apic and irq_remapping subsystems.
--- arch/x86/kernel/apic/io_apic.c | 173 +++++++++++++++++------------------ drivers/iommu/intel_irq_remapping.c | 7 +- drivers/iommu/irq_remapping.c | 5 +- drivers/iommu/irq_remapping.h | 2 - include/linux/irq.h | 2 - 5 files changed, 88 insertions(+), 101 deletions(-)
arch/x86/kernel/apic/io_apic.c +83 -90
@@ -2206,72 +2206,6 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) -{ -int apic, pin; -struct irq_pin_list *entry; -u8 vector = cfg->vector; - -for_each_irq_pin (entry, cfg->irq_2_pin) { -unsigned int reg; - - apic = entry->apic; - pin = entry->pin; -/* -* With interrupt-remapping, destination information comes -* from interrupt-remapping table entry. -*/ -if (!irq_remapped (cfg)) -io_apic_write (apic,0x11 + pin*2 , dest); - reg =io_apic_read (apic,0x10 + pin*2 ); - reg &= ~IO_APIC_REDIR_VECTOR_MASK ; - reg |= vector; -io_apic_modify (apic,0x10 + pin*2 , reg); - } -} - -/* -* Either sets data->affinity to a valid value, and returns -* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and -* leaves data->affinity untouched. -*/ -int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -unsigned int *dest_id) -{ -struct irq_cfg *cfg = data->chip_data; - -if (!cpumask_intersects (mask, cpu_online_mask)) -return -1 ; - -if (assign_irq_vector (data->irq, data->chip_data, mask)) -return -1 ; - -cpumask_copy (data->affinity, mask); - - *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); -return 0 ; -} - -static int -ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -bool force) -{ -unsigned int dest, irq = data->irq; -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&ioapic_lock, flags); - ret =__ioapic_set_affinity (data, mask, &dest); -if (!ret) { -/* Only the high 8 bits are valid. */ - dest =SET_APIC_LOGICAL_ID (dest); -__target_IO_APIC_irq (irq, dest, data->chip_data); - ret =IRQ_SET_MASK_OK_NOCOPY ; - } -raw_spin_unlock_irqrestore (&ioapic_lock, flags); -return ret; -} - asmlinkage void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;
@@ -2359,6 +2293,77 @@ void irq_force_complete_move(int irq)static inline void irq_complete_move (struct irq_cfg *cfg) { }#endif +static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) +{ +int apic, pin; +struct irq_pin_list *entry; +u8 vector = cfg->vector; + +for_each_irq_pin (entry, cfg->irq_2_pin) { +unsigned int reg; + + apic = entry->apic; + pin = entry->pin; +/* +* With interrupt-remapping, destination information comes +* from interrupt-remapping table entry. +*/ +if (!irq_remapped (cfg)) +io_apic_write (apic,0x11 + pin*2 , dest); + reg =io_apic_read (apic,0x10 + pin*2 ); + reg &= ~IO_APIC_REDIR_VECTOR_MASK ; + reg |= vector; +io_apic_modify (apic,0x10 + pin*2 , reg); + } +} + +/* +* Either sets data->affinity to a valid value, and returns +* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and +* leaves data->affinity untouched. +*/ +int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +unsigned int *dest_id) +{ +struct irq_cfg *cfg = data->chip_data; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +if (!cpumask_intersects (mask, cpu_online_mask)) +return -1 ; + +if (assign_irq_vector (data->irq, data->chip_data, mask)) +return -1 ; + +cpumask_copy (data->affinity, mask); + + *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); +return 0 ; +} + +static int +ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +bool force) +{ +unsigned int dest, irq = data->irq; +unsigned long flags; +int ret; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +raw_spin_lock_irqsave (&ioapic_lock, flags); + ret =__ioapic_set_affinity (data, mask, &dest); +if (!ret) { +/* Only the high 8 bits are valid. */ + dest =SET_APIC_LOGICAL_ID (dest); +__target_IO_APIC_irq (irq, dest, data->chip_data); + } +raw_spin_unlock_irqrestore (&ioapic_lock, flags); +return ret; +} +static void ack_apic_edge (struct irq_data *data) {irq_complete_move (data->chip_data);
@@ -2538,9 +2543,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) chip->irq_ack = ir_ack_apic_edge; chip->irq_eoi = ir_ack_apic_level; -#ifdef CONFIG_SMP chip->irq_set_affinity = set_remapped_irq_affinity; -#endif }#endif /* CONFIG_IRQ_REMAP */
@@ -2551,9 +2554,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_unmask = unmask_ioapic_irq, .irq_ack = ack_apic_edge, .irq_eoi = ack_apic_level, -#ifdef CONFIG_SMP .irq_set_affinity = ioapic_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3069,7 +3070,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,return err; } -#ifdef CONFIG_SMP static int msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3077,6 +3077,9 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct msi_msg msg;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3091,7 +3094,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -3102,9 +3104,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3189,7 +3189,6 @@ void native_teardown_msi_irq(unsigned int irq) }#ifdef CONFIG_DMAR_TABLE -#ifdef CONFIG_SMP static int dmar_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force)
@@ -3198,6 +3197,9 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct msi_msg msg; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3214,16 +3216,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .irq_unmask = dmar_msi_unmask, .irq_mask = dmar_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = dmar_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3244,7 +3242,6 @@ int arch_setup_dmar_msi(unsigned int irq)#ifdef CONFIG_HPET_TIMER -#ifdef CONFIG_SMPstatic int hpet_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3252,6 +3249,9 @@ static int hpet_msi_set_affinity(struct irq_data *data,struct msi_msg msg;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3267,16 +3267,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip hpet_msi_type = { .name ="HPET_MSI" , .irq_unmask = hpet_msi_unmask, .irq_mask = hpet_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = hpet_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3311,8 +3307,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)*/ #ifdef CONFIG_HT_IRQ -#ifdef CONFIG_SMP -static void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) {struct ht_irq_msg msg;
@@ -3333,6 +3327,9 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct irq_cfg *cfg = data->chip_data;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3340,16 +3337,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif -static struct irq_chip ht_irq_chip = { .name ="PCI-HT" , .irq_mask = mask_ht_irq, .irq_unmask = unmask_ht_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = ht_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
drivers/iommu/intel_irq_remapping.c +3 -4
@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } -#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -925,6 +924,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct irte irte; +if (!config_enabled (CONFIG_SMP )) +return -EINVAL ; +if (!cpumask_intersects (mask, cpu_online_mask))return -EINVAL ;
@@ -956,7 +958,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } -#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1058,9 +1059,7 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, -#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, -#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -3
@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } -#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -if (!remap_ops || !remap_ops->set_affinity) +if (!config_enabled (CONFIG_SMP ) || !remap_ops || + !remap_ops->set_affinity)return 0 ;return remap_ops->set_affinity (data, mask, force); } -#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +0 -2
@@ -59,11 +59,9 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); -#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); -#endif /* Free an IRQ */ int (*free_irq)(int );
include/linux/irq.h +0 -2
@@ -150,9 +150,7 @@ struct irq_data {void *handler_data;void *chip_data;struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif };/*
Re: [patch] irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
Quoted 9 lines · Suresh Siddha
On Ingo's request, re-basing the previous version
(http://marc.info/?l=linux-kernel&m=133667389223282) to the latest -tip tree. Thanks.
---
From: Suresh Siddha <[email protected]>
Subject: irq: useconfig_enabled(CONFIG_SMP)checks to cleanupirq_set_affinity()for UPUse
config_enabled(CONFIG_SMP)checks for cleaning up the ifdefCONFIG_SMParoundirq_set_affinityroutines inio_apicandirq_remappingsubsystems.
can you just use
if (nr_cpu_ids > 1)
checking instead
if config_enabled(CONFIG_SMP)
Thanks
Yinghai Lu
Re: [patch] irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
In reply to Suresh SiddhaQuoted 7 lines · Suresh Siddha
On Ingo's request, re-basing the previous version
(http://marc.info/?l=linux-kernel&m=133667389223282) to the latest -tip tree. Thanks.
---
From: Suresh Siddha <[email protected]>
Subject: irq: useconfig_enabled(CONFIG_SMP)checks to cleanupirq_set_affinity()for UP
Quoted 6 lines
Use
config_enabled(CONFIG_SMP)checks for cleaning up the ifdefCONFIG_SMParoundirq_set_affinityroutines inio_apicandirq_remappingsubsystems.Signed-off-by Suresh Siddha <[email protected]>--- arch/x86/kernel/apic/io_apic.c | 173 +++++++++++++++++------------------
What was the necessity of the giant code block move here? It wasn't obvious to me, and it isn't called out in the commit log. Presumably some used before defined issue, but it would be nice to have that called out, so a person isn't wondering if instead it was an offhand error.
Thanks,
Paul.
--
Quoted 418 lines
drivers/iommu/intel_irq_remapping.c | 7 +- drivers/iommu/irq_remapping.c | 5 +- drivers/iommu/irq_remapping.h | 2 - include/linux/irq.h | 2 - 5 files changed, 88 insertions(+), 101 deletions(-)arch/x86/kernel/apic/io_apic.c +83
-90@@ -2206,72 +2206,6 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) -{ -int apic, pin; -struct irq_pin_list *entry; -u8 vector = cfg->vector; - -for_each_irq_pin (entry, cfg->irq_2_pin) { -unsigned int reg; - - apic = entry->apic; - pin = entry->pin; -/* -* With interrupt-remapping, destination information comes -* from interrupt-remapping table entry. -*/ -if (!irq_remapped (cfg)) -io_apic_write (apic,0x11 + pin*2 , dest); - reg =io_apic_read (apic,0x10 + pin*2 ); - reg &= ~IO_APIC_REDIR_VECTOR_MASK ; - reg |= vector; -io_apic_modify (apic,0x10 + pin*2 , reg); - } -} - -/* -* Either sets data->affinity to a valid value, and returns -* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and -* leaves data->affinity untouched. -*/ -int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -unsigned int *dest_id) -{ -struct irq_cfg *cfg = data->chip_data; - -if (!cpumask_intersects (mask, cpu_online_mask)) -return -1 ; - -if (assign_irq_vector (data->irq, data->chip_data, mask)) -return -1 ; - -cpumask_copy (data->affinity, mask); - - *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); -return 0 ; -} - -static int -ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -bool force) -{ -unsigned int dest, irq = data->irq; -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&ioapic_lock, flags); - ret =__ioapic_set_affinity (data, mask, &dest); -if (!ret) { -/* Only the high 8 bits are valid. */ - dest =SET_APIC_LOGICAL_ID (dest); -__target_IO_APIC_irq (irq, dest, data->chip_data); - ret =IRQ_SET_MASK_OK_NOCOPY ; - } -raw_spin_unlock_irqrestore (&ioapic_lock, flags); -return ret; -} - asmlinkage void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;@@ -2359,6 +2293,77 @@ void irq_force_complete_move(int irq)static inline void irq_complete_move (struct irq_cfg *cfg) { }#endif +static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) +{ +int apic, pin; +struct irq_pin_list *entry; +u8 vector = cfg->vector; + +for_each_irq_pin (entry, cfg->irq_2_pin) { +unsigned int reg; + + apic = entry->apic; + pin = entry->pin; +/* +* With interrupt-remapping, destination information comes +* from interrupt-remapping table entry. +*/ +if (!irq_remapped (cfg)) +io_apic_write (apic,0x11 + pin*2 , dest); + reg =io_apic_read (apic,0x10 + pin*2 ); + reg &= ~IO_APIC_REDIR_VECTOR_MASK ; + reg |= vector; +io_apic_modify (apic,0x10 + pin*2 , reg); + } +} + +/* +* Either sets data->affinity to a valid value, and returns +* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and +* leaves data->affinity untouched. +*/ +int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +unsigned int *dest_id) +{ +struct irq_cfg *cfg = data->chip_data; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +if (!cpumask_intersects (mask, cpu_online_mask)) +return -1 ; + +if (assign_irq_vector (data->irq, data->chip_data, mask)) +return -1 ; + +cpumask_copy (data->affinity, mask); + + *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); +return 0 ; +} + +static int +ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +bool force) +{ +unsigned int dest, irq = data->irq; +unsigned long flags; +int ret; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +raw_spin_lock_irqsave (&ioapic_lock, flags); + ret =__ioapic_set_affinity (data, mask, &dest); +if (!ret) { +/* Only the high 8 bits are valid. */ + dest =SET_APIC_LOGICAL_ID (dest); +__target_IO_APIC_irq (irq, dest, data->chip_data); + } +raw_spin_unlock_irqrestore (&ioapic_lock, flags); +return ret; +} +static void ack_apic_edge (struct irq_data *data) {irq_complete_move (data->chip_data);@@ -2538,9 +2543,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) chip->irq_ack = ir_ack_apic_edge; chip->irq_eoi = ir_ack_apic_level; -#ifdef CONFIG_SMP chip->irq_set_affinity = set_remapped_irq_affinity; -#endif }#endif /* CONFIG_IRQ_REMAP */ @@ -2551,9 +2554,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_unmask = unmask_ioapic_irq, .irq_ack = ack_apic_edge, .irq_eoi = ack_apic_level, -#ifdef CONFIG_SMP .irq_set_affinity = ioapic_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };@@ -3069,7 +3070,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,return err; } -#ifdef CONFIG_SMP static int msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {@@ -3077,6 +3077,9 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct msi_msg msg;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;@@ -3091,7 +3094,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices, @@ -3102,9 +3104,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };@@ -3189,7 +3189,6 @@ void native_teardown_msi_irq(unsigned int irq) }#ifdef CONFIG_DMAR_TABLE -#ifdef CONFIG_SMP static int dmar_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force)@@ -3198,6 +3197,9 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct msi_msg msg; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;@@ -3214,16 +3216,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .irq_unmask = dmar_msi_unmask, .irq_mask = dmar_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = dmar_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };@@ -3244,7 +3242,6 @@ int arch_setup_dmar_msi(unsigned int irq)#ifdef CONFIG_HPET_TIMER -#ifdef CONFIG_SMPstatic int hpet_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {@@ -3252,6 +3249,9 @@ static int hpet_msi_set_affinity(struct irq_data *data,struct msi_msg msg;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;@@ -3267,16 +3267,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip hpet_msi_type = { .name ="HPET_MSI" , .irq_unmask = hpet_msi_unmask, .irq_mask = hpet_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = hpet_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };@@ -3311,8 +3307,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)*/ #ifdef CONFIG_HT_IRQ -#ifdef CONFIG_SMP -static void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) {struct ht_irq_msg msg;@@ -3333,6 +3327,9 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct irq_cfg *cfg = data->chip_data;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;@@ -3340,16 +3337,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif -static struct irq_chip ht_irq_chip = { .name ="PCI-HT" , .irq_mask = mask_ht_irq, .irq_unmask = unmask_ht_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = ht_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };drivers/iommu/intel_irq_remapping.c +3
-4@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } -#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. * @@ -925,6 +924,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct irte irte; +if (!config_enabled (CONFIG_SMP )) +return -EINVAL ; +if (!cpumask_intersects (mask, cpu_online_mask))return -EINVAL ;@@ -956,7 +958,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } -#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,@@ -1058,9 +1059,7 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, -#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, -#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,drivers/iommu/irq_remapping.c +2
-3@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } -#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -if (!remap_ops || !remap_ops->set_affinity) +if (!config_enabled (CONFIG_SMP ) || !remap_ops || + !remap_ops->set_affinity)return 0 ;return remap_ops->set_affinity (data, mask, force); } -#endif void free_remapped_irq (int irq) {drivers/iommu/irq_remapping.h +0
-2@@ -59,11 +59,9 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); -#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); -#endif /* Free an IRQ */ int (*free_irq)(int );include/linux/irq.h +0
-2@@ -150,9 +150,7 @@ struct irq_data {void *handler_data;void *chip_data;struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif };/*
Re: [patch] irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
In reply to Yinghai LuQuoted 8 lines · Yinghai Lu
Quoted 7 lines · Suresh Siddha
On Ingo's request, re-basing the previous version
(http://marc.info/?l=linux-kernel&m=133667389223282) to the latest -tip tree. Thanks.
---
From: Suresh Siddha <[email protected]>
Subject: irq: useconfig_enabled(CONFIG_SMP)checks to cleanupirq_set_affinity()for UP
Quoted 7 lines
Quoted 2 lines
Use
config_enabled(CONFIG_SMP)checks for cleaning up the ifdefCONFIG_SMParoundirq_set_affinityroutines inio_apicandirq_remappingsubsystems.can you just use
if (nr_cpu_ids> 1)
checking instead
ifconfig_enabled(CONFIG_SMP)
Idea is to not have any extra runtime checks if CONFIG_SMP is enabled and which is when all the smp affinity routines are used/invoked.
thanks,
suresh
Re: [patch] irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
Quoted 8 lines · Suresh Siddha
Quoted 5 lines
can you just use
if (nr_cpu_ids> 1)
checking instead
ifconfig_enabled(CONFIG_SMP)Idea is to not have any extra runtime checks if
CONFIG_SMPis enabled and which is when all the smp affinity routines are used/invoked.
then could use
if (NR_CPUS > 1)
Thanks
Yinghai
Re: [patch] irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
Quoted 7 lines · Yinghai Lu
Quoted 6 lines · Suresh Siddha
Quoted 5 lines
can you just use
if (nr_cpu_ids> 1)
checking instead
ifconfig_enabled(CONFIG_SMP)
Quoted 5 lines
Quoted 2 lines
Idea is to not have any extra runtime checks if
CONFIG_SMPis enabled and which is when all the smp affinity routines are used/invoked.then could use
if (NR_CPUS> 1)
What is the problem with using config_enabled(CONFIG_SMP)? People looking for "CONFIG_SMP" can easily identify the dependency.
thanks,
suresh
Re: [patch] irq: use config_enabled(SMP) checks to cleanup irq_set_affinity() for UP
In reply to Paul GortmakerQuoted 8 lines · Paul Gortmaker
Quoted 7 lines · Suresh Siddha
On Ingo's request, re-basing the previous version
(http://marc.info/?l=linux-kernel&m=133667389223282) to the latest -tip tree. Thanks.
---
From: Suresh Siddha <[email protected]>
Subject: irq: useconfig_enabled(CONFIG_SMP)checks to cleanupirq_set_affinity()for UP
Quoted 8 lines
Quoted 6 lines
Use
config_enabled(CONFIG_SMP)checks for cleaning up the ifdefCONFIG_SMParoundirq_set_affinityroutines inio_apicandirq_remappingsubsystems.Signed-off-by Suresh Siddha <[email protected]>--- arch/x86/kernel/apic/io_apic.c | 173 +++++++++++++++++------------------What was the necessity of the giant code block move here?
Patch was moving the SMP affinity routines out of the existing "#ifdef CONFIG_SMP" section and adding config_enabled(CONFIG_SMP) inside those routines, making those routines simple null stubs for !SMP and retaining those routines with no runtime checks for SMP kernels.
Quoted 4 lines
It wasn't obvious to me, and it isn't called out in the commit log. Presumably some used before defined issue, but it would be nice to have that called out, so a person isn't wondering if instead it was an offhand error.
Updated with more elaborate changelog!
---
From: Suresh Siddha <[email protected]>
Subject: irq: use config_enabled(CONFIG_SMP) checks to cleanup irq_set_affinity() for UP
Move the set_affinity routines out of the #ifdef CONFIG_SMP sections and use config_enabled(CONFIG_SMP) checks inside those routines. Thus making those routines simple null stubs for !CONFIG_SMP and retaining those routines with no additional runtime overhead for CONFIG_SMP kernels.
Cleans up the ifdef CONFIG_SMP in and around routines related to irq_set_affinity in io_apic and irq_remapping subsystems.
--- arch/x86/kernel/apic/io_apic.c | 173 +++++++++++++++++------------------ drivers/iommu/intel_irq_remapping.c | 7 +- drivers/iommu/irq_remapping.c | 5 +- drivers/iommu/irq_remapping.h | 2 - include/linux/irq.h | 2 - 5 files changed, 88 insertions(+), 101 deletions(-)
arch/x86/kernel/apic/io_apic.c +83 -90
@@ -2206,72 +2206,6 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) -{ -int apic, pin; -struct irq_pin_list *entry; -u8 vector = cfg->vector; - -for_each_irq_pin (entry, cfg->irq_2_pin) { -unsigned int reg; - - apic = entry->apic; - pin = entry->pin; -/* -* With interrupt-remapping, destination information comes -* from interrupt-remapping table entry. -*/ -if (!irq_remapped (cfg)) -io_apic_write (apic,0x11 + pin*2 , dest); - reg =io_apic_read (apic,0x10 + pin*2 ); - reg &= ~IO_APIC_REDIR_VECTOR_MASK ; - reg |= vector; -io_apic_modify (apic,0x10 + pin*2 , reg); - } -} - -/* -* Either sets data->affinity to a valid value, and returns -* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and -* leaves data->affinity untouched. -*/ -int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -unsigned int *dest_id) -{ -struct irq_cfg *cfg = data->chip_data; - -if (!cpumask_intersects (mask, cpu_online_mask)) -return -1 ; - -if (assign_irq_vector (data->irq, data->chip_data, mask)) -return -1 ; - -cpumask_copy (data->affinity, mask); - - *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); -return 0 ; -} - -static int -ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -bool force) -{ -unsigned int dest, irq = data->irq; -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&ioapic_lock, flags); - ret =__ioapic_set_affinity (data, mask, &dest); -if (!ret) { -/* Only the high 8 bits are valid. */ - dest =SET_APIC_LOGICAL_ID (dest); -__target_IO_APIC_irq (irq, dest, data->chip_data); - ret =IRQ_SET_MASK_OK_NOCOPY ; - } -raw_spin_unlock_irqrestore (&ioapic_lock, flags); -return ret; -} - asmlinkage void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;
@@ -2359,6 +2293,77 @@ void irq_force_complete_move(int irq)static inline void irq_complete_move (struct irq_cfg *cfg) { }#endif +static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) +{ +int apic, pin; +struct irq_pin_list *entry; +u8 vector = cfg->vector; + +for_each_irq_pin (entry, cfg->irq_2_pin) { +unsigned int reg; + + apic = entry->apic; + pin = entry->pin; +/* +* With interrupt-remapping, destination information comes +* from interrupt-remapping table entry. +*/ +if (!irq_remapped (cfg)) +io_apic_write (apic,0x11 + pin*2 , dest); + reg =io_apic_read (apic,0x10 + pin*2 ); + reg &= ~IO_APIC_REDIR_VECTOR_MASK ; + reg |= vector; +io_apic_modify (apic,0x10 + pin*2 , reg); + } +} + +/* +* Either sets data->affinity to a valid value, and returns +* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and +* leaves data->affinity untouched. +*/ +int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +unsigned int *dest_id) +{ +struct irq_cfg *cfg = data->chip_data; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +if (!cpumask_intersects (mask, cpu_online_mask)) +return -1 ; + +if (assign_irq_vector (data->irq, data->chip_data, mask)) +return -1 ; + +cpumask_copy (data->affinity, mask); + + *dest_id = apic->cpu_mask_to_apicid_and (mask, cfg->domain); +return 0 ; +} + +static int +ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +bool force) +{ +unsigned int dest, irq = data->irq; +unsigned long flags; +int ret; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +raw_spin_lock_irqsave (&ioapic_lock, flags); + ret =__ioapic_set_affinity (data, mask, &dest); +if (!ret) { +/* Only the high 8 bits are valid. */ + dest =SET_APIC_LOGICAL_ID (dest); +__target_IO_APIC_irq (irq, dest, data->chip_data); + } +raw_spin_unlock_irqrestore (&ioapic_lock, flags); +return ret; +} +static void ack_apic_edge (struct irq_data *data) {irq_complete_move (data->chip_data);
@@ -2538,9 +2543,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) chip->irq_ack = ir_ack_apic_edge; chip->irq_eoi = ir_ack_apic_level; -#ifdef CONFIG_SMP chip->irq_set_affinity = set_remapped_irq_affinity; -#endif }#endif /* CONFIG_IRQ_REMAP */
@@ -2551,9 +2554,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_unmask = unmask_ioapic_irq, .irq_ack = ack_apic_edge, .irq_eoi = ack_apic_level, -#ifdef CONFIG_SMP .irq_set_affinity = ioapic_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3069,7 +3070,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,return err; } -#ifdef CONFIG_SMP static int msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3077,6 +3077,9 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct msi_msg msg;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3091,7 +3094,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -3102,9 +3104,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3189,7 +3189,6 @@ void native_teardown_msi_irq(unsigned int irq) }#ifdef CONFIG_DMAR_TABLE -#ifdef CONFIG_SMP static int dmar_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force)
@@ -3198,6 +3197,9 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct msi_msg msg; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3214,16 +3216,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .irq_unmask = dmar_msi_unmask, .irq_mask = dmar_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = dmar_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3244,7 +3242,6 @@ int arch_setup_dmar_msi(unsigned int irq)#ifdef CONFIG_HPET_TIMER -#ifdef CONFIG_SMPstatic int hpet_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3252,6 +3249,9 @@ static int hpet_msi_set_affinity(struct irq_data *data,struct msi_msg msg;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3267,16 +3267,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip hpet_msi_type = { .name ="HPET_MSI" , .irq_unmask = hpet_msi_unmask, .irq_mask = hpet_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = hpet_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3311,8 +3307,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)*/ #ifdef CONFIG_HT_IRQ -#ifdef CONFIG_SMP -static void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) {struct ht_irq_msg msg;
@@ -3333,6 +3327,9 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)struct irq_cfg *cfg = data->chip_data;unsigned int dest; +if (!config_enabled (CONFIG_SMP )) +return -1 ; +if (__ioapic_set_affinity (data, mask, &dest))return -1 ;
@@ -3340,16 +3337,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif -static struct irq_chip ht_irq_chip = { .name ="PCI-HT" , .irq_mask = mask_ht_irq, .irq_unmask = unmask_ht_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = ht_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
drivers/iommu/intel_irq_remapping.c +3 -4
@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } -#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -925,6 +924,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,unsigned int dest, irq = data->irq;struct irte irte; +if (!config_enabled (CONFIG_SMP )) +return -EINVAL ; +if (!cpumask_intersects (mask, cpu_online_mask))return -EINVAL ;
@@ -956,7 +958,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } -#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1058,9 +1059,7 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, -#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, -#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -3
@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } -#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -if (!remap_ops || !remap_ops->set_affinity) +if (!config_enabled (CONFIG_SMP ) || !remap_ops || + !remap_ops->set_affinity)return 0 ;return remap_ops->set_affinity (data, mask, force); } -#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +0 -2
@@ -59,11 +59,9 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); -#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); -#endif /* Free an IRQ */ int (*free_irq)(int );
include/linux/irq.h +0 -2
@@ -150,9 +150,7 @@ struct irq_data {void *handler_data;void *chip_data;struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif };/*
PATCH 1/1 irq: use config_enabled(CONFIG_SMP) checks to cleanup irq_set_affinity() for UP
In reply to Paul GortmakerQuoted 1 line · Suresh Siddha
Updated with more elaborate changelog!
Ingo, One more attempt. Can you please apply this before any other apic changes. I don't want to rebase any more ;)
---
From: Suresh Siddha <[email protected]>
Subject: irq: use config_enabled(CONFIG_SMP) checks to cleanup irq_set_affinity() for UP
Move the set_affinity routines out of the #ifdef CONFIG_SMP sections and use config_enabled(CONFIG_SMP) checks inside those routines. Thus making those routines simple null stubs for !CONFIG_SMP and retaining those routines with no additional runtime overhead for CONFIG_SMP kernels.
Cleans up the ifdef CONFIG_SMP in and around routines related to irq_set_affinity in io_apic and irq_remapping subsystems.
--- arch/x86/kernel/apic/io_apic.c | 180 ++++++++++++++++------------------- drivers/iommu/intel_irq_remapping.c | 7 +- drivers/iommu/irq_remapping.c | 5 +- drivers/iommu/irq_remapping.h | 2 - include/linux/irq.h | 2 - 5 files changed, 86 insertions(+), 110 deletions(-)
arch/x86/kernel/apic/io_apic.c +81 -99
@@ -2223,81 +2223,6 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) -{ -int apic, pin; -struct irq_pin_list *entry; -u8 vector = cfg->vector; - -for_each_irq_pin (entry, cfg->irq_2_pin) { -unsigned int reg; - - apic = entry->apic; - pin = entry->pin; -/* -* With interrupt-remapping, destination information comes -* from interrupt-remapping table entry. -*/ -if (!irq_remapped (cfg)) -io_apic_write (apic,0x11 + pin*2 , dest); - reg =io_apic_read (apic,0x10 + pin*2 ); - reg &= ~IO_APIC_REDIR_VECTOR_MASK ; - reg |= vector; -io_apic_modify (apic,0x10 + pin*2 , reg); - } -} - -/* -* Either sets data->affinity to a valid value, and returns -* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and -* leaves data->affinity untouched. -*/ -int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -unsigned int *dest_id) -{ -struct irq_cfg *cfg = data->chip_data; -unsigned int irq = data->irq; -int err; - -if (!cpumask_intersects (mask, cpu_online_mask)) -return -EINVAL ; - - err =assign_irq_vector (irq, cfg, mask); -if (err) -return err; - - err = apic->cpu_mask_to_apicid_and (mask, cfg->domain, dest_id); -if (err) { -if (assign_irq_vector (irq, cfg, data->affinity)) -pr_err ("Failed to recover vector for irq %d\n" , irq); -return err; - } - -cpumask_copy (data->affinity, mask); - -return 0 ; -} - -static int -ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -bool force) -{ -unsigned int dest, irq = data->irq; -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&ioapic_lock, flags); - ret =__ioapic_set_affinity (data, mask, &dest); -if (!ret) { -/* Only the high 8 bits are valid. */ - dest =SET_APIC_LOGICAL_ID (dest); -__target_IO_APIC_irq (irq, dest, data->chip_data); - ret =IRQ_SET_MASK_OK_NOCOPY ; - } -raw_spin_unlock_irqrestore (&ioapic_lock, flags); -return ret; -} - asmlinkage void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;
@@ -2385,6 +2310,87 @@ void irq_force_complete_move(int irq)static inline void irq_complete_move (struct irq_cfg *cfg) { }#endif +static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) +{ +int apic, pin; +struct irq_pin_list *entry; +u8 vector = cfg->vector; + +for_each_irq_pin (entry, cfg->irq_2_pin) { +unsigned int reg; + + apic = entry->apic; + pin = entry->pin; +/* +* With interrupt-remapping, destination information comes +* from interrupt-remapping table entry. +*/ +if (!irq_remapped (cfg)) +io_apic_write (apic,0x11 + pin*2 , dest); + reg =io_apic_read (apic,0x10 + pin*2 ); + reg &= ~IO_APIC_REDIR_VECTOR_MASK ; + reg |= vector; +io_apic_modify (apic,0x10 + pin*2 , reg); + } +} + +/* +* Either sets data->affinity to a valid value, and returns +* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and +* leaves data->affinity untouched. +*/ +int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +unsigned int *dest_id) +{ +struct irq_cfg *cfg = data->chip_data; +unsigned int irq = data->irq; +int err; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +if (!cpumask_intersects (mask, cpu_online_mask)) +return -EINVAL ; + + err =assign_irq_vector (irq, cfg, mask); +if (err) +return err; + + err = apic->cpu_mask_to_apicid_and (mask, cfg->domain, dest_id); +if (err) { +if (assign_irq_vector (irq, cfg, data->affinity)) +pr_err ("Failed to recover vector for irq %d\n" , irq); +return err; + } + +cpumask_copy (data->affinity, mask); + +return 0 ; +} + +static int +ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +bool force) +{ +unsigned int dest, irq = data->irq; +unsigned long flags; +int ret; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +raw_spin_lock_irqsave (&ioapic_lock, flags); + ret =__ioapic_set_affinity (data, mask, &dest); +if (!ret) { +/* Only the high 8 bits are valid. */ + dest =SET_APIC_LOGICAL_ID (dest); +__target_IO_APIC_irq (irq, dest, data->chip_data); + ret =IRQ_SET_MASK_OK_NOCOPY ; + } +raw_spin_unlock_irqrestore (&ioapic_lock, flags); +return ret; +} +static void ack_apic_edge (struct irq_data *data) {irq_complete_move (data->chip_data);
@@ -2564,9 +2570,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) chip->irq_ack = ir_ack_apic_edge; chip->irq_eoi = ir_ack_apic_level; -#ifdef CONFIG_SMP chip->irq_set_affinity = set_remapped_irq_affinity; -#endif }#endif /* CONFIG_IRQ_REMAP */
@@ -2577,9 +2581,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_unmask = unmask_ioapic_irq, .irq_ack = ack_apic_edge, .irq_eoi = ack_apic_level, -#ifdef CONFIG_SMP .irq_set_affinity = ioapic_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3098,7 +3100,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,return err; } -#ifdef CONFIG_SMP static int msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3120,7 +3121,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -3131,9 +3131,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3218,7 +3216,6 @@ void native_teardown_msi_irq(unsigned int irq) }#ifdef CONFIG_DMAR_TABLE -#ifdef CONFIG_SMP static int dmar_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force)
@@ -3243,16 +3240,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .irq_unmask = dmar_msi_unmask, .irq_mask = dmar_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = dmar_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3273,7 +3266,6 @@ int arch_setup_dmar_msi(unsigned int irq)#ifdef CONFIG_HPET_TIMER -#ifdef CONFIG_SMPstatic int hpet_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3296,16 +3288,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip hpet_msi_type = { .name ="HPET_MSI" , .irq_unmask = hpet_msi_unmask, .irq_mask = hpet_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = hpet_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3340,8 +3328,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)*/ #ifdef CONFIG_HT_IRQ -#ifdef CONFIG_SMP -static void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) {struct ht_irq_msg msg;
@@ -3369,16 +3355,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif -static struct irq_chip ht_irq_chip = { .name ="PCI-HT" , .irq_mask = mask_ht_irq, .irq_unmask = unmask_ht_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = ht_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
drivers/iommu/intel_irq_remapping.c +3 -4
@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } -#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -926,6 +925,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,struct irte irte;int err; +if (!config_enabled (CONFIG_SMP )) +return -EINVAL ; +if (!cpumask_intersects (mask, cpu_online_mask))return -EINVAL ;
@@ -963,7 +965,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } -#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1065,9 +1066,7 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, -#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, -#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -3
@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } -#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -if (!remap_ops || !remap_ops->set_affinity) +if (!config_enabled (CONFIG_SMP ) || !remap_ops || + !remap_ops->set_affinity)return 0 ;return remap_ops->set_affinity (data, mask, force); } -#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +0 -2
@@ -59,11 +59,9 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); -#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); -#endif /* Free an IRQ */ int (*free_irq)(int );
include/linux/irq.h +0 -2
@@ -150,9 +150,7 @@ struct irq_data {void *handler_data;void *chip_data;struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif };/*
[tip:x86/apic] irq/apic: Use config_enabled(CONFIG_SMP) checks to clean up irq_set_affinity() for UP
Commit-ID: 7eb9ae0799b1e9f0b77733b432bc5f6f055b020b Gitweb: http://git.kernel.org/tip/7eb9ae0799b1e9f0b77733b432bc5f6f055b020b Author: Suresh Siddha <[email protected]> AuthorDate: Thu, 14 Jun 2012 18:28:49 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 15 Jun 2012 14:17:29 +0200
irq/apic: Use config_enabled(CONFIG_SMP) checks to clean up irq_set_affinity() for UP
Move the ->irq_set_affinity() routines out of the #ifdef CONFIG_SMP sections and use config_enabled(CONFIG_SMP) checks inside those routines. Thus making those routines simple null stubs for !CONFIG_SMP and retaining those routines with no additional runtime overhead for CONFIG_SMP kernels.
Cleans up the ifdef CONFIG_SMP in and around routines related to irq_set_affinity in io_apic and irq_remapping subsystems.
--- arch/x86/kernel/apic/io_apic.c | 180 ++++++++++++++++------------------- drivers/iommu/intel_irq_remapping.c | 7 +- drivers/iommu/irq_remapping.c | 5 +- drivers/iommu/irq_remapping.h | 2 - include/linux/irq.h | 2 - 5 files changed, 86 insertions(+), 110 deletions(-)
arch/x86/kernel/apic/io_apic.c +81 -99
@@ -2224,81 +2224,6 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) -{ -int apic, pin; -struct irq_pin_list *entry; -u8 vector = cfg->vector; - -for_each_irq_pin (entry, cfg->irq_2_pin) { -unsigned int reg; - - apic = entry->apic; - pin = entry->pin; -/* -* With interrupt-remapping, destination information comes -* from interrupt-remapping table entry. -*/ -if (!irq_remapped (cfg)) -io_apic_write (apic,0x11 + pin*2 , dest); - reg =io_apic_read (apic,0x10 + pin*2 ); - reg &= ~IO_APIC_REDIR_VECTOR_MASK ; - reg |= vector; -io_apic_modify (apic,0x10 + pin*2 , reg); - } -} - -/* -* Either sets data->affinity to a valid value, and returns -* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and -* leaves data->affinity untouched. -*/ -int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -unsigned int *dest_id) -{ -struct irq_cfg *cfg = data->chip_data; -unsigned int irq = data->irq; -int err; - -if (!cpumask_intersects (mask, cpu_online_mask)) -return -EINVAL ; - - err =assign_irq_vector (irq, cfg, mask); -if (err) -return err; - - err = apic->cpu_mask_to_apicid_and (mask, cfg->domain, dest_id); -if (err) { -if (assign_irq_vector (irq, cfg, data->affinity)) -pr_err ("Failed to recover vector for irq %d\n" , irq); -return err; - } - -cpumask_copy (data->affinity, mask); - -return 0 ; -} - -static int -ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, -bool force) -{ -unsigned int dest, irq = data->irq; -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&ioapic_lock, flags); - ret =__ioapic_set_affinity (data, mask, &dest); -if (!ret) { -/* Only the high 8 bits are valid. */ - dest =SET_APIC_LOGICAL_ID (dest); -__target_IO_APIC_irq (irq, dest, data->chip_data); - ret =IRQ_SET_MASK_OK_NOCOPY ; - } -raw_spin_unlock_irqrestore (&ioapic_lock, flags); -return ret; -} - asmlinkage void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;
@@ -2386,6 +2311,87 @@ void irq_force_complete_move(int irq)static inline void irq_complete_move (struct irq_cfg *cfg) { }#endif +static void __target_IO_APIC_irq (unsigned int irq,unsigned int dest,struct irq_cfg *cfg) +{ +int apic, pin; +struct irq_pin_list *entry; +u8 vector = cfg->vector; + +for_each_irq_pin (entry, cfg->irq_2_pin) { +unsigned int reg; + + apic = entry->apic; + pin = entry->pin; +/* +* With interrupt-remapping, destination information comes +* from interrupt-remapping table entry. +*/ +if (!irq_remapped (cfg)) +io_apic_write (apic,0x11 + pin*2 , dest); + reg =io_apic_read (apic,0x10 + pin*2 ); + reg &= ~IO_APIC_REDIR_VECTOR_MASK ; + reg |= vector; +io_apic_modify (apic,0x10 + pin*2 , reg); + } +} + +/* +* Either sets data->affinity to a valid value, and returns +* ->cpu_mask_to_apicid of that in dest_id, or returns -1 and +* leaves data->affinity untouched. +*/ +int __ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +unsigned int *dest_id) +{ +struct irq_cfg *cfg = data->chip_data; +unsigned int irq = data->irq; +int err; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +if (!cpumask_intersects (mask, cpu_online_mask)) +return -EINVAL ; + + err =assign_irq_vector (irq, cfg, mask); +if (err) +return err; + + err = apic->cpu_mask_to_apicid_and (mask, cfg->domain, dest_id); +if (err) { +if (assign_irq_vector (irq, cfg, data->affinity)) +pr_err ("Failed to recover vector for irq %d\n" , irq); +return err; + } + +cpumask_copy (data->affinity, mask); + +return 0 ; +} + +static int +ioapic_set_affinity (struct irq_data *data,const struct cpumask *mask, +bool force) +{ +unsigned int dest, irq = data->irq; +unsigned long flags; +int ret; + +if (!config_enabled (CONFIG_SMP )) +return -1 ; + +raw_spin_lock_irqsave (&ioapic_lock, flags); + ret =__ioapic_set_affinity (data, mask, &dest); +if (!ret) { +/* Only the high 8 bits are valid. */ + dest =SET_APIC_LOGICAL_ID (dest); +__target_IO_APIC_irq (irq, dest, data->chip_data); + ret =IRQ_SET_MASK_OK_NOCOPY ; + } +raw_spin_unlock_irqrestore (&ioapic_lock, flags); +return ret; +} +static void ack_apic_edge (struct irq_data *data) {irq_complete_move (data->chip_data);
@@ -2565,9 +2571,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) chip->irq_ack = ir_ack_apic_edge; chip->irq_eoi = ir_ack_apic_level; -#ifdef CONFIG_SMP chip->irq_set_affinity = set_remapped_irq_affinity; -#endif }#endif /* CONFIG_IRQ_REMAP */
@@ -2578,9 +2582,7 @@ static struct irq_chip ioapic_chip __read_mostly = { .irq_unmask = unmask_ioapic_irq, .irq_ack = ack_apic_edge, .irq_eoi = ack_apic_level, -#ifdef CONFIG_SMP .irq_set_affinity = ioapic_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3099,7 +3101,6 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,return err; } -#ifdef CONFIG_SMP static int msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3121,7 +3122,6 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -3132,9 +3132,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3219,7 +3217,6 @@ void native_teardown_msi_irq(unsigned int irq) }#ifdef CONFIG_DMAR_TABLE -#ifdef CONFIG_SMP static int dmar_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force)
@@ -3244,16 +3241,12 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .irq_unmask = dmar_msi_unmask, .irq_mask = dmar_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = dmar_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3274,7 +3267,6 @@ int arch_setup_dmar_msi(unsigned int irq)#ifdef CONFIG_HPET_TIMER -#ifdef CONFIG_SMPstatic int hpet_msi_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) {
@@ -3297,16 +3289,12 @@ static int hpet_msi_set_affinity(struct irq_data *data,return IRQ_SET_MASK_OK_NOCOPY ; } -#endif /* CONFIG_SMP */ -static struct irq_chip hpet_msi_type = { .name ="HPET_MSI" , .irq_unmask = hpet_msi_unmask, .irq_mask = hpet_msi_mask, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = hpet_msi_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
@@ -3341,8 +3329,6 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)*/ #ifdef CONFIG_HT_IRQ -#ifdef CONFIG_SMP -static void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) {struct ht_irq_msg msg;
@@ -3370,16 +3356,12 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)return IRQ_SET_MASK_OK_NOCOPY ; } -#endif -static struct irq_chip ht_irq_chip = { .name ="PCI-HT" , .irq_mask = mask_ht_irq, .irq_unmask = unmask_ht_irq, .irq_ack = ack_apic_edge, -#ifdef CONFIG_SMP .irq_set_affinity = ht_set_affinity, -#endif .irq_retrigger = ioapic_retrigger_irq, };
drivers/iommu/intel_irq_remapping.c +3 -4
@@ -902,7 +902,6 @@ static int intel_setup_ioapic_entry(int irq,return 0 ; } -#ifdef CONFIG_SMP /* * Migrate the IO-APIC irq in the presence of intr-remapping. *
@@ -926,6 +925,9 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,struct irte irte;int err; +if (!config_enabled (CONFIG_SMP )) +return -EINVAL ; +if (!cpumask_intersects (mask, cpu_online_mask))return -EINVAL ;
@@ -963,7 +965,6 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,cpumask_copy (data->affinity, mask);return 0 ; } -#endif static void intel_compose_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest,
@@ -1065,9 +1066,7 @@ struct irq_remap_ops intel_irq_remap_ops = { .reenable = reenable_irq_remapping, .enable_faulting = enable_drhd_fault_handling, .setup_ioapic_entry = intel_setup_ioapic_entry, -#ifdef CONFIG_SMP .set_affinity = intel_ioapic_set_affinity, -#endif .free_irq = free_irte, .compose_msi_msg = intel_compose_msi_msg, .msi_alloc_irq = intel_msi_alloc_irq,
drivers/iommu/irq_remapping.c +2 -3
@@ -111,16 +111,15 @@ int setup_ioapic_remapped_entry(int irq, vector, attr); } -#ifdef CONFIG_SMP int set_remapped_irq_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -if (!remap_ops || !remap_ops->set_affinity) +if (!config_enabled (CONFIG_SMP ) || !remap_ops || + !remap_ops->set_affinity)return 0 ;return remap_ops->set_affinity (data, mask, force); } -#endif void free_remapped_irq (int irq) {
drivers/iommu/irq_remapping.h +0 -2
@@ -59,11 +59,9 @@ struct irq_remap_ops { unsigned int, int, struct io_apic_irq_attr *); -#ifdef CONFIG_SMP /* Set the CPU affinity of a remapped interrupt */ int (*set_affinity)(struct irq_data *data,const struct cpumask *mask,bool force); -#endif /* Free an IRQ */ int (*free_irq)(int );
include/linux/irq.h +0 -2
@@ -150,9 +150,7 @@ struct irq_data {void *handler_data;void *chip_data;struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif };/*