aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable late-attach on IPU2 and DSP2rvc-2.0p-ti-linux-3.14.y-android-rvcBuddy Liong2016-08-011-14/+9
| | | | | | | Modifying dts file to add late attach for IPU2 and DSP2 Change-Id: Ic6f305511d72d9f2efd0494fced4a7c371cefb97 Signed-off-by: Buddy Liong <a0270631@ti.com>
* Enable Robust RVC on IPU2 and DSP2Buddy Liong2016-08-011-13/+25
| | | | | | | | Modify the configuration to run Robust RVC on IPU2 and DSP2. The configuration is without late-attach. Change-Id: I00f186e7f35e37efe5e54dd9d819a7eec239550b Signed-off-by: Buddy Liong <a0270631@ti.com>
* Update memory reserve for Vision SDK 2.10Buddy Liong2016-08-011-3/+3
| | | | | | | | | | | | | | | On Vision SDK 2.9, the NDK_START_ADDR is started at 0x85800000 NDK_MEM_SIZE + SR1_FRAME_BUFFER_SIZE is 2MB + 250MB = 252MB (0xFC00000) So, it reserves the memory from 0x85800000 of size 0xFC00000 On Vision SDK 2.10, the NDK_START_ADDR is changed to start at 0x84000000 of size 0xFC00000 This change is needed due to the changes in mem_segment_definition_1024mb_rvc.xs on Vision SDK 2.10 Change-Id: I34ef2ba9c78e378cd13259bbf5d297cfb9c6ffe8 Signed-off-by: Buddy Liong <a0270631@ti.com>
* Enabling late-attach on dsp2 and ipu1 to get printoutrvc-1.0Buddy Liong2016-08-011-17/+7
| | | | | | | | | | | from A15 By enabling late-attach on dsp2 and ipu1, A15 is able to read and print the content of REMOTE_LOG_MEM to get the printout of remote core IPU1 and DSP2. Change-Id: Iccdb8c09bbadb96ef3794f21b11846b09a3a8126 Signed-off-by: Buddy Liong <a0270631@ti.com>
* Enabling USB1, USB2, WLAN with RVCBuddy Liong2016-06-161-19/+0
| | | | | | | | | Enabling omap_dwc3_1, omap_dwc3_2, uart3, and evm_3v3_sd which requires for Android USB1, USB2, and wlan. RVC based on vision sdk 2.8 is still functional with those enabled. Signed-off-by: Buddy Liong <a0270631@ti.com>
* Remove mailbox5 from dra7-evm-robust-rvc.dtsBuddy Liong2016-06-161-7/+0
| | | | | | | | | | By disabling mailbox5, it disables the radio because mailbox5 is used for ipu1 and dsp1. Disabling mbox_ipu1_legacy should be sufficient instead of disabling the whole mailbox5. Android Radio is using dsp1. Signed-off-by: Buddy Liong <a0270631@ti.com>
* Remove mailbox6 from dra7-evm-robust-rvc.dtsBuddy Liong2016-06-161-6/+0
| | | | | | | | | By disabling mailbox6, it disables the video because mailbox6 is used for ipu2 and dsp2. Disabling mbox_dsp2_legacy should be sufficient instead of disabling the whole mailbox6. Signed-off-by: Buddy Liong <a0270631@ti.com>
* Reserved the memory address used by Vision SDKSunita Nadampalli2016-05-131-3/+10
| | | | | | | | | | | | | Reserving memory used by Vision SDK configured at \vision_sdk\build\tda2xx\mem_segment_definition_1024mb_rvc.xs Address 0x85800000 - 0x95400000 of size 0xFC00000 for NDK_MEM and SR1_FRAME_BUFFER_MEM Address 0xA0000000 - 0xA2000000 of size 0x2000000 for SR0, REMOTE_LOG_MEM, LINK_STATS_MEM, SYSTEM_IPC_SHM_MEM, HDVPSS_DESC_MEM, TRACE_BUF, EXC_DATA, and PM_DATA Since Robust RVC doesn't use EVE, we do not need to reserve the memory address range 0xA2000000 - 0xA6000000 of size 0x4000000. Change-Id: I1ddf39b2eae68520938f80e7838ca015d3528d87 Signed-off-by: Buddy Liong <a0270631@ti.com>
* android config: Disable A15 WatchDog timerSunita Nadampalli2016-05-091-1/+1
| | | | | | | | This is for A15 crash to not to interfere with SW running on the other remote cores. Change-Id: Iea881b4a6f51af3539eb18b119eb0da65403658b Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
* ARM: DTS: Added logic to exlude DSP2 nodes from Robust RVC DTS for DRA7 PlatformSunita Nadampalli2016-05-041-0/+56
| | | | | Change-Id: Icb7f48c4044ef77269dcd976c19d73991cfcffe4 Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
* DSS: Changes to share Display subsystem with remotecores on DRA7Sunita Nadampalli2016-05-045-13/+56
| | | | | | | | | | | | | | | | | | 1. Added DT property parsing and populating the subsystem share property 2. Defined A15 Interrupt masking to not to conflict with DSS interrupts dedicated to remotecore 3. DRM irq handler changes to handle only interrupts assigned to A15 and ignore other interrupts assigned to remotecore. Note: The scenario considered here is: 1. Primary LCD is the display used 2. Both A15 and remotecore (eg.IPU) are using the same Display 3. VID2 and VID3 DSS pipes are used from the remotecore and enables EOW interrupt 4. GFX and VID1 pipes are used on A15 and enables LCD VSYNC interrupt Change-Id: I0dfeeaeb11c5893982efb55d49bb9a4176dfb8b7 Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
* DRA7: HWMOD: WORKAROUND to Exclude unsed clock gating and parent hwmod ↵Sunita Nadampalli2016-05-042-2/+9
| | | | | | | | | controls for DSS This patch needs revisit to handle it in a better way Change-Id: Ie1dfaf62d8aecebec7aa5771cd30d006f601191a Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
* ARM: DTS: add Robust RVC DTS for DRA7 PlatformSunita Nadampalli2016-05-042-0/+111
| | | | | Change-Id: Id70df2d474c8bf38964e6bdb265c8e84e4b38c4f Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
* ARM: DTSi and DRA7 EVM DTS: changes to define few nodes as variable nodesSunita Nadampalli2016-05-042-4/+4
| | | | | Change-Id: I61aaf4a51f3b02eb58d90fb1b34dd0edc367c8e4 Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
* Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-androidandroid-3.14-6AM.1.0Praneeth Bajjuri2016-03-182-101/+103
|\ | | | | | | | | | | | | | | | | | | | | | | | | * p-ti-linux-3.14.y-common: pm: dra7: Restrict vip/vpe power domain state to INA pm: dra7: Update power domain states as per new spec ARM: OMAP: DRA7: powerdomain data: Remove CSWR with the exception of MPU ARM: OMAP: DRA7: powerdomain data: Fix "ON" state for memories ARM: OMAP: DRA7: powerdomain data: Remove wrong OSWR capability ARM: dts: dra7-evm: mmc: fix typos in register names and values Change-Id: I3a327104320949e44fd891d790f145e3d27ff0b1 Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
| * pm: dra7: Restrict vip/vpe power domain state to INARavikumar Kattekola2016-03-181-2/+2
| | | | | | | | | | | | | | | | | | VIP/VPE drivers do not support context save/restore. Restrict PD state to Inactive till support is added. This also enables quick resume of camera on wake up. Change-Id: I62911e268639568b9d4b58c855eca430bb896e89 Signed-off-by: Ravikumar Kattekola <rk@ti.com>
| * pm: dra7: Update power domain states as per new specRavikumar Kattekola2016-03-181-2/+2
| | | | | | | | | | | | | | | | | | As per updated TRM, DOc update :TBD EMU and Custefuse do not support any low power states. Change-Id: Ifdc4c146d972b1a03bbcec49d897ad7e168b6045 Signed-off-by: Ravikumar Kattekola <rk@ti.com>
| * ARM: OMAP: DRA7: powerdomain data: Remove CSWR with the exception of MPUNishanth Menon2016-03-181-35/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the latest definitions for DRA7/AM57xx SoCs, the internal memories of SoC do not support retention mode any longer (with the exception of MPU), as a result of the same, we also end up losing CSWR (where powerdomain state can be programmed to retention state). This implies that, with the exception of MPU power domain, all other power domains can either operate in "ON" mode OR where possible "OFF" mode (when permitted by lack of silicon errata). Change-Id: I34dbf9b2b5732cdf57172728859bce405f1d739b Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ravikumar Kattekola <rk@ti.com>
| * ARM: OMAP: DRA7: powerdomain data: Fix "ON" state for memoriesNishanth Menon2016-03-181-33/+33
| | | | | | | | | | | | | | | | | | | | When the power domain is in "ON" state, the memories should be always in "ON", even though the hardware register allows other states to be written, wrong states may confuse certain hardware blocks. Change-Id: Idcaedaf8cd97b5be78c44315126b6d1a1779aaa9 Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ravikumar Kattekola <rk@ti.com>
| * ARM: OMAP: DRA7: powerdomain data: Remove wrong OSWR capabilityNishanth Menon2016-03-181-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Open Switch Retention(OSWR) is a retention state which is unsupported in DRA7 SoC. This state is achieved when power state is set to retention and logic power state is set to OFF. Even though DRA7 architecture is a OMAP5 derivative, none of the powerdomains are actually designed to achieve OSWR in the SoC. Change-Id: I7f2ac011502e90a6b5da2afd9a1826193ca26cfe Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ravikumar Kattekola <rk@ti.com>
| * ARM: dts: dra7-evm: mmc: fix typos in register names and valuesVishal Mahaveer2016-03-181-23/+23
| | | | | | | | | | | | | | | | Fix typos in register names and values used for mmc1 and mmc4 manual mode values. Change-Id: I7294e95580e0622b552d896aff78bbab4d8464a9 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
* | OMAPDRM: android: Removed HDMI HPD IRQ RegistrationMarcus Cooksey2016-03-171-0/+3
| | | | | | | | | | | | | | | | Android doesn't require IRQ based HPD notification, since HPD notification are sent via uevents. Change-Id: I50e6f978cd1639a55c2ff37abdca11dfcb4a82a9 Signed-off-by: Marcus Cooksey <mcooksey@ti.com>
* | Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-androidPraneeth Bajjuri2016-03-173-3/+4
|\| | | | | | | | | | | | | | | | | | | * p-ti-linux-3.14.y-common: ARM: DRA722: OPP: reuse OPP information for Silicon Rev 2.0 ARM: DRA722: Add ID detect for Silicon Rev 2.0 ARM: DRA722: remove redundant definition of 1.0 device Change-Id: I0c0f7f5dd7c30b442dfdc4c3851e4b0150a9c369 Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
| * ARM: DRA722: OPP: reuse OPP information for Silicon Rev 2.0Vishal Mahaveer2016-03-171-0/+1
| | | | | | | | | | | | | | Silicon Rev 2.0 variant of DRA722 reuses the same OPP information as Rev 1.0 Change-Id: I39a068d8d2146fc3a09c04fcba7421096eaaec7b Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| * ARM: DRA722: Add ID detect for Silicon Rev 2.0Vishal Mahaveer2016-03-172-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Silicon Rev 2.0 is a minor variant of Rev 1.0. Rev 2.0 is an incremental revision with various fixes including the following: - Reset logic fixes - Few asymetric aging logic fixes - Ethernet speed fixes - EDMA fixes for McASP Change-Id: Ifb0619dbf55d4108a2cb181c09c3408bfb167d62 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| * ARM: DRA722: remove redundant definition of 1.0 deviceVishal Mahaveer2016-03-171-1/+0
| | | | | | | | | | | | | | | | Remove duplicate definition of Rev 1.0 device. Fixes: 81032e34e184 ("ARM: DRA752: Add ID detect for ES2.0") Change-Id: If0f4c47c9f67c5273526cf72180afbb0fac8748e Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
* | Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-androidPraneeth Bajjuri2016-03-161-1/+1
|\| | | | | | | | | | | | | | | * p-ti-linux-3.14.y-common: ARM: dtsi: jamr3: Update SR0 range for UIO Change-Id: I45f60e708d807bf8ccbebc6e5e022fb91cdc2c4d Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
| * ARM: dtsi: jamr3: Update SR0 range for UIOMisael Lopez Cruz2016-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The SharedRegion 0 range was recently changed by commit: "c22b04c arm: dtsi: jamr3: Adjusting DSP SR0 range" But the update was only for the 'reserved_mem' node and a similar change is also required for the UIO node. Change-Id: I56cb30d0146032dcbaaf296af5283ba22c3064ad Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
* | OMAPDRM: Force HDMI WP ON to recieve HPD eventsMarcus Cooksey2016-03-162-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | Forces the HDMI WP core on, otherwise the core will not generate a HPD interrupt since the module is off. The side effect of forcing the module on is that default display modes are selected. A reprobe, accomplished by software disconnect and reconnect of the monitor, occurs upon HPD. Change-Id: Ib25d9257f98aaf054d7629f91aaac826abb58f3b Signed-off-by: Marcus Cooksey <mcooksey@ti.com>
* | Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-androidPraneeth Bajjuri2016-03-1611-1/+97
|\| | | | | | | | | | | | | | | | | | | | | | | * p-ti-linux-3.14.y-common: OMAPDRM: Register HDMI HPD Callback for HDMI HPD Interrupts OMAPDSS: Added New API to Register Callback for Notification of HPD Conflicts: drivers/video/fbdev/omap2/dss/hdmi5.c Change-Id: If661df80907b1c5e3f4944c55ea0494c4f3c35d0 Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
| * OMAPDRM: Register HDMI HPD Callback for HDMI HPD InterruptsMarcus Cooksey2016-03-164-0/+43
| | | | | | | | | | | | | | | | | | | | | | HDMI hotplug detection is now achieved by registering a DRM callback with the display driver. The display driver will invoke this callback function when an HPD event occurs. The HPD Poll worker task is used to reconfigure the display mode based on monitor preferences. Signed-off-by: Marcus Cooksey <mcooksey@ti.com> Change-Id: I5c098bfdedffb83eab97b70c95c04c325140342c
| * OMAPDSS: Added New API to Register Callback for Notification of HPDMarcus Cooksey2016-03-167-1/+57
| | | | | | | | | | | | | | | | An additional DSS API was added for registering a callback function to be invoked when a display HPD detect event occurs. Change-Id: I13d126826c0c2bde4b8f542ecb64d9cf65606444 Signed-off-by: Marcus Cooksey <mcooksey@ti.com>
* | Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-androidVishal Mahaveer2016-03-155-72/+0
|\| | | | | | | | | | | | | | | * p-ti-linux-3.14.y-common: Revert "dts: Add DTS files for HS parts/platforms" Change-Id: Idd73b8e5df9383ca8ec96906d9d053fd241739df Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| * Revert "dts: Add DTS files for HS parts/platforms"Vishal Mahaveer2016-03-155-72/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 636f93205f2cee0531b21b74773ce333983dd02b. With the latest u-boot patch that got merged, we no longer need seperate dtbs for HS parts. u-boot commit (faa8b78 u-boot: security: Update fdt on HS devices) Conflicts: arch/arm/boot/dts/Makefile Change-Id: Id208802d0ffd3e594080248574753f8b65f773ad Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
* | Revert "Revert "ti: config: android: disable kdevtmpfs""Vishal Mahaveer2016-03-111-0/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 257a0dce34ee508158f916a3aab015b3649dba5a. Enable kdevtmpfs for avoiding SELinux denials related to tmpfs. Android does not need this feature and hence disabling it. Change-Id: I61b81e7bf0ce79c817ddcf1e60681d1150cb33b7 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
* | ti: config: android: enable cgroups/cpusetsVishal Mahaveer2016-03-111-0/+1
| | | | | | | | | | | | Enable cgroups/cpuset config for Android Change-Id: I65ebc437c2d7933b38bb7fd9680b2ab85b5b2c89 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
* | Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-androidVishal Mahaveer2016-03-116-3/+156
|\| | | | | | | | | | | | | | | | | * p-ti-linux-3.14.y-common: arm: dtsi: jamr3: Adjusting DSP SR0 range remoteproc/omap: Fix DSP recovery issues with EDMA Change-Id: I2d1d6f6124643a4a8d81cd1077e8e4bbe10574bd Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| * arm: dtsi: jamr3: Adjusting DSP SR0 rangeglsdk-7.04.00.03p-ti-linux-3.14.y-common-rvcStephen Molfetta2016-03-111-2/+2
| | | | | | | | | | | | | | | | Moving reservation for DSP SharedRegion0 base address from 0xbfd00000 to 0xbfb00000. This is made in order to match the corresponding changes to the memory map of DSP Radio/APPE application. Change-Id: Ic74fd484bacc5a2c6be00e2de28735afc188f280 Signed-off-by: Stephen Molfetta <sjmolfetta@ti.com>
| * remoteproc/omap: Fix DSP recovery issues with EDMAStephen Molfetta2016-03-115-1/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resetting the DSP subsystem while there are pending DSP EDMA transfers or while the DSP EDMA is receiving DMA events from various peripherals (e.g. McASP) can cause various issues in the recovery process: - L3 errors which create a complete system lockup - DSPSS does not reset properly and put TPTCs into an unusable state Prior to shutdown of a DSP core, two cleanup/checks are required in order to mitigate these issues: 1. Clear DSP EDMA crossbar routings Upon remoteproc reset of the DSP, DMA events may continue to arrive to the DSPs EDMA instance after the reset sequence has completed. Clearing the crossbar ensures that no unexpected events arrive to the DSP's EDMA after reset 2. Wait for DSP EDMA traffic completion After clearing DSP EDMA crossbar routings, we disable all future events and poll the various active bits of the TPCC and both TPTCs of the DSP's EDMA and wait for any pending transfers to complete prior to issuing the reset. Change-Id: I4ba7c414c8f38f95cc2a4a60f63bd7095f73788c Signed-off-by: Stephen Molfetta <sjmolfetta@ti.com> Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
* | Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-androidVishal Mahaveer2016-03-043-4/+11
|\| | | | | | | | | | | | | | | * p-ti-linux-3.14.y-common: ARM: dts: dra72-evm: fix touchscreen on OSD LCD Change-Id: If8299df49a85f544fc11d88e68520f1214b277f6 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| * ARM: dts: dra72-evm: fix touchscreen on OSD LCDSekhar Nori2016-03-043-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dra7x-evm-lcd-osd.dtsi has touchscreen interrupt set to line #2 of GPIO1. However, this is incorrect for DRA72 EVM. Since the irq line differs between different boards, move it from the generic OSD LCD device-tree include file to board specific .dts file. This fixes touchscreen working on DRA72x EVM. Change-Id: I15f0ab58e8d343876ba73ff768af9dc033f2a5ef Signed-off-by: Sekhar Nori <nsekhar@ti.com> [Back ported from LCPD Kernel 4.1] Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
* | Merge remote-tracking branch 'origin/p-ti-linux-3.14.y-common' into ↵Praneeth Bajjuri2016-03-041-0/+3
|\| | | | | | | | | | | | | | | | | | | p-ti-linux-3.14.y-android * origin/p-ti-linux-3.14.y-common: ARM: dts: dra72-evm-lcd-osd: disable ldc3001 node Change-Id: I56671f24c64494f2b591ef81bd947a3ba51a40fa Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
| * ARM: dts: dra72-evm-lcd-osd: disable ldc3001 nodeVishal Mahaveer2016-03-041-0/+3
| | | | | | | | | | | | | | | | Disable ldc3001 node to avoid IRQ flooding from this device. This is similar to change done in dra7-evm-lcd-osd dts. Change-Id: I1368dcfff1aeb054622e04055e4c1fd948aea672 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| * Merge branch 'ti-linux-3.14.y' of ↵Praneeth Bajjuri2016-03-04136-518/+933
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.ti.com/ti-linux-kernel/ti-linux-kernel into p-ti-linux-3.14.y-common * 'ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel: (131 commits) Linux 3.14.63 iwlwifi: update and fix 7265 series PCI IDs xen/pcifront: Fix mysterious crashes when NUMA locality information was extracted. do_last(): don't let a bogus return value from ->open() et.al. to confuse us kernel/resource.c: fix muxed resource handling in __request_region() sunrpc/cache: fix off-by-one in qword_get() tracing: Fix showing function event in available_events KVM: async_pf: do not warn on page allocation failures NFSv4: Fix a dentry leak on alias use nfs: fix nfs_size_to_loff_t PCI/AER: Flush workqueue on device remove to avoid use-after-free libata: fix sff host state machine locking while polling Revert "workqueue: make sure delayed work run in local cpu" rfkill: fix rfkill_fop_read wait_event usage cdc-acm:exclude Samsung phone 04e8:685d libceph: don't bail early from try_read() when skipping a message hwmon: (ads1015) Handle negative conversion values correctly IB/qib: fix mcast detach when qp not attached ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot() drm/radeon/pm: adjust display configuration after powerstate ... Change-Id: I52ede6200ce63cfaab1be52fd472481653776bc4 Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* | \ Merge branch 'ti-linux-3.14.y' of ↵Praneeth Bajjuri2016-03-04136-518/+933
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.ti.com/ti-linux-kernel/ti-linux-kernel into p-ti-linux-3.14.y-android * 'ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel: (131 commits) Linux 3.14.63 iwlwifi: update and fix 7265 series PCI IDs xen/pcifront: Fix mysterious crashes when NUMA locality information was extracted. do_last(): don't let a bogus return value from ->open() et.al. to confuse us kernel/resource.c: fix muxed resource handling in __request_region() sunrpc/cache: fix off-by-one in qword_get() tracing: Fix showing function event in available_events KVM: async_pf: do not warn on page allocation failures NFSv4: Fix a dentry leak on alias use nfs: fix nfs_size_to_loff_t PCI/AER: Flush workqueue on device remove to avoid use-after-free libata: fix sff host state machine locking while polling Revert "workqueue: make sure delayed work run in local cpu" rfkill: fix rfkill_fop_read wait_event usage cdc-acm:exclude Samsung phone 04e8:685d libceph: don't bail early from try_read() when skipping a message hwmon: (ads1015) Handle negative conversion values correctly IB/qib: fix mcast detach when qp not attached ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot() drm/radeon/pm: adjust display configuration after powerstate ... Change-Id: I59459637400f0f2bcb910f2fc1bcfb933b4e8542 Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
| * | Merge tag 'v3.14.63' of ↵LCPD Auto Merger2016-03-03136-518/+933
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.14.y This is the 3.14.63 stable release * tag 'v3.14.63' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (131 commits) Linux 3.14.63 iwlwifi: update and fix 7265 series PCI IDs xen/pcifront: Fix mysterious crashes when NUMA locality information was extracted. do_last(): don't let a bogus return value from ->open() et.al. to confuse us kernel/resource.c: fix muxed resource handling in __request_region() sunrpc/cache: fix off-by-one in qword_get() tracing: Fix showing function event in available_events KVM: async_pf: do not warn on page allocation failures NFSv4: Fix a dentry leak on alias use nfs: fix nfs_size_to_loff_t PCI/AER: Flush workqueue on device remove to avoid use-after-free libata: fix sff host state machine locking while polling Revert "workqueue: make sure delayed work run in local cpu" rfkill: fix rfkill_fop_read wait_event usage cdc-acm:exclude Samsung phone 04e8:685d libceph: don't bail early from try_read() when skipping a message hwmon: (ads1015) Handle negative conversion values correctly IB/qib: fix mcast detach when qp not attached ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot() drm/radeon/pm: adjust display configuration after powerstate ... Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
| | * | Linux 3.14.63Greg Kroah-Hartman2016-03-031-1/+1
| | | |
| | * | iwlwifi: update and fix 7265 series PCI IDsOren Givon2016-03-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 006bda75d81fd27a583a3b310e9444fea2aa6ef2 upstream. Update and fix some 7265 PCI IDs entries. Signed-off-by: Oren Givon <oren.givon@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * | xen/pcifront: Fix mysterious crashes when NUMA locality information was ↵Konrad Rzeszutek Wilk2016-03-031-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extracted. commit 4d8c8bd6f2062c9988817183a91fe2e623c8aa5e upstream. Occasionaly PV guests would crash with: pciback 0000:00:00.1: Xen PCI mapped GSI0 to IRQ16 BUG: unable to handle kernel paging request at 0000000d1a8c0be0 .. snip.. <ffffffff8139ce1b>] find_next_bit+0xb/0x10 [<ffffffff81387f22>] cpumask_next_and+0x22/0x40 [<ffffffff813c1ef8>] pci_device_probe+0xb8/0x120 [<ffffffff81529097>] ? driver_sysfs_add+0x77/0xa0 [<ffffffff815293e4>] driver_probe_device+0x1a4/0x2d0 [<ffffffff813c1ddd>] ? pci_match_device+0xdd/0x110 [<ffffffff81529657>] __device_attach_driver+0xa7/0xb0 [<ffffffff815295b0>] ? __driver_attach+0xa0/0xa0 [<ffffffff81527622>] bus_for_each_drv+0x62/0x90 [<ffffffff8152978d>] __device_attach+0xbd/0x110 [<ffffffff815297fb>] device_attach+0xb/0x10 [<ffffffff813b75ac>] pci_bus_add_device+0x3c/0x70 [<ffffffff813b7618>] pci_bus_add_devices+0x38/0x80 [<ffffffff813dc34e>] pcifront_scan_root+0x13e/0x1a0 [<ffffffff817a0692>] pcifront_backend_changed+0x262/0x60b [<ffffffff814644c6>] ? xenbus_gather+0xd6/0x160 [<ffffffff8120900f>] ? put_object+0x2f/0x50 [<ffffffff81465c1d>] xenbus_otherend_changed+0x9d/0xa0 [<ffffffff814678ee>] backend_changed+0xe/0x10 [<ffffffff81463a28>] xenwatch_thread+0xc8/0x190 [<ffffffff810f22f0>] ? woken_wake_function+0x10/0x10 which was the result of two things: When we call pci_scan_root_bus we would pass in 'sd' (sysdata) pointer which was an 'pcifront_sd' structure. However in the pci_device_add it expects that the 'sd' is 'struct sysdata' and sets the dev->node to what is in sd->node (offset 4): set_dev_node(&dev->dev, pcibus_to_node(bus)); __pcibus_to_node(const struct pci_bus *bus) { const struct pci_sysdata *sd = bus->sysdata; return sd->node; } However our structure was pcifront_sd which had nothing at that offset: struct pcifront_sd { int domain; /* 0 4 */ /* XXX 4 bytes hole, try to pack */ struct pcifront_device * pdev; /* 8 8 */ } That is an hole - filled with garbage as we used kmalloc instead of kzalloc (the second problem). This patch fixes the issue by: 1) Use kzalloc to initialize to a well known state. 2) Put 'struct pci_sysdata' at the start of 'pcifront_sd'. That way access to the 'node' will access the right offset. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * | do_last(): don't let a bogus return value from ->open() et.al. to confuse usAl Viro2016-03-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c80567c82ae4814a41287618e315a60ecf513be6 upstream. ... into returning a positive to path_openat(), which would interpret that as "symlink had been encountered" and proceed to corrupt memory, etc. It can only happen due to a bug in some ->open() instance or in some LSM hook, etc., so we report any such event *and* make sure it doesn't trick us into further unpleasantness. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>