aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-14UBUNTU: SAUCE: input: fix weird issue of synaptics psmouse sync lost after ↵James M Leddy
resume BugLink: http://bugs.launchpad.net/bugs/717970 From: Eric Miao <eric.miao@canonical.com> This patch has already been sent upstream by Eric. Unfortunately, after a little back and forth between Eric and Dmitry Torokhov, the patch did get included, and there is still an open question to Dmitry. However, this is a known issue on at least 4 systems, and it causes them to lose their mouse device on suspend. So I was hoping we could get it in to quantal. Original email follows: So in summary, the symptom is intermittent key events lost after resume on some machines with synaptics touchpad (seems this is synaptics _only_), and key events loss is due to serio port reconnect after psmouse sync lost. Removing psmouse and inserting it back during the suspend/resume process is able to work around the issue, so the difference between psmouse_connect() and psmouse_reconnect() is the key to the root cause of this problem. After comparing the two different paths, synaptics driver has its own implementation of synaptics_reconnect(), and the missing psmouse_probe() seems significant, the patch below added psmouse_probe() to the reconnect process, and has been verified many times that the issue could not be reliably reproduced. There are two PS/2 commands in psmouse_probe(): 1. PSMOUSE_CMD_GETID 2. PSMOUSE_CMD_RESET_DIS The weird thing is, the PSMOUSE_CMD_GETID seems to be significant, and the PSMOUSE_CMD_RESET_DIS is irrelevant to this issue after trying several times. Now it's rather difficult to form a sane theory. So this patch is really for RFC. Note it does fix a real problem though. http://thread.gmane.org/gmane.linux.kernel.input/25599 Signed-off-by: James M Leddy <james.leddy@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14Revert "UBUNTU: SAUCE: acpi battery -- move first lookup asynchronous"Tim Gardner
This reverts commit f69453aedeafac6a9d9a8e2878ef1182344f84df. Breaks the boot process. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14Revert "UBUNTU: [Config] Disable vt6656"Tim Gardner
This reverts commit 42b5cd1ada6b91df1f7452819504820779e02d08. BugLink: http://bugs.launchpad.net/bugs/162671 Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: fix highbank include pathTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: export read_current_timer for armelTim Gardner
Fixes FTBS Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: overlayfs: disable until FTBS is fixedTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: Allow HID_BATTERY_STRENGTH to be modularTim Gardner
BugLink: http://bugs.launchpad.net/bugs/1003090 Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: ubuntu: AUFSAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-11-14UBUNTU: SAUCE: Add 'used' to the video_cards structure attributesTim Gardner
BugLink: http://bugs.launchpad.net/bugs/1049650 Without the 'used' attribute, some versions of the compiler will optimize the video_cards section to 0. Leave some build debug in debian/rules.d/2-binary-arch.mk to print the video_cards section details. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14Revert "UBUNTU: SAUCE: Make populate_rootfs asynchronous"Tim Gardner
This reverts commit 56e68a641786719fbc90584b988f75c659e3d15b.
2012-11-14Revert "UBUNTU: SAUCE: async_populate_rootfs: move rootfs init earlier"Tim Gardner
This reverts commit b00d4612b420ddb287ec15ea08d889e446789592.
2012-11-14Revert "UBUNTU: SAUCE: ensure root is ready before running usermodehelpers ↵Tim Gardner
in it" This reverts commit ea52e7ed17f85326b36138a949221caa625c9a5d.
2012-11-14Revert "UBUNTU: SAUCE: async_populate_rootfs: fix build warnings"Tim Gardner
This reverts commit 0a90b6744d02f80da605874534eacaed58195173.
2012-11-14Revert "UBUNTU: SAUCE: input: add a key driver for highbank"Rob Herring
BugLink: http://launchpad.net/bugs/1059432 This reverts commit 89d449c58bc84b6a0696cc79389eb1731e904e6e. Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14Revert "UBUNTU: SAUCE: force DMA buffers to non-bufferable on highbank"Rob Herring
BugLink: http://launchpad.net/bugs/1059432 This reverts commit d6e18e05087dd49cf9f5ca9d7b05a93814bc30fd. Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: ARM: highbank: retry wfi on reset requestRob Herring
BugLink: http://launchpad.net/bugs/1059432 In some cases, an interrupt can occur and prevent cause failure to enter wfi. This causes reset to hang. Retrying the wfi should be enough to prevent reset from hanging. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: net: calxedaxgmac: rework transmit ring handlingRob Herring
BugLink: http://launchpad.net/bugs/1059432 Only generate tx interrupts on every ring size / 4 descriptors. Move the netif_stop_queue call to the end of the xmit function rather than checking at the beginning. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: net: calxedaxgmac: drop some unnecessary register writesRob Herring
BugLink: http://launchpad.net/bugs/1059432 The interrupts have already been cleared, so we don't need to clear them again. Also, we could miss interrupts if they are cleared, but we don't process the packet. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: net: calxedaxgmac: use relaxed i/o accessors in rx and tx pathsRob Herring
BugLink: http://launchpad.net/bugs/1059432 The standard readl/writel accessors involve a spinlock and cache sync operation on ARM platforms with an outer cache. Only DMA triggering accesses need this, so use the relaxed variants instead. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: net: calxedaxgmac: remove explicit rx dma buffer pollingRob Herring
BugLink: http://launchpad.net/bugs/1059432 New received frames will trigger the rx DMA to poll the DMA descriptors, so there is no need to tell the h/w to poll. We also want to enable dropping frames from the fifo when there is no buffer. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: net: calxedaxgmac: enable operate on 2nd frame modeRob Herring
BugLink: http://launchpad.net/bugs/1059432 Enable the tx dma to start reading the next frame while sending the current frame. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: ata_piix: add a disable_driver optionAndy Whitcroft
We need to be able to fully disable the ata_piix driver from the kernel command line. Add a generic disable_driver to the module init to completely short circuit the initialisation. BugLink: http://bugs.launchpad.net/bugs/994870 Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Luis Henriques <luis.henriques@canonical.com> Acked-by: Herton Krzesinski <herton.krzesinski@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-11-14UBUNTU: SAUCE: input: Cypress PS/2 Trackpad move PSMOUSE_CYPRESS enumKamal Mostafa
Move PSMOUSE_CYPRESS to the end of the enum, since awful src/eventcomm.c in x-x-i-s actually depends on hardcoded values of the model numbers (including MODEL_ALPS). *sigh* BugLink: http://launchpad.net/bugs/1041594 Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: vxge: Declare MODULE_FIRMWARE usageTim Gardner
(Sent upstream) Cc: Jon Mason <jdmason@kudzu.us> Cc: "David S. Miller" <davem@davemloft.net> Cc: Joe Perches <joe@perches.com> Cc: Jiri Pirko <jpirko@redhat.com> Cc: Stephen Hemminger <shemminger@vyatta.com> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: netdev@vger.kernel.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: rds_ib_send() -- prevent local pings triggering BUG_ON()Andy Whitcroft
Pining localhost on an infiniband connection can trigger a BUG_ON() and cause a denial of service. Fix identified by comparison of the RHEL source rpms. CVE-2012-2372 BugLink: http://bugs.launchpad.net/bugs/1016299 Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Upgrade bnx2 to current versionsTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove obsolete Myricom firmwareTim Gardner
(Sent upstream) The Myricom GB driver firmware is no longer in use. Furthermore, CONFIG_MYRI_SBUS is no longer defined. Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Ben Hutchings <ben@decadent.org.uk> Cc: James Bottomley <JBottomley@Parallels.com> Cc: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove korg files duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove cpia2 files duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove av7110 files duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove ambassador files duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove advansys files duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove adaptec files duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove ti_usb_3410_5052 duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove edgeport files duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove kaweth files duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Remove ess files duplicated in linux-firmwareTim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: Remove redundant keyspan_pda firmwareTim Gardner
This firmware is already in the linux-firmware package Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: Remove redundant yamaha/ds1 firmwareTim Gardner
This firmware is already in the linux-firmware package. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: Remove redundant 3com/typhoon.bin firmwareTim Gardner
This firmware is already in the linux-firmware package. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: Remove redundant ositech/Xilinx7OD firmwareTim Gardner
This firmware is already in the linux-firmware package. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: Remove redundant ttusb-budget firmwareTim Gardner
This firmware is already in the linux-firmware package. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: Remove redundant emi26 firmwareTim Gardner
This firmware is already in the linux-firmware package. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: Remove redundant cis firmwareTim Gardner
This firmware is already in the linux-firmware package. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: firmware: Update bnx2x to current firmware version 7.2.51Tim Gardner
Cc: Eilon Greenstein <eilong@broadcom.com> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: Mask CR4 writes on older Xen hypervisorsStefan Bader
Older Xen hypervisors (like RHEL5 versions found to be used on Amazon's EC2) did have a bug which would crash the domain when trying to write unsupported CR4 values. Newer versions do handle this correctly. But some probes (in particular one that tries to pass the OSXSAVE bit set) were causing pv-ops kernels to crash early on boot when running on EC2. We were using a patch that did always filter the OSXSAVE off the values written to CR4 when running as Xen PV guest. While not completely wrong this creates an inconsistency between the cpuid bits a guest sees and the CR4 settings. And this did recently cause problems because user-space was not testing all bits when deciding to use certain features. This patch will actually mask off the cpuid bits for XSAVE and OSXSAVE, so generic code will not even try to set CR4. It is limited to PV guests and (since we do not actually know the exact version) Xen hypervisors before version 4. [v2: make the version check an inline function] Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: net: calxedaxgmac: fix net timeout recoveryRob Herring
BugLink: http://bugs.launchpad.net/bugs/1000831 Fix net tx watchdog timeout recovery. The descriptor ring was reset, but the DMA engine was not reset to the beginning of the ring. Also, set the number of AXI outstanding transactions to 8. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: force DMA buffers to non-bufferable on highbankRob Herring
BugLink: http://bugs.launchpad.net/bugs/1000831 The xgmac driver has problems with bufferable DMA descriptors. For now, change the memory type to get things working reliably. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: input: add a key driver for highbankRob Herring
BugLink: http://bugs.launchpad.net/bugs/1000831 Add a keyboard driver to handle power and sleep keys from the management controller. These are generated via ipc messages. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-11-14UBUNTU: SAUCE: arm highbank: add support for pl320-ipc driverMark Langsdorf
BugLink: http://bugs.launchpad.net/bugs/1000831 Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com> Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>