Linux v4.4-rc1
- Disable debugging options.
This commit is contained in:
		
							parent
							
								
									cc86ea98b1
								
							
						
					
					
						commit
						869c2ad790
					
				@ -148,6 +148,7 @@ CONFIG_NET_SB1000=y
 | 
			
		||||
CONFIG_AMD_XGBE=m
 | 
			
		||||
CONFIG_AMD_XGBE_PHY=m
 | 
			
		||||
# CONFIG_AMD_XGBE_DCB is not set
 | 
			
		||||
# CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
 | 
			
		||||
 | 
			
		||||
# HiSilicon
 | 
			
		||||
CONFIG_POWER_RESET_HISI=y
 | 
			
		||||
 | 
			
		||||
@ -944,5 +944,7 @@ CONFIG_R8188EU=m
 | 
			
		||||
# CONFIG_AB8500_DEBUG is not set
 | 
			
		||||
# CONFIG_ARM_KERNMEM_PERMS is not set
 | 
			
		||||
 | 
			
		||||
# CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
 | 
			
		||||
 | 
			
		||||
# Altera?
 | 
			
		||||
# CONFIG_PCIE_ALTERA is not set
 | 
			
		||||
 | 
			
		||||
@ -1792,13 +1792,13 @@ CONFIG_B43_PCMCIA=y
 | 
			
		||||
CONFIG_B43_SDIO=y
 | 
			
		||||
CONFIG_B43_BCMA=y
 | 
			
		||||
CONFIG_B43_BCMA_PIO=y
 | 
			
		||||
CONFIG_B43_DEBUG=y
 | 
			
		||||
# CONFIG_B43_DEBUG is not set
 | 
			
		||||
CONFIG_B43_PHY_LP=y
 | 
			
		||||
CONFIG_B43_PHY_N=y
 | 
			
		||||
CONFIG_B43_PHY_HT=y
 | 
			
		||||
CONFIG_B43_PHY_G=y
 | 
			
		||||
CONFIG_B43LEGACY=m
 | 
			
		||||
CONFIG_B43LEGACY_DEBUG=y
 | 
			
		||||
# CONFIG_B43LEGACY_DEBUG is not set
 | 
			
		||||
CONFIG_B43LEGACY_DMA=y
 | 
			
		||||
CONFIG_B43LEGACY_PIO=y
 | 
			
		||||
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 | 
			
		||||
@ -2479,7 +2479,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 | 
			
		||||
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 | 
			
		||||
# CONFIG_TOUCHSCREEN_FT6236 is not set
 | 
			
		||||
# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 | 
			
		||||
 | 
			
		||||
# CONFIG_TOUCHSCREEN_TSC2004 is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_INPUT_MISC=y
 | 
			
		||||
CONFIG_INPUT_E3X0_BUTTON=m
 | 
			
		||||
@ -5039,7 +5039,7 @@ CONFIG_PM_DEBUG=y
 | 
			
		||||
# CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 | 
			
		||||
CONFIG_PM_TRACE=y
 | 
			
		||||
CONFIG_PM_TRACE_RTC=y
 | 
			
		||||
CONFIG_PM_TEST_SUSPEND=y
 | 
			
		||||
# CONFIG_PM_TEST_SUSPEND is not set
 | 
			
		||||
# CONFIG_PM_OPP is not set
 | 
			
		||||
# CONFIG_PM_AUTOSLEEP is not set
 | 
			
		||||
# CONFIG_PM_WAKELOCKS is not set
 | 
			
		||||
@ -5360,7 +5360,7 @@ CONFIG_UIO_PCI_GENERIC=m
 | 
			
		||||
CONFIG_VFIO=m
 | 
			
		||||
CONFIG_VFIO_IOMMU_TYPE1=m
 | 
			
		||||
CONFIG_VFIO_PCI=m
 | 
			
		||||
 | 
			
		||||
# CONFIG_VFIO_NOIOMMU is not set
 | 
			
		||||
 | 
			
		||||
# LIRC
 | 
			
		||||
CONFIG_LIRC_STAGING=y
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										110
									
								
								config-nodebug
									
									
									
									
									
								
							
							
						
						
									
										110
									
								
								config-nodebug
									
									
									
									
									
								
							@ -2,101 +2,101 @@ CONFIG_SND_VERBOSE_PRINTK=y
 | 
			
		||||
CONFIG_SND_DEBUG=y
 | 
			
		||||
CONFIG_SND_PCM_XRUN_DEBUG=y
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_ATOMIC_SLEEP=y
 | 
			
		||||
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_MUTEXES=y
 | 
			
		||||
CONFIG_DEBUG_RT_MUTEXES=y
 | 
			
		||||
CONFIG_DEBUG_LOCK_ALLOC=y
 | 
			
		||||
CONFIG_LOCK_TORTURE_TEST=m
 | 
			
		||||
CONFIG_PROVE_LOCKING=y
 | 
			
		||||
CONFIG_DEBUG_SPINLOCK=y
 | 
			
		||||
CONFIG_PROVE_RCU=y
 | 
			
		||||
# CONFIG_DEBUG_MUTEXES is not set
 | 
			
		||||
# CONFIG_DEBUG_RT_MUTEXES is not set
 | 
			
		||||
# CONFIG_DEBUG_LOCK_ALLOC is not set
 | 
			
		||||
# CONFIG_LOCK_TORTURE_TEST is not set
 | 
			
		||||
# CONFIG_PROVE_LOCKING is not set
 | 
			
		||||
# CONFIG_DEBUG_SPINLOCK is not set
 | 
			
		||||
# CONFIG_PROVE_RCU is not set
 | 
			
		||||
# CONFIG_PROVE_RCU_REPEATEDLY is not set
 | 
			
		||||
CONFIG_DEBUG_PER_CPU_MAPS=y
 | 
			
		||||
# CONFIG_DEBUG_PER_CPU_MAPS is not set
 | 
			
		||||
CONFIG_CPUMASK_OFFSTACK=y
 | 
			
		||||
 | 
			
		||||
CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
 | 
			
		||||
# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_FAULT_INJECTION=y
 | 
			
		||||
CONFIG_FAILSLAB=y
 | 
			
		||||
CONFIG_FAIL_PAGE_ALLOC=y
 | 
			
		||||
CONFIG_FAIL_MAKE_REQUEST=y
 | 
			
		||||
CONFIG_FAULT_INJECTION_DEBUG_FS=y
 | 
			
		||||
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 | 
			
		||||
CONFIG_FAIL_IO_TIMEOUT=y
 | 
			
		||||
CONFIG_FAIL_MMC_REQUEST=y
 | 
			
		||||
# CONFIG_FAULT_INJECTION is not set
 | 
			
		||||
# CONFIG_FAILSLAB is not set
 | 
			
		||||
# CONFIG_FAIL_PAGE_ALLOC is not set
 | 
			
		||||
# CONFIG_FAIL_MAKE_REQUEST is not set
 | 
			
		||||
# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
 | 
			
		||||
# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
 | 
			
		||||
# CONFIG_FAIL_IO_TIMEOUT is not set
 | 
			
		||||
# CONFIG_FAIL_MMC_REQUEST is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_LOCK_STAT=y
 | 
			
		||||
# CONFIG_LOCK_STAT is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_STACK_USAGE=y
 | 
			
		||||
# CONFIG_DEBUG_STACK_USAGE is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_ACPI_DEBUG=y
 | 
			
		||||
# CONFIG_ACPI_DEBUG is not set
 | 
			
		||||
# CONFIG_ACPI_DEBUGGER is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_SG=y
 | 
			
		||||
CONFIG_DEBUG_PI_LIST=y
 | 
			
		||||
# CONFIG_DEBUG_SG is not set
 | 
			
		||||
# CONFIG_DEBUG_PI_LIST is not set
 | 
			
		||||
 | 
			
		||||
# CONFIG_PAGE_EXTENSION is not set
 | 
			
		||||
# CONFIG_PAGE_OWNER is not set
 | 
			
		||||
# CONFIG_DEBUG_PAGEALLOC is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_OBJECTS=y
 | 
			
		||||
# CONFIG_DEBUG_OBJECTS is not set
 | 
			
		||||
# CONFIG_DEBUG_OBJECTS_SELFTEST is not set
 | 
			
		||||
CONFIG_DEBUG_OBJECTS_FREE=y
 | 
			
		||||
CONFIG_DEBUG_OBJECTS_TIMERS=y
 | 
			
		||||
CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
 | 
			
		||||
# CONFIG_DEBUG_OBJECTS_FREE is not set
 | 
			
		||||
# CONFIG_DEBUG_OBJECTS_TIMERS is not set
 | 
			
		||||
# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set
 | 
			
		||||
CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 | 
			
		||||
 | 
			
		||||
CONFIG_X86_PTDUMP=y
 | 
			
		||||
CONFIG_ARM64_PTDUMP=y
 | 
			
		||||
CONFIG_EFI_PGT_DUMP=y
 | 
			
		||||
# CONFIG_ARM64_PTDUMP is not set
 | 
			
		||||
# CONFIG_EFI_PGT_DUMP is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_CAN_DEBUG_DEVICES=y
 | 
			
		||||
# CONFIG_CAN_DEBUG_DEVICES is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_MODULE_FORCE_UNLOAD=y
 | 
			
		||||
# CONFIG_MODULE_FORCE_UNLOAD is not set
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_NOTIFIERS=y
 | 
			
		||||
# CONFIG_DEBUG_NOTIFIERS is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DMA_API_DEBUG=y
 | 
			
		||||
# CONFIG_DMA_API_DEBUG is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_MMIOTRACE=y
 | 
			
		||||
# CONFIG_MMIOTRACE is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_CREDENTIALS=y
 | 
			
		||||
# CONFIG_DEBUG_CREDENTIALS is not set
 | 
			
		||||
 | 
			
		||||
# off in both production debug and nodebug builds,
 | 
			
		||||
#  on in rawhide nodebug builds
 | 
			
		||||
CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 | 
			
		||||
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_EXT4_DEBUG=y
 | 
			
		||||
# CONFIG_EXT4_DEBUG is not set
 | 
			
		||||
 | 
			
		||||
# CONFIG_XFS_WARN is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_PERF_USE_VMALLOC=y
 | 
			
		||||
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_JBD2_DEBUG=y
 | 
			
		||||
# CONFIG_JBD2_DEBUG is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_NFSD_FAULT_INJECTION=y
 | 
			
		||||
# CONFIG_NFSD_FAULT_INJECTION is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_BLK_CGROUP=y
 | 
			
		||||
# CONFIG_DEBUG_BLK_CGROUP is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DRBD_FAULT_INJECTION=y
 | 
			
		||||
# CONFIG_DRBD_FAULT_INJECTION is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_ATH_DEBUG=y
 | 
			
		||||
CONFIG_CARL9170_DEBUGFS=y
 | 
			
		||||
CONFIG_IWLWIFI_DEVICE_TRACING=y
 | 
			
		||||
# CONFIG_ATH_DEBUG is not set
 | 
			
		||||
# CONFIG_CARL9170_DEBUGFS is not set
 | 
			
		||||
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
 | 
			
		||||
 | 
			
		||||
# CONFIG_RTLWIFI_DEBUG is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_OBJECTS_WORK=y
 | 
			
		||||
# CONFIG_DEBUG_OBJECTS_WORK is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DMADEVICES_DEBUG=y
 | 
			
		||||
# CONFIG_DMADEVICES_DEBUG is not set
 | 
			
		||||
# CONFIG_DMADEVICES_VDEBUG is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_PM_ADVANCED_DEBUG=y
 | 
			
		||||
 | 
			
		||||
CONFIG_CEPH_LIB_PRETTYDEBUG=y
 | 
			
		||||
CONFIG_QUOTA_DEBUG=y
 | 
			
		||||
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
 | 
			
		||||
# CONFIG_QUOTA_DEBUG is not set
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
CONFIG_KGDB_KDB=y
 | 
			
		||||
@ -104,18 +104,18 @@ CONFIG_KDB_DEFAULT_ENABLE=0x0
 | 
			
		||||
CONFIG_KDB_KEYBOARD=y
 | 
			
		||||
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
 | 
			
		||||
# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
 | 
			
		||||
# CONFIG_PERCPU_TEST is not set
 | 
			
		||||
CONFIG_TEST_LIST_SORT=y
 | 
			
		||||
# CONFIG_TEST_LIST_SORT is not set
 | 
			
		||||
# CONFIG_TEST_STRING_HELPERS is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DETECT_HUNG_TASK=y
 | 
			
		||||
# CONFIG_DETECT_HUNG_TASK is not set
 | 
			
		||||
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 | 
			
		||||
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 | 
			
		||||
# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_DEBUG_KMEMLEAK=y
 | 
			
		||||
# CONFIG_DEBUG_KMEMLEAK is not set
 | 
			
		||||
CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
 | 
			
		||||
# CONFIG_DEBUG_KMEMLEAK_TEST is not set
 | 
			
		||||
CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 | 
			
		||||
@ -126,4 +126,4 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 | 
			
		||||
 | 
			
		||||
# CONFIG_SPI_DEBUG is not set
 | 
			
		||||
 | 
			
		||||
CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
 | 
			
		||||
# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 | 
			
		||||
 | 
			
		||||
@ -365,7 +365,7 @@ CONFIG_SP5100_TCO=m
 | 
			
		||||
 | 
			
		||||
# CONFIG_MEMTEST is not set
 | 
			
		||||
# CONFIG_DEBUG_TLBFLUSH is not set
 | 
			
		||||
CONFIG_MAXSMP=y
 | 
			
		||||
# CONFIG_MAXSMP is not set
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
CONFIG_HP_ILO=m
 | 
			
		||||
 | 
			
		||||
@ -1,41 +0,0 @@
 | 
			
		||||
From 332faabbaab64876396be48f1a1cf72b31d53a9d Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Hans de Goede <hdegoede@redhat.com>
 | 
			
		||||
Date: Mon, 9 Nov 2015 17:09:05 +0100
 | 
			
		||||
Subject: [PATCH] ideapad-laptop: Add Lenovo Yoga 900 to no_hw_rfkill dmi list
 | 
			
		||||
 | 
			
		||||
Like some of the other Yoga models the Lenovo Yoga 900 does not have a
 | 
			
		||||
hw rfkill switch, and trying to read the hw rfkill switch through the
 | 
			
		||||
ideapad module causes it to always reported blocking breaking wifi.
 | 
			
		||||
 | 
			
		||||
This commit adds the Lenovo Yoga 900 to the no_hw_rfkill dmi list, fixing
 | 
			
		||||
the wifi breakage.
 | 
			
		||||
 | 
			
		||||
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1275490
 | 
			
		||||
Cc: stable@vger.kernel.org
 | 
			
		||||
Reported-and-tested-by: Kevin Fenzi <kevin@scrye.com>
 | 
			
		||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 | 
			
		||||
---
 | 
			
		||||
 drivers/platform/x86/ideapad-laptop.c | 7 +++++++
 | 
			
		||||
 1 file changed, 7 insertions(+)
 | 
			
		||||
 | 
			
		||||
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
 | 
			
		||||
index fce49f3c6ed6..d4a48b4d161a 100644
 | 
			
		||||
--- a/drivers/platform/x86/ideapad-laptop.c
 | 
			
		||||
+++ b/drivers/platform/x86/ideapad-laptop.c
 | 
			
		||||
@@ -873,6 +873,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
 | 
			
		||||
 			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3 Pro-1370"),
 | 
			
		||||
 		},
 | 
			
		||||
 	},
 | 
			
		||||
+	{
 | 
			
		||||
+		.ident = "Lenovo Yoga 900",
 | 
			
		||||
+		.matches = {
 | 
			
		||||
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
 | 
			
		||||
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 900"),
 | 
			
		||||
+		},
 | 
			
		||||
+	},
 | 
			
		||||
 	{}
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
-- 
 | 
			
		||||
2.4.3
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										18
									
								
								kernel.spec
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								kernel.spec
									
									
									
									
									
								
							@ -65,9 +65,9 @@ Summary: The Linux kernel
 | 
			
		||||
# The next upstream release sublevel (base_sublevel+1)
 | 
			
		||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 | 
			
		||||
# The rc snapshot level
 | 
			
		||||
%define rcrev 0
 | 
			
		||||
%define rcrev 1
 | 
			
		||||
# The git snapshot level
 | 
			
		||||
%define gitrev 9
 | 
			
		||||
%define gitrev 0
 | 
			
		||||
# Set rpm version accordingly
 | 
			
		||||
%define rpmversion 4.%{upstream_sublevel}.0
 | 
			
		||||
%endif
 | 
			
		||||
@ -122,7 +122,7 @@ Summary: The Linux kernel
 | 
			
		||||
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
 | 
			
		||||
#  and 0 for rawhide (all kernels are debug kernels).
 | 
			
		||||
# See also 'make debug' and 'make release'.
 | 
			
		||||
%define debugbuildsenabled 0
 | 
			
		||||
%define debugbuildsenabled 1
 | 
			
		||||
 | 
			
		||||
# Want to build a vanilla kernel build without any non-upstream patches?
 | 
			
		||||
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
 | 
			
		||||
@ -588,11 +588,8 @@ Patch510: 0001-iwlwifi-Add-new-PCI-IDs-for-the-8260-series.patch
 | 
			
		||||
#CVE-2015-7990 rhbz 1276437 1276438
 | 
			
		||||
Patch511: RDS-fix-race-condition-when-sending-a-message-on-unb.patch
 | 
			
		||||
 | 
			
		||||
#rhbz 1269300
 | 
			
		||||
Patch552: megaraid_sas-Do-not-use-PAGE_SIZE-for-max_sectors.patch
 | 
			
		||||
 | 
			
		||||
#rhbz 1275490
 | 
			
		||||
Patch553: ideapad-laptop-Add-Lenovo-Yoga-900-to-no_hw_rfkill-d.patch
 | 
			
		||||
#rhbz 1281674
 | 
			
		||||
Patch512: set_features_failure.patch
 | 
			
		||||
 | 
			
		||||
# END OF PATCH DEFINITIONS
 | 
			
		||||
 | 
			
		||||
@ -2037,6 +2034,11 @@ fi
 | 
			
		||||
#
 | 
			
		||||
# 
 | 
			
		||||
%changelog
 | 
			
		||||
* Mon Nov 16 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc1.git0.1
 | 
			
		||||
- Linux v4.4-rc1
 | 
			
		||||
- Disable debugging options.
 | 
			
		||||
- Add potential fix for set_features breakage in networking
 | 
			
		||||
 | 
			
		||||
* Fri Nov 13 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git9.1
 | 
			
		||||
- Linux v4.3-11742-gf6d07df
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,50 +0,0 @@
 | 
			
		||||
From c6f081c88ab76d5a40365b94c1f5839e099b2b2b Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: "sumit.saxena@avagotech.com" <sumit.saxena@avagotech.com>
 | 
			
		||||
Date: Thu, 15 Oct 2015 13:40:04 +0530
 | 
			
		||||
Subject: [PATCH] megaraid_sas: Do not use PAGE_SIZE for max_sectors
 | 
			
		||||
 | 
			
		||||
Do not use PAGE_SIZE marco to calculate max_sectors per I/O
 | 
			
		||||
request. Driver code assumes PAGE_SIZE will be always 4096 which can
 | 
			
		||||
lead to wrongly calculated value if PAGE_SIZE is not 4096. This issue
 | 
			
		||||
was reported in Ubuntu Bugzilla Bug #1475166.
 | 
			
		||||
 | 
			
		||||
Cc: <stable@vger.kernel.org>
 | 
			
		||||
Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
 | 
			
		||||
Signed-off-by: Kashyap Desai <kashyap.desai@avagotech.com>
 | 
			
		||||
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
 | 
			
		||||
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
 | 
			
		||||
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
 | 
			
		||||
---
 | 
			
		||||
 drivers/scsi/megaraid/megaraid_sas.h      | 2 ++
 | 
			
		||||
 drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
 | 
			
		||||
 2 files changed, 3 insertions(+), 1 deletion(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
 | 
			
		||||
index 20c37541963f..ebf821b94cb6 100644
 | 
			
		||||
--- a/drivers/scsi/megaraid/megaraid_sas.h
 | 
			
		||||
+++ b/drivers/scsi/megaraid/megaraid_sas.h
 | 
			
		||||
@@ -364,6 +364,8 @@ enum MR_EVT_ARGS {
 | 
			
		||||
 	MR_EVT_ARGS_GENERIC,
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
+
 | 
			
		||||
+#define SGE_BUFFER_SIZE	4096
 | 
			
		||||
 /*
 | 
			
		||||
  * define constants for device list query options
 | 
			
		||||
  */
 | 
			
		||||
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
 | 
			
		||||
index eaa81e552fd2..a9eb10ebc6ed 100644
 | 
			
		||||
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
 | 
			
		||||
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
 | 
			
		||||
@@ -4752,7 +4752,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
 	instance->max_sectors_per_req = instance->max_num_sge *
 | 
			
		||||
-						PAGE_SIZE / 512;
 | 
			
		||||
+						SGE_BUFFER_SIZE / 512;
 | 
			
		||||
 	if (tmp_sectors && (instance->max_sectors_per_req > tmp_sectors))
 | 
			
		||||
 		instance->max_sectors_per_req = tmp_sectors;
 | 
			
		||||
 
 | 
			
		||||
-- 
 | 
			
		||||
2.4.3
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										79
									
								
								set_features_failure.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										79
									
								
								set_features_failure.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,79 @@
 | 
			
		||||
From aab370e4fd0c3506ad759e74bb383aa4fc540cc1 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
 | 
			
		||||
Date: Fri, 13 Nov 2015 11:51:17 +0100
 | 
			
		||||
Subject: [PATCH] net/core: ensure features get disabled on new lower devs
 | 
			
		||||
 | 
			
		||||
On 11/13/2015 11:29 AM, Jiri Pirko wrote:
 | 
			
		||||
> Fri, Nov 13, 2015 at 01:26:18AM CET, f.fainelli@gmail.com wrote:
 | 
			
		||||
>> On 04/11/15 18:56, David Miller wrote:
 | 
			
		||||
>>>> Fixes: fd867d51f889 ("net/core: generic support for disabling netdev features down stack")
 | 
			
		||||
>>>  ...
 | 
			
		||||
>>>> Reported-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
 | 
			
		||||
>>>> Signed-off-by: Jarod Wilson <jarod@redhat.com>
 | 
			
		||||
>>>> ---
 | 
			
		||||
>>>> v2: Based on suggestions from Alex, and with not changing err to ret, this
 | 
			
		||||
>>>> patch actually becomes quite minimal and doesn't ugly up the code much.
 | 
			
		||||
>>>
 | 
			
		||||
>>> Applied, thanks.
 | 
			
		||||
>>
 | 
			
		||||
>> This causes some warnings to be displayed for DSA stacked devices:
 | 
			
		||||
>>
 | 
			
		||||
>> [    1.272297] brcm-sf2 f0b00000.ethernet_switch: Starfighter 2 top:
 | 
			
		||||
>> 4.00, core: 2.00 base: 0xf0c80000, IRQs: 68, 69
 | 
			
		||||
>> [    1.283181] libphy: dsa slave smi: probed
 | 
			
		||||
>> [    1.344088] f0b403c0.mdio:05: Broadcom BCM7445 PHY revision: 0xd0,
 | 
			
		||||
>> patch: 3
 | 
			
		||||
>> [    1.658917] brcm-sf2 f0b00000.ethernet_switch gphy (uninitialized):
 | 
			
		||||
>> attached PHY at address 5 [Broadcom BCM7445]
 | 
			
		||||
>> [    1.669414] brcm-sf2 f0b00000.ethernet_switch gphy: set_features()
 | 
			
		||||
>> failed (-1); wanted 0x0000000000004020, left 0x0000000000004820
 | 
			
		||||
>> [    1.734202] brcm-sf2 f0b00000.ethernet_switch rgmii_1
 | 
			
		||||
>> (uninitialized): attached PHY at address 0 [Generic PHY]
 | 
			
		||||
>> [    1.744486] brcm-sf2 f0b00000.ethernet_switch rgmii_1: set_features()
 | 
			
		||||
>> failed (-1); wanted 0x0000000000004020, left 0x0000000000004820
 | 
			
		||||
>> [    1.809091] brcm-sf2 f0b00000.ethernet_switch rgmii_2
 | 
			
		||||
>> (uninitialized): attached PHY at address 1 [Generic PHY]
 | 
			
		||||
>> [    1.819364] brcm-sf2 f0b00000.ethernet_switch rgmii_2: set_features()
 | 
			
		||||
>> failed (-1); wanted 0x0000000000004020, left 0x0000000000004820
 | 
			
		||||
>> [    1.884090] brcm-sf2 f0b00000.ethernet_switch moca (uninitialized):
 | 
			
		||||
>> attached PHY at address 2 [Generic PHY]
 | 
			
		||||
>> [    1.894109] brcm-sf2 f0b00000.ethernet_switch moca: set_features()
 | 
			
		||||
>> failed (-1); wanted 0x0000000000004020, left 0x0000000000004820
 | 
			
		||||
>>
 | 
			
		||||
>> DSA slave network devices are not associated with their master network
 | 
			
		||||
>> device using the typical lower/upper netdev helpers.
 | 
			
		||||
>>
 | 
			
		||||
>> I do not have a good fix to come up with yet, but if you see something
 | 
			
		||||
>> obvious with net/dsa/slave.c, feel free to send patches for testing, I
 | 
			
		||||
>> can boot net-next on this platform.
 | 
			
		||||
>
 | 
			
		||||
> I'm having similar issues with bridge, with linus's git now:
 | 
			
		||||
>
 | 
			
		||||
[snip]
 | 
			
		||||
 | 
			
		||||
Hmm, I think it's because the bridge and dsa/slave don't have ndo_set_features()
 | 
			
		||||
so err is left as -1 and thus an error is reported which isn't actually true.
 | 
			
		||||
Before in this case the features would just get set, so could you please try
 | 
			
		||||
the following patch ?
 | 
			
		||||
 | 
			
		||||
Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
 | 
			
		||||
---
 | 
			
		||||
 net/core/dev.c | 2 ++
 | 
			
		||||
 1 file changed, 2 insertions(+)
 | 
			
		||||
 | 
			
		||||
diff --git a/net/core/dev.c b/net/core/dev.c
 | 
			
		||||
index ab9b8d0..4a1d198 100644
 | 
			
		||||
--- a/net/core/dev.c
 | 
			
		||||
+++ b/net/core/dev.c
 | 
			
		||||
@@ -6426,6 +6426,8 @@ int __netdev_update_features(struct net_device *dev)
 | 
			
		||||
 
 | 
			
		||||
 	if (dev->netdev_ops->ndo_set_features)
 | 
			
		||||
 		err = dev->netdev_ops->ndo_set_features(dev, features);
 | 
			
		||||
+	else
 | 
			
		||||
+		err = 0;
 | 
			
		||||
 
 | 
			
		||||
 	if (unlikely(err < 0)) {
 | 
			
		||||
 		netdev_err(dev,
 | 
			
		||||
-- 
 | 
			
		||||
2.5.0
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user