summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-06-10DocBook: Add CG2900 FM Radio templateGLK-2.6.38_w123.5.1Hemant Gupta
This patch re-adds the cg2900_fm_radio.tmpl template file for DocBook, which for some unknown reason has been removed at a time earlier on. This patch also fixes some warnings while generating kernel docs in CG2900 FM Driver. ST-Ericsson ID: 327422 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I1507156af91cfff80af8063f618626a79d955c6a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17877 Reviewed-by: Andreas KARLSSON <andreas.z.karlsson@stericsson.com> Reviewed-by: Andreas GUSTAFSSON <andreas.a.gustafsson@stericsson.com> Tested-by: Andreas GUSTAFSSON <andreas.a.gustafsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24915 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Said BAGHERI <said.m.bagheri@stericsson.com> Tested-by: Said BAGHERI <said.m.bagheri@stericsson.com>
2011-06-10CG2900 FM Radio: RDS decoding time is too long.Hemant Gupta
This patch fixes the problem of long time taken to send RDS Data to user space application when RDS is enabled first time. ST-Ericsson ID: 338036 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: If29ea6c9dcab730ad794067a26b76fb8a1927137 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24896 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Said BAGHERI <said.m.bagheri@stericsson.com> Tested-by: Said BAGHERI <said.m.bagheri@stericsson.com>
2011-06-10CG2900 FM radio: Add support for Tone Gen and De-emphasis.kumarp
FM radio driver now supports enabling, disabling, setting parameters for internal Tone Generator and configuring De-emphasis filter. ST-Ericsson ID: 281539 ST-Ericsson ID: 317074 Change-Id: I5b4aacee58e7955a2aea52aeda3a99663bad3082 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/11412 Reviewed-by: Pradeep-mmc KUMAR <pradeep-mmc.kumar@stericsson.com> Tested-by: Pradeep-mmc KUMAR <pradeep-mmc.kumar@stericsson.com> Reviewed-by: Johan PALMAEUS <johan.xj.palmaeus@stericsson.com> Reviewed-by: Andreas GUSTAFSSON <andreas.a.gustafsson@stericsson.com> Reviewed-by: Hemant GUPTA <hemant.gupta@stericsson.com> Reviewed-by: QATEST Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24895 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Tested-by: Said BAGHERI <said.m.bagheri@stericsson.com> Reviewed-by: Said BAGHERI <said.m.bagheri@stericsson.com>
2011-06-10ux500: add gyro data and device in stuib (for snowball)Alessandro Rubini
Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Change-Id: I3ce691cf58434a579451fb2a13b4bbfa73e48949 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24783 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Tested-by: Robert MARKLUND <robert.marklund@stericsson.com>
2011-06-09config: u8500: Enable the new asoc driversRobert Marklund
ST-Ericsson Linux next: 342252 ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I0f379ee7deeccabe9cbaad29f9ad3f67f269a24d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24729 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-09ux500-ASoC: Update ux500 driver to use dmaengineRobert Marklund
ST-Ericsson Linux next: 342252 ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I6d0b04aaa9f3e0d170cb3dd2510960f606c4435f Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24728 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-09ux500-ASoC: Change to support ux500 soc:s in buildRobert Marklund
Change to support ux500 soc:s in the same build. ST-Ericsson Linux next: 342252 ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I276df2266288c0ae95a7ad8d41bdcdce6cfde2bc Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24727 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
2011-06-09mfd: abx500: Move ab5500 includeRobert Marklund
Move the content of linux/mfd/abx500/ab5500.h to the mainline header linux/mfd/abx500.h Also change the clients of this file. ST-Ericsson Linux next: OK ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I30f7e2978d7bb00408597fdbdce8e7b6fdca397f Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24725 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-09ux500: Change makefile to support ux500 socRobert Marklund
Change the Makefile and Kconfig to support both db8500 and db5500 -soc in the same build. ST-Ericsson Linux next: OK ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: Iad191d021a1df362e232a696347a99c7c47ff574 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24726 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-09dma: Make the cycic alloc NOWAITRobert Marklund
ST-Ericsson Linux next: OK ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I7e792ed1d9d9c04d3af598caf30f1c26744c1183 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24723 Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-09sound: soc: codec: Fix link warningsRobert Marklund
ST-Ericsson Linux next: 342252 ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I9b17c8fe0bf86d19066951ae5acc6a2261a3527e Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24730 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-09sound: soc: ux500: Fix merge problemsRobert Marklund
Fix merge problems introduced in soc u8500 driver when merging from main dev track ST-Ericsson Linux next: 342252 ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I083638dddc34792b654d36b5aa967238614799c7 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24724 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-07config: Add cg2900 deps BT and HCIUARTRobert Marklund
ST-Ericsson Linux next: 340134 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: Ie01c6904beb23f0c72163ab262d4a34ed253115e Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24087 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-07mach-ux500: reg: Add snowball wlan regulatorRobert Marklund
Add snowball wlan regulator to regulators and add the device to snowball. ST-Ericsson Linux next: 340134 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I80aef0e8d005822bbd7c23f226155b5404292d5a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24085 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-07ux500: Add the AB8500 GPIOsRobert Marklund
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> ST-Ericsson Linux next: 340134 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I70d7eb698386434431a7ae947826b504119c1efc Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24083 Tested-by: Robert MARKLUND <robert.marklund@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-06-07mach-ux500: reg: Add mali as sga consumerJohn Fredriksson
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I2774d935d81dd65e6fd38658488a3acff8aa3c70 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24088 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2011-06-07cg2900: Add regulator supportRobert Marklund
Add regulator support needed on snowball HW. ST-Ericsson Linux next: 340135 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: Ic7b5d4559fa44fb13b788002f321898fba3d5843 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24086 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2011-06-07config: Add fixed regulator driverRobert Marklund
ST-Ericsson Linux next: 340134 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: Ic187bf313f2f420c4cd4cbbe1a6bf69a0bb48a95 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24084 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2011-05-27mach-ux500: Add hooks for pl011 uartRobert Marklund
ST-Ericsson Linux next: 342766 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I88e986057206c956003c21323c5849d138b72d56 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24060 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com>
2011-05-27serial: pl011: Fix enable of pinsRobert Marklund
ST-Ericsson Linux next: 342766 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I47692d7a7993cbeda53dfca737d6346f043336f3 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24059 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-27mach-ux500: gpio: Moved the NOMADIK_NR_GPIORobert Marklund
Move the NOMADIK_NR_GPIO to the right location. Fix warnings generated by this change. ST-Ericsson Linux next: ER 340134 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I5b69d4a4662b707d815a867b2b5be19e4675d010 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24082 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-26Merge commit 'linaro-11.05-2.6.38' into ste-dev-master-2.6.38-genericPhilippe Langlais
2011-05-25cw1200: Align TX buffers for DMA.Dmitry Tarnyagin
u8500 platform requires that DMA buffers should be 4 bytes aligned. In most cases skb's passed by network stack are already aligned. Known exception: TCP connect. Patch checks alignment of skb->data and move it to the 4 bytes boundary if not aligned. Change-Id: I3ce7ba9baa42e6956b2a5cff04ad6a0aacc9f257 Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23803 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-25cw1200: listening mode implementationDmitry Tarnyagin
Listening mode is required for off-channel operations (P2P use-cases). Listening is implemented as WSM Start with WSM_START_MODE_P2P_DEV. Change-Id: I1dd90c433a0eb557ec39b2684912e4c937fb84cf Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23804 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-25cw1200: Enable WEXT compatibility.Dmitry Tarnyagin
User-space tools like wpa_supplicant still use legacy wireless extensions for wlan device management. CONFIG_CFG80211_WEXT should be set in the kernel config to enable wireless extension compatibility in the kernel wireless stack. Change-Id: I661eaa0cf3b854b2bb08ecac309d5d050c027a2b Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23802 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-25wlan: cw1200: Add cut2.2 supportBartosz Markowski
Added support for cw1200 cut2.2 chip and firmware Change-Id: I996d0666498d5fa344000313debe876d760a9b9f Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23739 Reviewed-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com> Tested-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-24Merge branch 'beagle-fixes' of ↵linaro-11.05-2.6.38Nicolas Pitre
git://kernel.ubuntu.com/rsalveti/linux-linaro-2.6.38 into linaro-2.6.38
2011-05-24omap3: beagle: if rev unknown, assume xM revision CRobert Nelson
BugLink: http://bugs.launchpad.net/bugs/770679 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
2011-05-24omap3: beagle: detect new xM revision CRobert Nelson
Beagle xM rev C has nEN_USB_PWR inverted again, so we need proper check for revision C. BugLink: http://bugs.launchpad.net/bugs/770679 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
2011-05-24omap3: beagle: detect new xM revision BRobert Nelson
The xM B uses a DM3730 ES1.1 over the ES1.0 on xM A's, no other board changes. BugLink: http://bugs.launchpad.net/bugs/770679 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
2011-05-24omap3: beaglexm: fix DVI initializationRicardo Salveti de Araujo
Function beagle_twl_gpio_setup is called after beagle_display_init, what makes lets reset_gpio with an invalid value at the time it request the gpio. As a side effect the DVI reset GPIO is not properly set. Also removing old code that power down DVI in a hardcoded way, as it's not necessary anymore. Tested with Beagle-xM and C4. Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
2011-05-24cw1200: Request SDIO pins at device registration.Dmitry Tarnyagin
ux500 platform requires hardware pins to be explicitly requested. Change-Id: I739b6badfb5d19e6e1c49eb8232df3b8aaa958e9 Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23620 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Janusz DZIEDZIC <janusz.dziedzic@tieto.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-23wlan: cw1200: Reenable filtering.Dmitry Tarnyagin
Filtering is enabled again (was broken in earlier firmware). Added support for FIF_PROBE_REQ for management frames. New WSM API wsm_set_bssid_filtering is used. Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Change-Id: Id8a44424a8ae2b0ba7d4082a096c88344e7a1a78 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23605 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-23wlan: cw1200: .flush mac80211 API is implemented.Dmitry Tarnyagin
- .flush mac80211 API is implemented (expected to be called from mac80211 off_channel code). - TX queue statistics is implemented. Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Change-Id: If228ceccd856b699236999122c9989d0eca1e98d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23604 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-23cw1200: Spin lock usage review.Dmitry Tarnyagin
Expensive spin_lock_irqsave calls are replaced by more adequate spin_lock / spin_lock_bh. Locking strategy: queue: spin_lock_bh event_queue: spin_lock tx_policy: spin_lock_bh wsm_cmd: spin_lock sdio handlers: spin_lock_irqsave Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Change-Id: I3a13ef337ac125c0533de00651e54a4b4a45ba16 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23603 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-23cw1200: Integration with mach-ux500Dmitry Tarnyagin
CW1200 platform data is defined and set in arch/arm/mach-ux500. TODO: WLAN regulators are defined but not handled. Waiting for support in mach-ux500. Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Change-Id: If368398af1ca22366bb44c3bb8c7e3b1484cab1b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23353 Reviewed-by: Janusz DZIEDZIC <janusz.dziedzic@tieto.com> Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-23wlan: cw1200: Correction for initial state of WLAN_ENA pin.Dmitry Tarnyagin
WLAN_ENA (GPIO215 on HREF/Snowball) should be set to low by default. WLAN driver takes care to set this pin high and enable the device. Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Change-Id: I74101dd41e7f0fb059e4fc844ea3753069dbd495 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23352 Reviewed-by: Janusz DZIEDZIC <janusz.dziedzic@tieto.com> Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-23cw1200: Workaround against a problem with DMA on ux500 platform.Dmitry Tarnyagin
ux500 incorrectly handles some DMA sizes. It was observed that multiple of transfers of multiple of 32 bytes are always working. Some other transfer sizes (at least 208 and 228) cause hang in sdio_memcpy_xxx(). The workaround aligns DMA transfer sizes to 32 bytes boundary. Change-Id: I34aad24b4f20ba342cf709cac41c55535b688894 Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23601 Reviewed-by: Janusz DZIEDZIC <janusz.dziedzic@tieto.com> Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-05-22Merge commit 'v2.6.38.7' into linaro-2.6.38Nicolas Pitre
Conflicts: mm/memory.c
2011-05-21Linux 2.6.38.7v2.6.38.7Greg Kroah-Hartman
2011-05-21tmpfs: fix highmem swapoff crash regressionHugh Dickins
commit e6c9366b2adb52cba64b359b3050200743c7568c upstream. Commit 778dd893ae78 ("tmpfs: fix race between umount and swapoff") forgot the new rules for strict atomic kmap nesting, causing WARNING: at arch/x86/mm/highmem_32.c:81 from __kunmap_atomic(), then BUG: unable to handle kernel paging request at fffb9000 from shmem_swp_set() when shmem_unuse_inode() is handling swapoff with highmem in use. My disgrace again. See https://bugzilla.kernel.org/show_bug.cgi?id=35352 Reported-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl> Signed-off-by: Hugh Dickins <hughd@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-21iwlegacy: fix IBSS mode crashesStanislaw Gruszka
commit eb85de3f84868ca85703a23617b4079ce79a801e upstream. We should not switch to non-IBSS channels when working in IBSS mode, otherwise there are microcode errors, and after some time system crashes. This bug is only observable when software scan is used in IBSS mode, so should be considered as regression after: commit 0263aa45293838b514b8af674a03faf040991a90 Author: Stanislaw Gruszka <sgruszka@redhat.com> Date: Tue Mar 29 11:24:21 2011 +0200 iwl3945: disable hw scan by default However IBSS mode check, which this patch add again, was removed by commit b2f30e8bdd8ef5f3b5a7ef9146509585a15347d3 Author: Johannes Berg <johannes.berg@intel.com> Date: Thu Jan 21 07:32:20 2010 -0800 iwlwifi: remove IBSS channel sanity check That commit claim that mac80211 will not use non-IBSS channel in IBSS mode, what definitely is not true. Bug probably should be fixed in mac80211, but that will require more work, so better to apply that patch temporally, and provide proper mac80211 fix latter. Resolves: https://bugzilla.kernel.org/show_bug.cgi?id=34452 Reported-and-tested-by: Mikko Rapeli <mikko.rapeli@iki.fi> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-21cifs: fix cifsConvertToUCS() for the mapchars caseJeff Layton
commit 11379b5e33950048ad66825da7f462b0d0da9d73 upstream. As Metze pointed out, commit 84cdf74e broke mapchars option: Commit "cifs: fix unaligned accesses in cifsConvertToUCS" (84cdf74e8096a10dd6acbb870dd404b92f07a756) does multiple steps in just one commit (moving the function and changing it without testing). put_unaligned_le16(temp, &target[j]); is never called for any codepoint the goes via the 'default' switch statement. As a result we put just zero (or maybe uninitialized) bytes into the target buffer. His proposed patch looks correct, but doesn't apply to the current head of the tree. This patch should also fix it. Reported-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-21cifs: clean up various nits in unicode routines (try #2)Jeff Layton
commit 581ade4d1c025eb10421eda0d0c0a2f04447d7c5 upstream. Minor revision to the original patch. Don't abuse the __le16 variable on the stack by casting it to wchar_t and handing it off to char2uni. Declare an actual wchar_t on the stack instead. This fixes a valid sparse warning. Fix the spelling of UNI_ASTERISK. Eliminate the unneeded len_remaining variable in cifsConvertToUCS. Also, as David Howells points out. We were better off making cifsConvertToUCS *not* use put_unaligned_le16 since it means that we can't optimize the mapped characters at compile time. Switch them instead to use cpu_to_le16, and simply use put_unaligned to set them in the string. Reported-and-acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-21Revert "[SCSI] Retrieve the Caching mode page"James Bottomley
commit 3dea642afd9187728d119fce5c82a7ed9faa9b6a upstream. This reverts commit 24d720b726c1a85f1962831ac30ad4d2ef8276b1. Previously we thought there was little possibility that devices would crash with this, but some have been found. Reported-by: Alan Stern <stern@rowland.harvard.edu> Cc: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-21vmxnet3: Fix inconsistent LRO state after initializationThomas Jarosch
commit ebde6f8acba92abfc203585198a54f47e83e2cd0 upstream. During initialization of vmxnet3, the state of LRO gets out of sync with netdev->features. This leads to very poor TCP performance in a IP forwarding setup and is hitting many VMware users. Simplified call sequence: 1. vmxnet3_declare_features() initializes "adapter->lro" to true. 2. The kernel automatically disables LRO if IP forwarding is enabled, so vmxnet3_set_flags() gets called. This also updates netdev->features. 3. Now vmxnet3_setup_driver_shared() is called. "adapter->lro" is still set to true and LRO gets enabled again, even though netdev->features shows it's disabled. Fix it by updating "adapter->lro", too. The private vmxnet3 adapter flags are scheduled for removal in net-next, see commit a0d2730c9571aeba793cb5d3009094ee1d8fda35 "net: vmxnet3: convert to hw_features". Patch applies to 2.6.37 / 2.6.38 and 2.6.39-rc6. Please CC: comments. Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Acked-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-21cdrom: always check_disk_change() on openTejun Heo
commit bf2253a6f00e8fea5b026e471e9f0d0a1b3621f2 upstream. cdrom_open() called check_disk_change() after the rest of open path succeeded which leads to the following bizarre behavior. * After media change, if the device opened without O_NONBLOCK, open_for_data() naturally fails with -ENOMEDIA and check_disk_change() is never called. The media is known to be gone and the open failure makes it obvious to the userland but device invalidation never happens. * But if the device is opened with O_NONBLOCK, all the checks are bypassed and cdrom_open() doesn't notice that the media is not there and check_disk_change() is called and invalidation happens. There's nothing to be gained by avoiding calling check_disk_change() on open failure. Common cases end up calling check_disk_change() anyway. All we get is inconsistent behavior. Fix it by moving check_disk_change() invocation to the top of cdrom_open() so that it always gets called regardless of how the rest of open proceeds. Stable: 2.6.38 Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Amit Shah <amit.shah@redhat.com> Tested-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-21megaraid_sas: Sanity check user supplied length before passing it to ↵Bjørn Mork
dma_alloc_coherent() commit 98cb7e4413d189cd2b54daf993a4667d9788c0bb upstream. The ioc->sgl[i].iov_len value is supplied by the ioctl caller, and can be zero in some cases. Assume that's valid and continue without error. Fixes (multiple individual reports of the same problem for quite a while): http://marc.info/?l=linux-ide&m=128941801715301 http://bugs.debian.org/604627 http://www.mail-archive.com/linux-poweredge@dell.com/msg02575.html megasas: Failed to alloc kernel SGL buffer for IOCTL and [ 69.162538] ------------[ cut here ]------------ [ 69.162806] kernel BUG at /build/buildd/linux-2.6.32/lib/swiotlb.c:368! [ 69.163134] invalid opcode: 0000 [#1] SMP [ 69.163570] last sysfs file: /sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map [ 69.163975] CPU 0 [ 69.164227] Modules linked in: fbcon tileblit font bitblit softcursor vga16fb vgastate ioatdma radeon ttm drm_kms_helper shpchp drm i2c_algo_bit lp parport floppy pata_jmicron megaraid_sas igb dca [ 69.167419] Pid: 1206, comm: smartctl Tainted: G W 2.6.32-25-server #45-Ubuntu X8DTN [ 69.167843] RIP: 0010:[<ffffffff812c4dc5>] [<ffffffff812c4dc5>] map_single+0x255/0x260 [ 69.168370] RSP: 0018:ffff88081c0ebc58 EFLAGS: 00010246 [ 69.168655] RAX: 000000000003bffc RBX: 00000000ffffffff RCX: 0000000000000002 [ 69.169000] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88001dffe000 [ 69.169346] RBP: ffff88081c0ebcb8 R08: 0000000000000000 R09: ffff880000030840 [ 69.169691] R10: 0000000000100000 R11: 0000000000000000 R12: 0000000000000000 [ 69.170036] R13: 00000000ffffffff R14: 0000000000000001 R15: 0000000000200000 [ 69.170382] FS: 00007fb8de189720(0000) GS:ffff88001de00000(0000) knlGS:0000000000000000 [ 69.170794] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 69.171094] CR2: 00007fb8dd59237c CR3: 000000081a790000 CR4: 00000000000006f0 [ 69.171439] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 69.171784] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 69.172130] Process smartctl (pid: 1206, threadinfo ffff88081c0ea000, task ffff88081a760000) [ 69.194513] Stack: [ 69.205788] 0000000000000034 00000002817e3390 0000000000000000 ffff88081c0ebe00 [ 69.217739] <0> 0000000000000000 000000000003bffc 0000000000000000 0000000000000000 [ 69.241250] <0> 0000000000000000 00000000ffffffff ffff88081c5b4080 ffff88081c0ebe00 [ 69.277310] Call Trace: [ 69.289278] [<ffffffff812c52ac>] swiotlb_alloc_coherent+0xec/0x130 [ 69.301118] [<ffffffff81038b31>] x86_swiotlb_alloc_coherent+0x61/0x70 [ 69.313045] [<ffffffffa002d0ce>] megasas_mgmt_fw_ioctl+0x1ae/0x690 [megaraid_sas] [ 69.336399] [<ffffffffa002d748>] megasas_mgmt_ioctl_fw+0x198/0x240 [megaraid_sas] [ 69.359346] [<ffffffffa002f695>] megasas_mgmt_ioctl+0x35/0x50 [megaraid_sas] [ 69.370902] [<ffffffff81153b12>] vfs_ioctl+0x22/0xa0 [ 69.382322] [<ffffffff8115da2a>] ? alloc_fd+0x10a/0x150 [ 69.393622] [<ffffffff81153cb1>] do_vfs_ioctl+0x81/0x410 [ 69.404696] [<ffffffff8155cc13>] ? do_page_fault+0x153/0x3b0 [ 69.415761] [<ffffffff811540c1>] sys_ioctl+0x81/0xa0 [ 69.426640] [<ffffffff810121b2>] system_call_fastpath+0x16/0x1b [ 69.437491] Code: fe ff ff 48 8b 3d 74 38 76 00 41 bf 00 00 20 00 e8 51 f5 d7 ff 83 e0 ff 48 05 ff 07 00 00 48 c1 e8 0b 48 89 45 c8 e9 13 fe ff ff <0f> 0b eb fe 0f 1f 80 00 00 00 00 55 48 89 e5 48 83 ec 20 4c 89 [ 69.478216] RIP [<ffffffff812c4dc5>] map_single+0x255/0x260 [ 69.489668] RSP <ffff88081c0ebc58> [ 69.500975] ---[ end trace 6a2181b634e2abc7 ]--- Reported-by: Bokhan Artem <aptem@ngs.ru> Reported by: Marc-Christian Petersen <m.c.p@gmx.de> Signed-off-by: Bjørn Mork <bjorn@mork.no> Cc: Michael Benz <Michael.Benz@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-21x86, mce, AMD: Fix leaving freed data in a listJulia Lawall
commit d9a5ac9ef306eb5cc874f285185a15c303c50009 upstream. b may be added to a list, but is not removed before being freed in the case of an error. This is done in the corresponding deallocation function, so the code here has been changed to follow that. The sematic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression E,E1,E2; identifier l; @@ *list_add(&E->l,E1); ... when != E1 when != list_del(&E->l) when != list_del_init(&E->l) when != E = E2 *kfree(E);// </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Cc: Borislav Petkov <borislav.petkov@amd.com> Cc: Robert Richter <robert.richter@amd.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Andreas Herrmann <andreas.herrmann3@amd.com> Link: http://lkml.kernel.org/r/1305294731-12127-1-git-send-email-julia@diku.dk Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-05-21x86: Fix UV BAU for non-consecutive nasidsCliff Wickman
commit 77ed23f8d995a01cd8101d84351b567bf5177a30 upstream. This is a fix for the SGI Altix-UV Broadcast Assist Unit code, which is used for TLB flushing. Certain hardware configurations (that customers are ordering) cause nasids (numa address space id's) to be non-consecutive. Specifically, once you have more than 4 blades in a IRU (Individual Rack Unit - or 1/2 rack) but less than the maximum of 16, the nasid numbering becomes non-consecutive. This currently results in a 'catastrophic error' (CATERR) detected by the firmware during OS boot. The BAU is generating an 'INTD' request that is targeting a non-existent nasid value. Such configurations may also occur when a blade is configured off because of hardware errors. (There is one UV hub per blade.) This patch is required to support such configurations. The problem with the tlb_uv.c code is that is using the consecutive hub numbers as indices to the BAU distribution bit map. These are simply the ordinal position of the hub or blade within its partition. It should be using physical node numbers (pnodes), which correspond to the physical nasid values. Use of the hub number only works as long as the nasids in the partition are consecutive and increase with a stride of 1. This patch changes the index to be the pnode number, thus allowing nasids to be non-consecutive. It also provides a table in local memory for each cpu to translate target cpu number to target pnode and nasid. And it improves naming to properly reflect 'node' and 'uvhub' versus 'nasid'. Signed-off-by: Cliff Wickman <cpw@sgi.com> Link: http://lkml.kernel.org/r/E1QJmxX-0002Mz-Fk@eag09.americas.sgi.com Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-31 17:17:46 +0000