Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GIT 3b55c3c0ec2eb3f163f15559f3962df717f53ccb commit 8dec067dc9c59f9fdcaf4357c22994cde3647eb8 Author: Tomasz Figa <[email protected]> Date: Fri Mar 21 02:59:30 2014 +0900 ARM: EXYNOS: Fix compilation error in cpuidle.c The big series refactoring Exynos suspend to RAM handling missed the cpuidle driver that is disabled in exynos_defconfig, leaving it including old mach/pm_core.h header and using old s3c_cpu_resume symbol instead of new exynos_cpu_resume, resulting in compilation failures with CONFIG_ARCH_EXYNOS and CONFIG_CPU_IDLE enabled. This patch fixes that silly mistake and performs necessary modification to arhc/arm/exynos/cpuidle.c to make it compile again. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 58f37b0d47e9839fc8ef90d712594ed55cfcb2c7 Author: Tomasz Figa <[email protected]> Date: Fri Mar 21 03:22:33 2014 +0900 ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h This patch fixes compilation failure due to missing explicit inclusion of linux/serial_s3c.h in mach/pm-core.h, which contains definitions required for further code in this header. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit b2cde2cc71f2382e4a4bfaaacd5263bd93f1e0d2 Author: Florian Fainelli <[email protected]> Date: Thu Mar 20 10:53:23 2014 -0700 net: bcmgenet: manipulate netdev_queue directly Instead of always invoking netdev_get_tx_queue() in bcmgenet_xmit() and bcmgenet_tx_reclaim(), just get the corresponding netdev_queue pointer once and for all and manipulate it throughout bcmgenet_xmit() and bcmgenet_tx_reclaim(). Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit d5c76f628d399f06785b0ee910c431770a01b807 Author: Florian Fainelli <[email protected]> Date: Thu Mar 20 10:53:22 2014 -0700 net: bcmgenet: remove bogus tx queue checks netdev_pick_tx already takes care of making sure that a given skb->queue_mapping value will remain within the number of advertised hardware queue number, there is no need to re-do this again in the driver. Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit d03825fba459d0d58e4fe162439babfc5f5eabc4 Author: Florian Fainelli <[email protected]> Date: Thu Mar 20 10:53:21 2014 -0700 net: bcmgenet: add skb_tx_timestamp call The BCMGENET driver was not TX timestamping the SKBs it queued for transmission, do this in bcmgenet_xmit() right before kicking the Transmit DMA engine. Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 9460c936794fbcf82623e263926b17334ca5887a Author: Florian Fainelli <[email protected]> Date: Thu Mar 20 10:53:20 2014 -0700 net: bcmgenet: remove unused spinlock member The spinlock cookie in bcmgenet_priv is never used, get rid of it. Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit f738a13d8365b0f824f3f20450b413f55374f175 Author: Laurent Pinchart <[email protected]> Date: Thu Mar 20 15:00:35 2014 +0100 sh_eth: Remove goto statements that jump straight to a return "goto" is well accepted for error paths in the kernel but should not be used unnecessarily. Return the correct value directly instead of using a goto when possible. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit daacf03f0bbfefee3df107c3f7659d22e22538a7 Author: Laurent Pinchart <[email protected]> Date: Thu Mar 20 15:00:34 2014 +0100 sh_eth: Register MDIO bus before registering the network device Network API functions that rely on the MDIO bus can be called as soon as the driver calls register_netdev(). Register the MDIO bus before the network device to avoid race conditions. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit bd920ff553ba17f19372501a14e432d9d92b102b Author: Laurent Pinchart <[email protected]> Date: Thu Mar 20 15:00:33 2014 +0100 sh_eth: Simplify MDIO bus initialization and release The network device passed to the sh_mdio_init and sh_mdio_release functions is only used to access the sh_eth_private instance. Pass it directly to those functions. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit a5bd60608936fbb84471a80592401ce29a68de71 Author: Laurent Pinchart <[email protected]> Date: Thu Mar 20 15:00:32 2014 +0100 sh_eth: Use the platform device as the MDIO bus parent The MDIO bus parent is set to the network device. Beside not reflecting the hardware topology, this prevents registering the MDIO bus before initializing the network device. Fix it by setting the MDIO bus parent to the platform device. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit aa8d422510969b705656e49fc0166d862aca9246 Author: Laurent Pinchart <[email protected]> Date: Thu Mar 20 15:00:31 2014 +0100 sh_eth: Use the platform device for memory allocation Memory allocated for the MDIO bus with the devm_kzalloc() API is associated with the network device. While this will cause memory to be freed at the right time, it doesn't allow allocating memory before the network device is initialized. Replace the network device with the parent platform device for memory allocation to remove that dependency. This also improves consistency with the other devm_* calls in the driver that all use the platform device. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 54af36e7136b5e111734ca5b06c6b4390d663cac Author: Alexander Aring <[email protected]> Date: Thu Mar 20 14:57:03 2014 +0100 ieee802154: dgram: cleanup set of broadcast panid This patch is only a cleanup to use the right define for a panid field. The broadcast address and panid broadcast is still the same value. Signed-off-by: Alexander Aring <[email protected]> Cc: Phoebe Buckheister <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 06324f2f7c21e3ba3529546063a3ebf7da806ed0 Author: Alexander Aring <[email protected]> Date: Thu Mar 20 14:57:02 2014 +0100 af_ieee802154: fix check on broadcast address This patch fixes an issue which was introduced by commit b70ab2e87f17176d18f67ef331064441a032b5f3 ("ieee802154: enforce consistent endianness in the 802.15.4 stack"). The correct behaviour should be a check on the broadcast address field which is 0xffff. Signed-off-by: Alexander Aring <[email protected]> Reported-by: Jan Luebbe <[email protected]> Cc: Phoebe Buckheister <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 3c6f5592203e8126b70717f040c6c59f953068b3 Author: Jason Gunthorpe <[email protected]> Date: Wed Mar 19 16:15:24 2014 -0600 of_mdio: Allow the DT to specify the phy ID and avoid autoprobing This makes the generic of_mdiobus_register parse the DT compatible string for the pattern ethernet-phy-idAAAA.BBBB. If present it should be a value that matches the phy-id register normally readable through MDIO. When the ID is given the phy autoprobing is defeated and the phy is created directly. This is necessary to support phy's that cannot be autoprobed when of_mdiobus_register is called. Specifically, my case has the phy in reset at of_mdiobus_register, the reset is only released once the ethernet driver starts, before it attaches to the phy. Tested on ARM Kirkwood with phy id 0x01410e90 (Marvell 88E1318) Signed-off-by: Jason Gunthorpe <[email protected]> Acked-by: Florian Fainelli <[email protected]> Acked-by: Rob Herring <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit f00e756ed12d3204583764c93e41b89e1ae7ee44 Author: Jason Gunthorpe <[email protected]> Date: Wed Mar 19 16:15:23 2014 -0600 dt: Document a compatible entry for MDIO ethernet Phys This describes a compatible entry of the form: ethernet-phy-idAAAA,BBBB Which is modelled after the PCI structured compatible entry (pciVVVV,DDDD.SSSS.ssss.RR) If present the OF core will be able to use this information to directly create the correct phy without auto probing the bus. Signed-off-by: Jason Gunthorpe <[email protected]> Acked-by: Rob Herring <[email protected]> Acked-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 259fef033ffe4e70bf7f358c53400a09f1b5384e Author: Ben Chan <[email protected]> Date: Wed Mar 19 14:00:06 2014 -0700 net: cdc_ncm: respect operator preferred MTU reported by MBIM According to "Universal Serial Bus Communications Class Subclass Specification for Mobile Broadband Interface Model, Revision 1.0, Errata-1" published by USB-IF, the wMTU field of the MBIM extended functional descriptor indicates the operator preferred MTU for IP data streams. This patch modifies cdc_ncm_setup to ensure that the MTU value set on the usbnet device does not exceed the operator preferred MTU indicated by wMTU if the MBIM device exposes a MBIM extended functional descriptor. Signed-off-by: Ben Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit bfe9b3f8c5229e5de4fd18e941866bc410d16334 Author: Ben Chan <[email protected]> Date: Wed Mar 19 14:00:05 2014 -0700 USB: cdc: add MBIM extended functional descriptor structure This patch adds the MBIM extended functional descriptor structure defined in "Universal Serial Bus Communications Class Subclass Specification for Mobile Broadband Interface Model, Revision 1.0, Errata-1" published by USB-IF. Signed-off-by: Ben Chan <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit f518338b16038beeb73e155e60d0f70beb9379f4 Author: Nicolas Dichtel <[email protected]> Date: Wed Mar 19 17:47:51 2014 +0100 ip6mr: fix mfc notification flags Commit 812e44dd1829 ("ip6mr: advertise new mfc entries via rtnl") reuses the function ip6mr_fill_mroute() to notify mfc events. But this function was used only for dump and thus was always setting the flag NLM_F_MULTI, which is wrong in case of a single notification. Libraries like libnl will wait forever for NLMSG_DONE. CC: Thomas Graf <[email protected]> Signed-off-by: Nicolas Dichtel <[email protected]> Acked-by: Thomas Graf <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 65886f439ab0fdc2dff20d1fa87afb98c6717472 Author: Nicolas Dichtel <[email protected]> Date: Wed Mar 19 17:47:50 2014 +0100 ipmr: fix mfc notification flags Commit 8cd3ac9f9b7b ("ipmr: advertise new mfc entries via rtnl") reuses the function ipmr_fill_mroute() to notify mfc events. But this function was used only for dump and thus was always setting the flag NLM_F_MULTI, which is wrong in case of a single notification. Libraries like libnl will wait forever for NLMSG_DONE. CC: Thomas Graf <[email protected]> Signed-off-by: Nicolas Dichtel <[email protected]> Acked-by: Thomas Graf <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 1c104a6bebf3c16b6248408b84f91d09ac8a26b6 Author: Nicolas Dichtel <[email protected]> Date: Wed Mar 19 17:47:49 2014 +0100 rtnetlink: fix fdb notification flags Commit 3ff661c38c84 ("net: rtnetlink notify events for FDB NTF_SELF adds and deletes") reuses the function nlmsg_populate_fdb_fill() to notify fdb events. But this function was used only for dump and thus was always setting the flag NLM_F_MULTI, which is wrong in case of a single notification. Libraries like libnl will wait forever for NLMSG_DONE. CC: Thomas Graf <[email protected]> Signed-off-by: Nicolas Dichtel <[email protected]> Acked-by: Thomas Graf <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 632623153196bf183a69686ed9c07eee98ff1bf8 Author: Eric Dumazet <[email protected]> Date: Wed Mar 19 21:02:21 2014 -0700 tcp: syncookies: do not use getnstimeofday() While it is true that getnstimeofday() uses about 40 cycles if TSC is available, it can use 1600 cycles if hpet is the clocksource. Switch to get_jiffies_64(), as this is more than enough, and go back to 60 seconds periods. Fixes: 8c27bd75f04f ("tcp: syncookies: reduce cookie lifetime to 128 seconds") Signed-off-by: Eric Dumazet <[email protected]> Cc: Florian Westphal <[email protected]> Acked-by: Florian Westphal <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit dd41cc3bb90efd455df514899a5d3cf245182eb1 Author: Matan Barak <[email protected]> Date: Wed Mar 19 18:11:53 2014 +0200 net/mlx4: Adapt num_vfs/probed_vf params for single port VF A new syntax is added for the module parameters num_vfs and probe_vf. num_vfs=p1,p2,p1+p2 probe_bf=p1,p2,p1+p2 Where p1(2) is the number of VFs on / probed VFs for physical port1(2) and p1+p2 is the number of dual port VFs. Single port VFs are currently supported only when the link type for both ports of the device is Ethernet. Signed-off-by: Matan Barak <[email protected]> Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 449fc48866f7d84b0d9a19201de18a4dd4d3488c Author: Matan Barak <[email protected]> Date: Wed Mar 19 18:11:52 2014 +0200 net/mlx4: Adapt code for N-Port VF Adds support for N-Port VFs, this includes: 1. Adding support in the wrapped FW command In wrapped commands, we need to verify and convert the slave's port into the real physical port. Furthermore, when sending the response back to the slave, a reverse conversion should be made. 2. Adjusting sqpn for QP1 para-virtualization The slave assumes that sqpn is used for QP1 communication. If the slave is assigned to a port != (first port), we need to adjust the sqpn that will direct its QP1 packets into the correct endpoint. 3. Adjusting gid[5] to modify the port for raw ethernet In B0 steering, gid[5] contains the port. It needs to be adjusted into the physical port. 4. Adjusting number of ports in the query / ports caps in the FW commands When a slave queries the hardware, it needs to view only the physical ports it's assigned to. 5. Adjusting the sched_qp according to the port number The QP port is encoded in the sched_qp, thus in modify_qp we need to encode the correct port in sched_qp. Signed-off-by: Matan Barak <[email protected]> Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit f74462acf8f390528c8b7937f227c6c90d017f3b Author: Matan Barak <[email protected]> Date: Wed Mar 19 18:11:51 2014 +0200 net/mlx4: Add utils for N-Port VFs This patch adds the following utils: 1. Convert slave_id -> VF 2. Get the active ports by slave_id 3. Convert slave's port to real port 4. Get the slave's port from real port 5. Get all slaves that uses the i'th real port 6. Get all slaves that uses the i'th real port exclusively Signed-off-by: Matan Barak <[email protected]> Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 1ab95d37bcc3ff2d69e3871e4f056bab7aed0b85 Author: Matan Barak <[email protected]> Date: Wed Mar 19 18:11:50 2014 +0200 net/mlx4: Add data structures to support N-Ports per VF Adds the required data structures to support VFs with N (1 or 2) ports instead of always using the number of physical ports. Signed-off-by: Matan Barak <[email protected]> Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 82373701be26b893eaf7372db0af84235a51998a Author: Matan Barak <[email protected]> Date: Wed Mar 19 18:11:49 2014 +0200 IB/mlx4_ib: Adapt code to use caps.num_ports instead of a constant Some code in the mlx4 IB driver stack assumed MLX4_MAX_PORTS ports. Instead, we should only loop until the number of actual ports in i the device, which is stored in dev->caps.num_ports. Signed-off-by: Matan Barak <[email protected]> Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 8798998c2cdbc0df3c64e8845c1502ed93ef1ebd Author: Fabio Estevam <[email protected]> Date: Wed Mar 19 11:22:06 2014 -0300 smsc911x: Change clock warning message to debug level Since passing the clock is not mandatory, change the warning message to debug, so that we avoid getting the following clock failure message on every boot: smsc911x: Driver version 2008-10-21 smsc911x smsc911x (unregistered net_device): couldn't get clock -2 libphy: smsc911x-mdio: probed Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit e35bad5d876dc7b0bfd794a3ba328a442bd970e0 Author: Daniel Baluta <[email protected]> Date: Wed Mar 19 15:58:25 2014 +0200 net: remove empty lines from tcp_syn_flood_action Signed-off-by: Daniel Baluta <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit 1aa9c483d1be13831bc4e516ce4848d32ac3e944 Author: Sachin Kamat <[email protected]> Date: Fri Mar 21 04:49:03 2014 +0900 ARM: EXYNOS: Remove hardware.h file This is a dummy placeholder file. Delete it. Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 2bb1ad17d66da3549eb4d23e264786a98f9ab17b Author: Sachin Kamat <[email protected]> Date: Fri Mar 21 04:48:59 2014 +0900 ARM: SAMSUNG: Remove hardware.h inclusion The contents of this header file are not referenced anywhere in the included .c files except in devs.c. Remove its inclusion. For devs.c, explicitly include sizes.h header for SZ_* macros. Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 144bf7b0a96e28266c6b2f47a6e04c7a4e4b3aa4 Author: Sachin Kamat <[email protected]> Date: Fri Mar 21 04:48:07 2014 +0900 ARM: S3C24XX: Remove invalid code from hardware.h Remove the code that is not referenced anywhere. While at it also remove incorrect file path. Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 676141e48af7463717896352e69c10f945ac22dd Author: Jens Axboe <[email protected]> Date: Thu Mar 20 13:29:18 2014 -0600 blk-mq: don't dump CPU -> hw queue map on driver load Now that we are out of initial debug/bringup mode, remove the verbose dump of the mapping table. Provide the mapping table in sysfs, under the hardware queue directory, in the cpu_list file. Signed-off-by: Jens Axboe <[email protected]> commit 602408e3de70d132c115670a366f4c5ae657080c Author: Tushar Behera <[email protected]> Date: Fri Mar 21 04:31:30 2014 +0900 dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock Most of the clock related dt-binding header files are located in dt-bindings/clock folder. It would be good to keep all the similar header files at a single location. Signed-off-by: Tushar Behera <[email protected]> Reviewed-by: Sachin Kamat <[email protected]> Acked-by: Tomasz Figa <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 55ace6b285d7350d5b562ba065656c8242629a32 Author: Tushar Behera <[email protected]> Date: Fri Mar 21 04:26:40 2014 +0900 ARM: dts: Keep some essential LDOs enabled for arndale-octa board LDO3 and LDO23 need to be enabled in order for soft-reset to work. Additionally LDO9 needs to be enabled for USB operations. Signed-off-by: Tushar Behera <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 3da355c03a44bc45f3688bb68b51eefa738d1857 Author: Tushar Behera <[email protected]> Date: Fri Mar 21 04:26:40 2014 +0900 ARM: dts: Disable MDMA1 node for arndale-octa board MDMA1 can support both secure and non-secure AXI transactions. When this is enabled in the kernel for boards that run in secure mode, we get imprecise external aborts causing the kernel to oops. Unhandled fault: imprecise external abort (0x1406) at 0x00000000 Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000007 Suggested-by: Javi Merino <[email protected]> Signed-off-by: Tushar Behera <[email protected]> Tested-by: Javi Merino <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit e1a9d00c689a5da2d1baf273891507c5fb063f4c Author: Mark Brown <[email protected]> Date: Fri Mar 21 02:57:18 2014 +0900 ARM: S3C64XX: Fix build for implicit serial_s3c.h inclusion Some very recent change appears to have removed an implicit inclusion of serial_s3c.h causing build failures due to references to UART registers in the serial port restore code in next-20140318. Include it explicitly to fix the build. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit cf559ab94e058df65c841b4afc8d5346fdda19b3 Author: Mark Brown <[email protected]> Date: Fri Mar 21 02:55:11 2014 +0900 serial: s3c: Fix build of header without serial_core.h preinclusion serial_s3c.h uses upf_t which is defined in serial_core.h but does not include that itself meaning that users which include serial_s3c.h by itself don't build. Signed-off-by: Mark Brown <[email protected]> [t.figa: Moved inclusion under #ifndef __ASSEMBLY__ to fix mach-exynos] Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit dd8ac696b20c1be5ca4728045df10e882e01e91d Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:30 2014 +0900 ARM: EXYNOS: Allow wake-up using GIC interrupts This patch restores the ability to receive wake-up events from internal GIC interrupts, e.g. RTC tick or alarm interrupts. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit d710aa31874e2ff6e656dbd4807f4bd8d659eb93 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:27 2014 +0900 ARM: EXYNOS: Stop using legacy Samsung PM code Since Exynos SoCs does not follow most of the semantics of older SoCs when configuring the system to enter sleep, there is no reason to rely on the legacy Samsung PM core anymore. This patch adds local Exynos suspend ops and removes all the code left unnecessary. As a side effect, suspend support on Exynos becomes multiplatform-friendly. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 559ba237999d723ccba5b4a75cf6b280bac1ab21 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:22 2014 +0900 ARM: EXYNOS: Remove PM initcalls and useless indirection This patch simplifies Exynos PM initialization and makes it multiplatform friendly by replacing initcalls used originally to invoke all the initialization code with explicit function calls. In addition, an useless subsys_interface is removed, as all its .add_dev callback did was setting two function pointers. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit dbc5ca163dc46153a8e5249da627af571ae47c10 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:10 2014 +0900 ARM: EXYNOS: Fix abuse of CONFIG_PM CONFIG_PM means that at least one of CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME is enabled, while multiple entries in mach-exynos/Kconfig abused it to enable sleep- and runtime-specific functionality. This patch fixes this abuse by replacing dependencies on CONFIG_PM with appropriate dependencies on either CONFIG_PM_SLEEP or CONFIG_PM_RUNTIME, whichever is appropriate. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit f682426630c620a2b8ae488a4f0d85ec6c272d66 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:10 2014 +0900 ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h To allow using Samsung PM memory check helpers on platforms that do not use the legacy Samsung PM core, this patch moves prototypes of relevant functions to plat/pm-common.h header. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit b27899178c53226a5ff780a17657c84eb5e32338 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:10 2014 +0900 ARM: SAMSUNG: Move common save/restore helpers to separate file To separate legacy PM code from generic helpers, this patch moves the generic register save/restore helpers to a new file called pm-common.c that is compiled always when CONFIG_PM_SLEEP is enabled, to allow platforms that do not want to use the legacy PM code use the generic helpers. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 72551f6cf13e2f3a1d273b7007b5d7d7fd69c554 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:09 2014 +0900 ARM: SAMSUNG: Move Samsung PM debug code into separate file Not all Samsung SoC platforms are going to use the legacy Samsung PM code enabled by CONFIG_SAMSUNG_PM_DEBUG. To allow using Samsung PM debug helpers on such platforms, related code is moved to separate file and a plat/pm-common.h header is added to separate legacy and generic code. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit d38688a69fd88269eae3c7c66ec34fb02fb04fd1 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:09 2014 +0900 ARM: SAMSUNG: Consolidate PM debug functions This patch removes one-line functions that was used just to pass constant arguments to lower level functions. After previous patches the need for those constants has been eliminated, so the main functions can be called directly. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 99b2fc2b8b40256538332769f11f2fe6ee942f6c Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:09 2014 +0900 ARM: SAMSUNG: Use debug_ll_addr() to get UART base address This patch modifies Samsung PM debug helpers to use a multiplatform friendly way of getting base address of debug UART port, so instead of using a per-mach static macro, a generic debug_ll_addr() helper is used. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit de7fe0807c08553b88028d039861a4b8ad04fc62 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:09 2014 +0900 ARM: SAMSUNG: Save UART DIVSLOT register based on SoC type The only SoC that does not have DIVSLOT register is S3C2410, so instead of exporting a variable for platforms to set if DIVSLOT register should be preserved, it's enough to simply check whether we are running on a S3C2410 instead. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 04241069617d4f0bfd9f4a3aeefae13e1e5b55e1 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:09 2014 +0900 ARM: SAMSUNG: Add soc_is_s3c2410() helper Due to the S3C2410 SoC being quite different from other S3C24xx SoCs in some aspects, such as availability of DIVSLOT register in its UART blocks, there is a need sometimes to check whether we are running on this SoC, not just the S3C24xx series. This patch adds soc_is_s3c2410() helper function for this purpose. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 61557b8bac9c80a5c14d237d420c246703e5c2e2 Author: Tomasz Figa <[email protected]> Date: Tue Mar 18 07:28:09 2014 +0900 ARM: EXYNOS: Do not resume l2x0 if not enabled before suspend Trying to resume l2x0 if it was not enabled before suspend leads to system crash. This patch prevents this by checking if l2x0_regs_phys is a valid pointer to l2x0 context data saved on initialization. Signed-off-by: Tomasz Figa <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 56981fbc1b044cb140f70279deb736b6ae8664fb Author: Mike Snitzer <[email protected]> Date: Thu Mar 20 10:11:15 2014 -0400 dm cache: prevent corruption caused by discard_block_size > cache_block_size If the discard block size is larger than the cache block size we will not properly quiesce IO to a region that is about to be discarded. This results in a race between a cache migration where no copy is needed, and a write to an adjacent cache block that's within the same large discard block. Workaround this by limiting the discard_block_size to cache_block_size. Also limit the max_discard_sectors to cache_block_size. A more comprehensive fix that introduces range locking support in the bio_prison and proper quiescing of a discard range that spans multiple cache blocks is already in development. Reported-by: Morgan Mears <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Acked-by: Joe Thornber <[email protected]> Acked-by: Heinz Mauelshagen <[email protected]> Cc: [email protected] commit 88050049e7111f074e8887ba5a4cefc9f8fa8d41 Author: stephen hemminger <[email protected]> Date: Wed Mar 19 21:54:20 2014 -0700 netlink: fix setsockopt in mmap examples in documentation The documentation for how to use netlink mmap interface is incorrect. The calls to setsockopt() require an additional argument. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> commit f9b8c4c8baded129535d82d74df8e87a7a369f54 Author: Ben Pfaff <[email protected]> Date: Thu Mar 20 10:45:21 2014 -0700 openvswitch: Correctly report flow used times for first 5 minutes after boot. The kernel starts out its "jiffies" timer as 5 minutes below zero, as shown in include/linux/jiffies.h: /* * Have the 32 bit jiffies value wrap 5 minutes after boot * so jiffies wrap bugs show up earlier. */ #define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ)) The loop in ovs_flow_stats_get() starts out with 'used' set to 0, then takes any "later" time. This means that for the first five minutes after boot, flows will always be reported as never used, since 0 is greater than any time already seen. Signed-off-by: Ben Pfaff <[email protected]> Acked-by: Pravin B Shelar <[email protected]> Signed-off-by: Jesse Gross <[email protected]> commit 494314c415e2d3b308f57c9245ae6525166c70b8 Author: Trond Myklebust <[email protected]> Date: Thu Mar 20 12:59:09 2014 -0400 SUNRPC: rpc_restart_call/rpc_restart_call_prepare should clear task->tk_status When restarting an rpc call, we should not be carrying over data from the previous call. Signed-off-by: Trond Myklebust <[email protected]> commit 6bd144160a5554e4af052c153a094c4851a4c6aa Author: Trond Myklebust <[email protected]> Date: Thu Mar 20 12:53:54 2014 -0400 SUNRPC: Don't let rpc_delay() clobber non-timeout errors Signed-off-by: Trond Myklebust <[email protected]> commit d614f6d0bed7fa5a795708a6dc334370e1ca7951 Author: Yan Burman <[email protected]> Date: Tue Mar 11 14:41:47 2014 +0200 IB/mad: Check and handle potential DMA mapping errors Running with DMA_API_DEBUG enabled and not checking for DMA mapping errors triggers a kernel stack trace with "DMA-API: device driver failed to check map error" message. Add these checks to the MAD module, both to be be more robust and also eliminate these false-positive stack traces. Signed-off-by: Yan Burman <[email protected]> Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 76cf9cbb68f3234f54c0a12bde6372911157c650 Author: Selvin Xavier <[email protected]> Date: Tue Mar 18 14:54:56 2014 +0530 RDMA/ocrdma: Unregister inet notifier when unloading ocrdma Unregister the inet notifier during ocrdma unload to avoid a panic after driver unload. Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 186f8ba062f796221d51077342f3ba5202838e9f Author: Dan Carpenter <[email protected]> Date: Thu Jan 30 15:12:31 2014 +0300 IB/qib: Cleanup qib_register_observer() Returning directly is easier to read than do-nothing gotos. Remove the duplicative check on "olp" and pull the code in one indent level. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Mike Marciniszyn <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 49c0e2414b20d868cf006addf14152570aef2605 Author: CQ Tang <[email protected]> Date: Thu Jan 30 17:36:00 2014 -0500 IB/qib: Change SDMA progression mode depending on single- or multi-rail Improve performance by changing the behavour of the driver when all SDMA descriptors are in use, and the processes adding new descriptors are single- or multi-rail. For single-rail processes, the driver will block the call and finish posting all SDMA descriptors onto the hardware queue before returning back to PSM. Repeated kernel calls are slower than blocking. For multi-rail processes, the driver will return to PSM as quick as possible so PSM can feed packets to other rail. If all hardware queues are full, PSM will buffer the remaining SDMA descriptors until notified by interrupt that space is available. This patch builds a red-black tree to track the number rails opened by a particular PID. If the number is more than one, it is a multi-rail PSM process, otherwise, it is a single-rail process. Reviewed-by: Dean Luick <[email protected]> Reviewed-by: John A Gregor <[email protected]> Reviewed-by: Mitko Haralanov <[email protected]> Signed-off-by: CQ Tang <[email protected]> Signed-off-by: Mike Marciniszyn <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 8307281a5bceaaaa1566897dc0b57cdb62413ae8 Author: Roland Dreier <[email protected]> Date: Mon Mar 17 23:14:17 2014 -0700 RDMA/ocrdma: Fix warnings about pointer <-> integer casts We should cast pointers to and from unsigned long to turn them into ints. Signed-off-by: Roland Dreier <[email protected]> commit 0d3a1e7e317b06d87b92011c62a5061f299820b9 Author: Devesh Sharma <[email protected]> Date: Tue Feb 4 11:57:10 2014 +0530 RDMA/ocrdma: Code clean-up Clean up code. Also modifying GSI QP to error during ocrdma_close is fixed. Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 9a31758308df672713ea0db9a9eff7c3cb348bc2 Author: Selvin Xavier <[email protected]> Date: Tue Feb 4 11:57:09 2014 +0530 RDMA/ocrdma: Display FW version Adding a sysfs file for getting the FW version. Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit babe6b9ce0bdf964624435382a67c09f668bcab0 Author: Selvin Xavier <[email protected]> Date: Tue Feb 4 11:57:07 2014 +0530 RDMA/ocrdma: Query controller information Issue mailbox commands to query ocrdma controller information and phy information and print them while adding ocrdma device. Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 8bdb31b4d1931a32264fbe4651e607eb72941ff0 Author: Sachin Kamat <[email protected]> Date: Fri Mar 21 02:17:22 2014 +0900 ARM: dts: Update Exynos DT files with generic compatible strings Add generic compatible strings to the respective board DT files. Signed-off-by: Sachin Kamat <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 4868123ceb6ef0d4fa04e3211a0f4cd948f418f9 Author: Sachin Kamat <[email protected]> Date: Fri Mar 21 02:14:59 2014 +0900 ARM: EXYNOS: Add generic compatible strings Add generic compatible strings for Exynos4 and 5 platforms so that future SoCs can use them if there is nothing extra/specific to be differentiated. Signed-off-by: Sachin Kamat <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit cbf08b9ebdfc75bb13ef80ad3b8e3bea46d8c43a Author: Sachin Kamat <[email protected]> Date: Fri Mar 21 02:14:30 2014 +0900 ARM: EXYNOS: Consolidate exynos4 and exynos5 machine files Since there is very little difference between these two files, they can be easily combined into one with necessary SoC checks. While at it also merge the common.c file into this as it does not have any other users. Signed-off-by: Sachin Kamat <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 6eb84669cf7e94214593f162d4c1cf20424dd906 Author: Sachin Kamat <[email protected]> Date: Fri Mar 21 02:09:39 2014 +0900 ARM: EXYNOS: Consolidate CPU init code cpu_table was used to distinguish between different Exynos4 and 5 SoCs and based on the type do the initialization and io mapping. exynos_init is dummy and no longer needed as we do a DT based booting. By having a common io mapping function we can get rid of the whole table and avoid populating it for every SoC. Tested on Exynos4210, 5250 and 5420 based boards. Signed-off-by: Sachin Kamat <[email protected]> Tested-by: Tomasz Figa <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 7bd03c0ebe54db94f20cd7577b875d9d27e539a9 Author: Selvin Xavier <[email protected]> Date: Tue Feb 4 11:57:06 2014 +0530 RDMA/ocrdma: Support non-embedded mailbox commands Added a routine to issue non-embedded mailbox commands for handling large mailbox request/response data. Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit a1b8aff87d5f27022e6c14c43bf43226e75d2745 Author: Selvin Xavier <[email protected]> Date: Tue Feb 4 11:57:05 2014 +0530 RDMA/ocrdma: Handle CQ overrun error Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 23631e15a7f3c01a1ebb34f2c176f658c27eb949 Author: Selvin Xavier <[email protected]> Date: Tue Feb 4 11:57:04 2014 +0530 RDMA/ocrdma: Display proper value for max_mw Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit c0e19755d56142b026b07b8020273301c8ed42bb Author: Selvin Xavier <[email protected]> Date: Tue Feb 4 11:57:03 2014 +0530 RDMA/ocrdma: Use non-zero tag in SRQ posting As part of SRQ receive buffers posting we populate a non-zero tag which will be returned in SRQ receive completions. Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit def4eb8e5eacdfbc4788a6cb1bc0a3f118b5b349 Author: Selvin Xavier <[email protected]> Date: Tue Feb 4 11:57:02 2014 +0530 RDMA/ocrdma: Memory leak fix in ocrdma_dereg_mr() Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 0f4d45e0845e63e54aeaf5a7444b8ef4b77e4895 Author: [email protected] <[email protected]> Date: Tue Feb 4 11:57:01 2014 +0530 RDMA/ocrdma: Increment abi version count Increment the ABI version count for driver/library interface. Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 5b5eb9421408080b46ce14210ca717714859dee4 Author: [email protected] <[email protected]> Date: Tue Feb 4 11:57:00 2014 +0530 RDMA/ocrdma: Update version string Update the driver vrsion string and node description string Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 91b3140a692e87733367521efdd24f9a3532889a Author: [email protected] <[email protected]> Date: Tue Feb 4 11:56:59 2014 +0530 be2net: Add abi version between be2net and ocrdma This patch adds abi versioning between be2net and ocrdma driver modules to catch functional incompatibilities in the two drivers. Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 973ce6ce272d2c79f7eb1094ec26c25d1d8b4b32 Author: [email protected] <[email protected]> Date: Tue Feb 4 11:56:58 2014 +0530 RDMA/ocrdma: ABI versioning between ocrdma and be2net While loading RoCE driver be2net driver should check for ABI version to catch functional incompatibilities. Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit db84035babf25f81be2a548f9332553b3a62865f Author: [email protected] <[email protected]> Date: Tue Feb 4 11:56:57 2014 +0530 RDMA/ocrdma: Allow DPP QP creation Allow creating DPP QP even if inline-data is not requested. This is an optimization to lower latency. Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit d64c9414a4cc7c768d117ae035bf45cce760aeb5 Author: [email protected] <[email protected]> Date: Tue Feb 4 11:56:56 2014 +0530 RDMA/ocrdma: Read ASIC_ID register to select asic_gen ocrdma driver selects execution path based on sli_family and asic generation number. This introduces code to read the asic gen number from pci register instead of obtaining it from the Emulex NIC driver. Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit da7d0e7699e6c5e3b076ba68680afe679e7379f0 Author: Devesh Sharma <[email protected]> Date: Tue Feb 4 11:56:55 2014 +0530 RDMA/ocrdma: SQ and RQ doorbell offset clean up Introducing new macros to define SQ and RQ doorbell offset. Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 1dbf741320af98620593c9a1d7481dd8b37f53fe Author: [email protected] <[email protected]> Date: Tue Feb 4 11:56:54 2014 +0530 RDMA/ocrdma: EQ full catastrophe avoidance Stale entries in the CQ being destroyed causes hardware to generate EQEs indefinitely for a given CQ. Thus causing uncontrolled execution of irq_handler. This patch fixes this using following sementics: * irq_handler will ring EQ doorbell atleast once and implement budgeting scheme. * cq_destroy will count number of valid entires during destroy and ring cq-db so that hardware does not generate uncontrolled EQE. * cq_destroy will synchronize with last running irq_handler instance. * arm_cq will always defer arming CQ till poll_cq, except for the first arm_cq call. * poll_cq will always ring cq-db with arm=SET if arm_cq was called prior to enter poll_cq. * poll_cq will always ring cq-db with arm=UNSET if arm_cq was not called prior to enter poll_cq. Signed-off-by: Devesh Sharma <[email protected]> Signed-off-by: Selvin Xavier <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit eda6d1d1b7932f90d55583f8f3835dd7d6b32543 Author: Steve Wise <[email protected]> Date: Wed Mar 19 17:44:45 2014 +0530 RDMA/cxgb4: Save the correct map length for fast_reg_page_lists We cannot save the mapped length using the rdma max_page_list_len field of the ib_fast_reg_page_list struct because the core code uses it. This results in an incorrect unmap of the page list in c4iw_free_fastreg_pbl(). I found this with dma mapping debugging enabled in the kernel. The fix is to save the length in the c4iw_fr_page_list struct. Signed-off-by: Steve Wise <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit df2d5130ece9118591c2f3fbf0ee4a79183b4ccc Author: Steve Wise <[email protected]> Date: Wed Mar 19 17:44:44 2014 +0530 RDMA/cxgb4: Default peer2peer mode to 1 Signed-off-by: Steve Wise <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit ba32de9d8d8173a1d6dd1ed608c519d5d0a623bb Author: Steve Wise <[email protected]> Date: Wed Mar 19 17:44:43 2014 +0530 RDMA/cxgb4: Mind the sq_sig_all/sq_sig_type QP attributes Signed-off-by: Steve Wise <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 8a9c399eeee8c2d99e22b975f6023001a1fde88f Author: Steve Wise <[email protected]> Date: Wed Mar 19 17:44:42 2014 +0530 RDMA/cxgb4: Fix incorrect BUG_ON conditions Based on original work from Jay Hernandez <[email protected]> Signed-off-by: Steve Wise <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 58553078c1feb40e0a02d7c72ae41dd6b923f231 Author: Sachin Kamat <[email protected]> Date: Fri Mar 21 02:00:21 2014 +0900 ARM: SAMSUNG: Introduce generic Exynos4 and 5 helpers Add helpers to check for Exynos4 and 5 family of SoCs. This will eliminate comparing long list of SoCs and make code simpler. Signed-off-by: Sachin Kamat <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 7ed30015007c32c006783526dc54a2a88bd5e13b Author: Sachin Kamat <[email protected]> Date: Fri Mar 21 01:52:56 2014 +0900 ARM: EXYNOS: Add support to reserve memory for MFC-v7 Reserve memory for MFC-v7 IP. Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit 8b3e8bbd132279be544a6f4dc22c22d244c98c23 Author: Tushar Behera <[email protected]> Date: Fri Mar 21 01:49:24 2014 +0900 ARM: SAMSUNG: Reorganize calls to reserve memory for MFC Reorganize code so that "plat/mfc.h" is no more referred from mach-exynos directory. Signed-off-by: Tushar Behera <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> commit ebf00060c33b9d0946384fa6f440df7ea35a569e Author: Steve Wise <[email protected]> Date: Wed Mar 19 17:44:40 2014 +0530 RDMA/cxgb4: Always release neigh entry Always release the neigh entry in rx_pkt(). Based on original work by Santosh Rastapur <[email protected]>. Signed-off-by: Steve Wise <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit f8e819081f797df355cffbdedb9301ea50ae76b2 Author: Steve Wise <[email protected]> Date: Wed Mar 19 17:44:39 2014 +0530 RDMA/cxgb4: Allow loopback connections find_route() must treat loopback as a valid egress interface. Signed-off-by: Steve Wise <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit ffd435924c86de055d33fe59941841819eef9f6a Author: Steve Wise <[email protected]> Date: Wed Mar 19 17:44:38 2014 +0530 RDMA/cxgb4: Cap CQ size at T4_MAX_IQ_SIZE Signed-off-by: Steve Wise <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit e24a72a3302a638d4c6e77f0b40c45cc61c3f089 Author: Dan Carpenter <[email protected]> Date: Sat Oct 19 12:14:35 2013 +0300 RDMA/cxgb4: Fix four byte info leak in c4iw_create_cq() There is a four byte hole at the end of the "uresp" struct after the ->qid_mask member. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit ff1706f4feb8e0e1a2e56a8dd57e17a4b45649b5 Author: Dan Carpenter <[email protected]> Date: Sat Oct 19 12:14:12 2013 +0300 RDMA/cxgb4: Fix underflows in c4iw_create_qp() These sizes should be unsigned so we don't allow negative values and have underflow bugs. These can come from the user so there may be security implications, but I have not tested this. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Roland Dreier <[email protected]> commit 4726e0b045b80c514377da35ca01467ef6a4de53 Author: Sagar Kamble <[email protected]> Date: Mon Mar 10 17:06:23 2014 +0530 drm/i915: Enabling 128x128 and 256x256 ARGB Cursor Support With this patch we allow larger cursor planes of sizes 128x128 and 256x256. v2: Added more precise check on size while setting cursor plane. v3: Changes related to restructuring cursor size restrictions and DRM_DEBUG usage. v4: Indentation related changes for setting cursor control and implementing DRM_CAP_CURSOR_WIDTH and DRM_CAP_CURSOR_HEIGHT Testcase: igt/kms_cursor_crc Cc: Daniel Vetter <[email protected]> Cc: Jani Nikula <[email protected]> Cc: David Airlie <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: G, Pallavi <[email protected]> Signed-off-by: Sagar Kamble <[email protected]> Reviewed-by: Imre Deak <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> commit 61b1a7fbda6f761ebe16a62124578ca0779d9365 Author: Johan Hedberg <[email protected]> Date: Thu Mar 20 12:54:16 2014 +0200 Bluetooth: Fix address value for early disconnection events We need to ensure that we do not send events to user space with the identity address if we have not yet notified user space of the IRK. The code was previously trying to handle this for the mgmt_pair_device response (which worked well enough) but this is not the only connection related event that might be sent to user space before pairing is successful: another important event is Device Disconnected. The issue can actually be solved more simply than the solution previously used for mgmt_pair_device. Since we do have the identity address tracked as part of the remote IRK struct we can just copy it over from there to the hci_conn struct once we've for real sent the mgmt event for the new IRK. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]> commit 204747c970c0d568721c76ab8a57dde0e5dcf0d5 Author: Guenter Roeck <[email protected]> Date: Thu Mar 20 08:12:28 2014 -0700 mfd: kempld-core: Fix potential hang-up during boot On PXT and COMe-cPC2 boards it is observed that the hardware mutex is acquired but not being released during initialization. This can result in a hang-up during boot if the driver is built into the kernel. Releasing the mutex twice if it was acquired fixes the problem. Subsequent request/release cycles work as expected, so the fix is only needed during initialization. Cc: <[email protected]> Reviewed-by: Michael Brunner <[email protected]> Tested-by: Michael Brunner <[email protected]> Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Lee Jones <[email protected]> commit 5a78401623740c892868d5929b33f5cda8fe819e Author: Krzysztof Kozlowski <[email protected]> Date: Tue Mar 18 14:11:26 2014 +0100 mfd: sec-core: Fix uninitialized 'regmap_rtc' on S2MPA01 Initialize the 'regmap_rtc' on S2MPA01 to some sane value. Sane at least for S5M87X chipsets, not S2MPS/S2MPA but it won't be used because rtc-s5m driver does not support S2MPA01. This fixes following error: drivers/mfd/sec-core.c:342:45: warning: ‘regmap_rtc’ may be used uninitialized in this function [-Wuninitialized] Signed-off-by: Krzysztof Kozlowski <[email protected]> Acked-by: Sachin Kamat <[email protected]> Signed-off-by: Lee Jones <[email protected]> commit 67b3bd4e65f0854aca70e0134d59b1daede49504 Author: Arend van Spriel <[email protected]> Date: Thu Mar 20 10:18:03 2014 +0100 brcmfmac: fallback to mimo_bw_cap for older firmwares In order to support the driver behaviour introduced by: commit d0575a5a703978c43e25128421158c78534ba100 Author: Daniel Kim <[email protected]> Date: Wed Mar 12 18:12:14 2014 -0700 brcmfmac: Enable 40MHz bandwidth in 2GHz band and OBSS scanning in devices that do not support bwcap firmware command a fallback is added. Reviewed-by: Daniel (Deognyoun) Kim <[email protected]> Reviewed-by: Pieter-Paul Giesberts <[email protected]> Signed-off-by: Arend van Spriel <[email protected]> Signed-off-by: John W. Linville <[email protected]> commit 4d1a4f16c96d3f4cf6afd92ca3ffb4d2c24875e1 Author: Arend van Spriel <[email protected]> Date: Thu Mar 20 10:18:02 2014 +0100 brcmfmac: only show error message when brcmf_sdiod_regrw_helper() fails In the function brcmf_sdiod_request_data() an error message is logged, but the calling function retries it. This patch will only log an error message when retry limit is reached. The low-level error is still logged by a SDIO debug message. Reviewed-by: Daniel (Deognyoun) Kim <[email protected]> Reviewed-by: Pieter-Paul Giesberts <[email protected]> Signed-off-by: Arend van Spriel <[email protected]> Signed-off-by: John W. Linville <[email protected]> commit 58e9df462fd70a1862378beb46b312f1f6bca94f Author: Arend van Spriel <[email protected]> Date: Thu Mar 20 10:18:01 2014 +0100 brcmfmac: reinit watchdog completion after handling watchdog The watchdog thread waits on completion that is set from a timer. As the completion is count based this could mean that on a busy system the watchdog is handled multiple times with a very short interval. This is not the intended behaviour. After handling the watchdog it should wait for the next timer expiry. This is accomplished by reinitializing the completion. Reviewed-by: Hante Meuleman <[email protected]> Reviewed-by: Pieter-Paul Giesberts <[email protected]> Signed-off-by: Arend van Spriel <[email protected]> Signed-off-by: John W. Linville <[email protected]> commit d23536796011cbeeb93fc866446800c52deb5603 Author: Daniel Kim <[email protected]> Date: Thu Mar 20 10:18:00 2014 +0100 brcmfmac: Enable 40MHz bandwidth in 2GHz band and OBSS scanning operations This patch enables 40MHz bandwidth in 2GHz band after checking whether cfg80211 allows it or not, and enables OBSS scanning operations to to support 20/40 BSS coexistence. Reviewed-by: Arend Van Spriel <[email protected]> Reviewed-by: Hante Meuleman <[email protected]> Reviewed-by: Pieter-Paul Giesberts <[email protected]> Signed-off-by: Daniel Kim <[email protected]> Signed-off-by: Arend van Spriel <[email protected]> Signed-off-by: John W. Linville <[email protected]> commit 1fa3e2eb9db07f30a605c66d1a2fdde4b24e74d5 Author: Steve Dickson <[email protected]> Date: Thu Mar 20 11:23:03 2014 -0400 SUNRPC: Ensure call_connect_status() deals correctly with SOFTCONN tasks Don't schedule an rpc_delay before checking to see if the task is a SOFTCONN because the tk_callback from the delay (__rpc_atrun) clears the task status before the rpc_exit_task can be run. Signed-off-by: Steve Dickson <[email protected]> Fixes: 561ec1603171c (SUNRPC: call_connect_status should recheck...) Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Trond Myklebust <[email protected]> commit f5b972e9fbd2e99a2abc3221783d089799b69394 Author: Heiko Carstens <[email protected]> Date: Thu Mar 20 15:30:14 2014 +0100 compat: include linux/unistd.h within linux/compat.h linux/compat.h does not include linux/unistd.h but the compat.h header file contains various conditional #ifdef __ARCH_WANT_COMPAT_... asmlinkage long compat...() #endif compat system call function declarations. If linux/unistd.h isn't included it depends on previous includes if those __ARCH_WANT_COMPAT_... defines are defined or not. So add an additional linux/unistd.h include. Should fix this compile error on tile: include/uapi/asm-generic/unistd.h:195:1: error: 'compat_sys_getdents64' undeclared make[3]: *** [arch/tile/kernel/compat.o] Error 1 Reported-by: Geert Uytterhoeven <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Acked-by: Chris Metcalf <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> commit e1b2dc176f2d5be7952c47a4e4e8f3b06a90db1c Author: Tejun Heo <[email protected]> Date: Thu Mar 20 11:10:15 2014 -0400 cgroup: break kernfs active_ref protection in cgroup directory operations cgroup_tree_mutex should nest above the kernfs active_ref protection; however, cgroup_create() and cgroup_rename() were grabbing cgroup_tree_mutex while under kernfs active_ref protection. This has actualy possibility to lead to deadlocks in case these operations race against cgroup_rmdir() which invokes kernfs_remove() on directory kernfs_node while holding cgroup_tree_mutex. Neither cgroup_create() or cgroup_rename() requires active_ref protection. The former already has enough synchronization through cgroup_lock_live_group() and the latter doesn't care, so this can be fixed by updating both functions to break all active_ref protections before grabbing cgroup_tree_mutex. While this patch fixes the immediate issue, it probably needs further work in the long term - kernfs directories should enable lockdep annotations and maybe the better way to handle this is marking directory nodes as not needing active_ref protection rather than breaking it in each operation. Signed-off-by: Tejun Heo <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> commit 80e0b6e8a001361316a2d62b748fe677ec46b860 Author: Richard Guy Briggs <[email protected]> Date: Sun Mar 16 14:00:19 2014 -0400 sched: declare pid_alive as inline We accidentally declared pid_alive without any extern/inline connotation. Some platforms were fine with this, some like ia64 and mips were very angry. If the function is inline, the prototype should be inline! on ia64: include/linux/sched.h:1718: warning: 'pid_alive' declared inline after being called Signed-off-by: Richard Guy Briggs <[email protected]> Signed-off-by: Eric Paris <[email protected]> commit 579ec9e1ab0bdca2dbc3c942aa1a530a6ec8c349 Author: Eric Paris <[email protected]> Date: Tue Mar 11 12:55:42 2014 -0400 audit: use uapi/linux/audit.h for AUDIT_ARCH declarations The syscall.h headers were including linux/audit.h but really only needed the uapi/linux/audit.h to get the requisite defines. Switch to the uapi headers. Signed-off-by: Eric Paris <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] commit 5e937a9ae9137899c6641d718bd3820861099a09 Author: Eric Paris <[email protected]> Date: Tue Mar 11 12:48:43 2014 -0400 syscall_get_arch: remove useless function arguments Every caller of syscall_get_arch() uses current for the task and no implementors of the function need args. So just get rid of both of those things. Admittedly, since these are inline functions we aren't wasting stack space, but it just makes the prototypes better. Signed-off-by: Eric Paris <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] commit b7550787fe8b5beffb5f56fa11a87712d699d085 Author: Joe Perches <jo…
- Loading branch information
