commits November 2011

commits@lists.open-mesh.org

1 participants
69 discussions

batman-adv; branch, master, updated. v2011.4.0-29-g5a1f1a5
by postmaster＠open-mesh.org 29 Nov '11

29 Nov '11

The following commit has been merged in the master branch: commit 5a1f1a52a2af40669b17db05cd18bb0b65b4afd0 Merge: 381755fddfc7a853a0b7cff7fcde122568828d39 624972cf3280ed43fc2e7a991b748361d3adebad Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Nov 29 14:42:08 2011 +0800 Merge branch 'next' -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.4.0-25-g624972c
by postmaster＠open-mesh.org 29 Nov '11

29 Nov '11

The following commit has been merged in the next branch: commit 624972cf3280ed43fc2e7a991b748361d3adebad Author: Dan Carpenter <dan.carpenter(a)oracle.com> Date: Tue Nov 29 09:09:09 2011 +0300 batman-adv: remove extra negation in gw_out_of_range() There is a typo here where an extra '!' made the check to the opposite of what was intended. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/gateway_client.c b/gateway_client.c index 9373a14..24403a7 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -695,7 +695,7 @@ bool gw_out_of_range(struct bat_priv *bat_priv, } neigh_old = find_router(bat_priv, orig_dst_node, NULL); - if (!!neigh_old) + if (!neigh_old) goto out; if (curr_tq_avg - neigh_old->tq_avg > GW_THRESHOLD) -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.4.0-25-g624972c
by postmaster＠open-mesh.org 29 Nov '11

29 Nov '11

The following commit has been merged in the next branch: commit da115ee995f5f3339fd775a4c794f77640baff4b Merge: f88628875f6c34d3bbb78d3e72f021290e722ca6 44bb66d56dd8bcbdd9f92bf43280a6b956a65652 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Nov 29 14:39:03 2011 +0800 Merge branch 'next' of git+ssh://batman-git/batman-adv into next -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.4.0-25-g624972c
by postmaster＠open-mesh.org 29 Nov '11

29 Nov '11

The following commit has been merged in the next branch: commit d552aa875ca8ad00fab1bb5bce7a028c6bb1288e Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Nov 13 20:40:39 2011 +0100 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/CHANGELOG b/CHANGELOG index 36477d6..992bb8a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +batman-adv 2011.4.0: + +* support latest kernels (2.6.29 - 3.2) +* starting of code refactoring to support multiple protocol versions +* added support for AP-isolation to prevent non-mesh WIFI clients to talk to + each other over the mesh +* some bugs (memory leaks in the translation table, wrong initialization of + ethernet addresses of translation table entries, ...) squashed + + -- Sun, 13 Nov 2011 20:40:05 +0100 + batman-adv 2011.3.1: * don't send all packets to selected gateway as broadcast -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.4.0-25-g624972c
by postmaster＠open-mesh.org 29 Nov '11

29 Nov '11

The following commit has been merged in the next branch: commit f88628875f6c34d3bbb78d3e72f021290e722ca6 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Nov 13 20:41:47 2011 +0100 batman-adv: Update README for upcoming release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/README b/README index 7bbcea1..c50cc0a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[state: 21-08-2011] +[state: 13-11-2011] BATMAN-ADV ---------- @@ -18,7 +18,7 @@ Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.29 - 3.1. Supporting +against and should work with Linux 2.6.29 - 3.2. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) -- batman-adv

1 0

linux integration; branch, for_david, created. for_net-next_20111126
by postmaster＠open-mesh.org 26 Nov '11

26 Nov '11

The branch, for_david has been created at 76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1 (commit) - Shortlog ------------------------------------------------------------ ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, for_net-next_20111126, created. for_net-next_20111126
by postmaster＠open-mesh.org 26 Nov '11

26 Nov '11

The annotated tag, for_net-next_20111126 has been created at a5a8105ab339c59765b7da175640c3225c5cf444 (tag) tagging 76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1 (commit) replaces v3.2-rc1 tagged by Sven Eckelmann on Sat Nov 26 14:09:20 2011 +0100 - Shortlog ------------------------------------------------------------ batman-adv 2011-11-26 for net-next Antonio Quartulli (5): batman-adv: tt_global_del_orig() has to print the correct message batman-adv: use orig_hash_find() instead of get_orig_node() in TT code batman-adv: fixed hash functions type to uint32_t instead of int batman-adv: linearise the tt_response skb only if needed batman-adv: check for tt_reponse packet real length Marek Lindner (1): batman-adv: refactoring gateway handling code Simon Wunderlich (2): batman-adv: directly write tt entries without buffering batman-adv: Fix range check for expected packets Sven Eckelmann (2): batman-adv: update internal version number batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo> ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; branch, for_david, deleted. v3.1-10734-gab91559
by postmaster＠open-mesh.org 26 Nov '11

26 Nov '11

The branch, for_david has been deleted was ab915599b74b4e2f01016618273d577c5637777b ----------------------------------------------------------------------- ab915599b74b4e2f01016618273d577c5637777b batman-adv: Fix range check for expected packets ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; branch, for_david, created. v3.1-10734-gab91559
by postmaster＠open-mesh.org 26 Nov '11

26 Nov '11

The branch, for_david has been created at ab915599b74b4e2f01016618273d577c5637777b (commit) - Shortlog ------------------------------------------------------------ commit ab915599b74b4e2f01016618273d577c5637777b Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Oct 30 16:22:43 2011 +0100 batman-adv: Fix range check for expected packets The check for new packets in the future used a wrong binary operator, which makes the check expression always true and accepting too many packets. Reported-by: Thomas Jarosch <thomas.jarosch(a)intra2net.com> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 680188cbc0fb178303c4150050df1df235d2812e Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Oct 16 20:32:03 2011 +0200 batman-adv: check for tt_reponse packet real length Before accessing the TT_RESPONSE packet payload, the node has to ensure that the packet is long enough as it would expect to be. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 5461524e3430f0bf7cfb5988f83805a5be8c6e14 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Oct 16 20:32:02 2011 +0200 batman-adv: linearise the tt_response skb only if needed The TT_RESPONSE skb has to be linearised only if the node plans to access the packet payload (so only if the message is directed to that node). In all the other cases the node can avoid this memory operation Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit ad1e0ec241d80a1eee9ff2957ab08a2ae5e72545 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sat Oct 22 18:15:26 2011 +0200 batman-adv: directly write tt entries without buffering When the translation tables (global and local) are written for debugfs, it is not neccesary to allocate a buffer, we can directly use seq_printf() to print them out. This might actually be safer if the table changes between size calculation and traversal, and we can't estimate the required size wrong. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 1dda27aa977afeb5d8f95386aa33ad0fcbb36704 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Oct 5 17:05:25 2011 +0200 batman-adv: fixed hash functions type to uint32_t instead of int There are two reasons for this fix: - the result of choose_orig() and vis_choose() is an index and therefore it can't be negative. Hence it is correct to make the return type unsigned too. - sizeof(int) may not be the same on ALL the architectures. Since we plan to use choose_orig() as DHT hash function, we need to guarantee that, given the same argument, the result is the same. Then it is correct to explicitly express the size of the return type (and the second argument). Since the expected length is currently 4, uint32_t is the most convenient choice. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 1d7ae92195e0d7c429188ecc0e1edd83b6b01ab8 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Oct 12 14:54:50 2011 +0200 batman-adv: use orig_hash_find() instead of get_orig_node() in TT code get_orig_node() tries to retrieve an orig_node object based on a mac address and creates it if not present. This is not the wanted behaviour in the translation table code as we don't want to create new orig_code objects but expect a NULL pointer if the object does not exist. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 9afdb0d28765d33581ad3f97d3dab94d32a7a6f2 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Sep 8 13:12:53 2011 +0200 batman-adv: refactoring gateway handling code Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> commit 1c0dd54a67f231d9d7dffa64d5a3979f8d37d897 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Sep 30 13:32:01 2011 +0200 batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo> strict_strto<foo> is obsolete since v3.1-rc8-8466-g14acc55 and should be replaced with kstrto<foo>. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit b1c320beaf07fd646f13fafc7410c903e0644d8d Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Sep 19 12:29:19 2011 +0200 batman-adv: tt_global_del_orig() has to print the correct message When deleting the entries, tt_global_del_orig() has to print the message passed as argument instead of a static one. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit f59fa66aba0bf11ab63306334a9291df576b15e3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 14 10:22:13 2011 +0100 batman-adv: update internal version number Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> commit 8f1646c635367911cf9268cb6378d49fecb5e436 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Mon Nov 7 16:16:02 2011 -0800 Linux 3.2-rc1 .. with new name. Because nothing says "really solid kernel release" like naming it after an extinct animal that just happened to be in the news lately. commit 10f91e5d1aa2ecff7325ab2e633b3b29315af282 Author: Tony Lindgren <tony(a)atomide.com> Date: Mon Nov 7 12:27:10 2011 -0800 ARM: OMAP: Fix export.h or module.h includes Commit 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (Merge branch 'modsplit-Oct31_2011'...) caused some build errors. Fix these and make sure we always have export.h or module.h included for MODULE_ and EXPORT_SYMBOL users: $ grep -rl ^MODULE_ arch/arm/*omap*/*.c | xargs \ grep -L linux/module.h arch/arm/mach-omap2/dsp.c arch/arm/mach-omap2/mailbox.c arch/arm/mach-omap2/omap-iommu.c arch/arm/mach-omap2/smartreflex.c Also check we either have export.h or module.h included for the files exporting symbols: $ grep -rl EXPORT_SYMBOL arch/arm/*omap*/*.c | xargs \ grep -L linux/export.h | xargs grep -L linux/module.h Cc: Russell King <rmk+kernel(a)arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit 06dcec8201f1b4752a7d68298bf4697297951d07 Author: Axel Lin <axel.lin(a)gmail.com> Date: Mon Nov 7 12:27:10 2011 -0800 ARM: OMAP: omap_device: Include linux/export.h Include linux/export.h to fix below build warning: CC arch/arm/plat-omap/omap_device.o arch/arm/plat-omap/omap_device.c:1055: warning: data definition has no type or storage class arch/arm/plat-omap/omap_device.c:1055: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' arch/arm/plat-omap/omap_device.c:1055: warning: parameter names (without types) in function declaration Signed-off-by: Axel Lin <axel.lin(a)gmail.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit 34ae0ffb389dffd10482ae1bb3efac90e0d77bc9 Author: Tony Lindgren <tony(a)atomide.com> Date: Thu Oct 6 15:43:00 2011 -0700 ARM: OMAP2: Fix H4 matrix keyboard warning Convert to use matrix keyboard to remove the warning "Please update the board to use matrix-keypad driver". Based on similar setup in palmtc.c. Note that this patch is compile tested only because of lack of working hardware. Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit 18655f439b2b2f27c33df856c750e3cc5ddda972 Author: Jarkko Nikula <jarkko.nikula(a)bitmer.com> Date: Fri Nov 4 13:28:04 2011 +0200 ARM: OMAP1: Remove unused omap-alsa.h There is no use for omap-alsa.h and board-palmz71.c doesn't need it either. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)bitmer.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit 8c3e01be0695daf60b325ba0bb52906a5fd29923 Author: Tony Lindgren <tony(a)atomide.com> Date: Thu Oct 6 17:05:51 2011 -0700 ARM: OMAP1: Fix warnings about enabling 32 KiHz timer Fix "Enable 32kHz OS timer in order to allow sleep states in idle" warning. We are now compiling in bothe MPU timer and 32 KiHz timer, so this warning is only valid when MPU_TIMER is set and OMAP_DM_TIMER is not set. Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit 5bfd7b5bf73c7a2002526678c5c3977e25e664e8 Author: Benoit Cousson <b-cousson(a)ti.com> Date: Tue Oct 4 23:20:41 2011 +0200 ARM: OMAP2+: timer: Remove omap_device_pm_latency Remove the structure since a default one is now available. Signed-off-by: Benoit Cousson <b-cousson(a)ti.com> Cc: Kevin Hilman <khilman(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit 9987ddb1e8e99a711aa4b1238db5774124b865cc Author: Benoit Cousson <b-cousson(a)ti.com> Date: Tue Oct 4 23:20:40 2011 +0200 ARM: OMAP2+: clock data: Remove redundant timer clkdev The commit 318c3e15cd55c73a26ae22a65a8183655b3003f9 added some "fck" clock alias to timer devices that are not needed anymore since hwmod framework will create them automatically. A warning was added to highlight and thus fix the redundancy. [ 0.616424] omap_timer.1: alias fck already exists [ 0.621948] omap_timer.2: alias fck already exists [ 0.627380] omap_timer.3: alias fck already exists [ 0.632781] omap_timer.4: alias fck already exists [ 0.638214] omap_timer.5: alias fck already exists [ 0.643615] omap_timer.6: alias fck already exists [ 0.649078] omap_timer.7: alias fck already exists [ 0.654479] omap_timer.8: alias fck already exists [ 0.659881] omap_timer.9: alias fck already exists [ 0.665283] omap_timer.10: alias fck already exists [ 0.670776] omap_timer.11: alias fck already exists Remove all the clkdev entries for timer fck alias. Signed-off-by: Benoit Cousson <b-cousson(a)ti.com> Cc: Tarun Kanti DebBarma <tarun.kanti(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit b22163f13caeda23dd2a2cc812633778c5bb4db7 Author: Thomas Weber <weber(a)corscience.de> Date: Tue Sep 6 17:11:49 2011 +0200 ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio Remove the init of card detect pin because omap_mux_init_gpio() is called during hsmmc initialization for the write protect and card detect pin. Signed-off-by: Thomas Weber <weber(a)corscience.de> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit f592003315165f420ae14c04d22c9fd2c348a5ae Author: Bjarne Steinsbo <bsteinsbo(a)gmail.com> Date: Thu Oct 6 13:03:46 2011 -0700 ARM: OMAP: usb: musb: OMAP: Delete unused function Not in use anymore. Signed-off-by: Bjarne Steinsbo <bsteinsbo(a)gmail.com> Acked-by: Felipe Balbi <balbi(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit e4e1ee55b6d46ab815a4943106249bf9494f3f83 Author: Jarkko Nikula <jarkko.nikula(a)bitmer.com> Date: Fri Nov 4 13:18:02 2011 +0200 MAINTAINERS: Update linux-omap git repository linux-omap is back at git.kernel.org. Path is the same than before except -2.6 appendix. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)bitmer.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit eafd3c9353a38e7420be2df6d6199b616964d8ff Author: Tomi Valkeinen <tomi.valkeinen(a)ti.com> Date: Thu Jun 9 16:56:23 2011 +0300 ARM: OMAP: change get_context_loss_count ret value to int get_context_loss_count functions return context loss count as u32, and zero means an error. However, zero is also returned when context has never been lost and could also be returned when the context loss count has wrapped and goes to zero. Change the functions to return an int, with negative value meaning an error. OMAP HSMMC code uses omap_pm_get_dev_context_loss_count(), but as the hsmmc code handles the returned value as an int, with negative value meaning an error, this patch actually fixes hsmmc code also. Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> Acked-by: Kevin Hilman <khilman(a)ti.com> Acked-by: Paul Walmsley <paul(a)pwsan.com> [tony(a)atomide.com: updated to fix a warning with recent dmtimer changes] Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit 88d51f7764cbe4bbb6c5669f31fa0a53676a70e2 Author: Balaji T K <balajitk(a)ti.com> Date: Mon Oct 3 17:52:51 2011 +0530 ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly Fix the typo, instead it should be SDMMC1 USBC1 is not related to MMC1 I/Os Signed-off-by: Balaji T K <balajitk(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit f45996fe5071a9253d12040263a01d2d67afeb3a Author: Balaji T K <balajitk(a)ti.com> Date: Mon Oct 3 17:52:50 2011 +0530 ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF MMC1 data line IO's are powered down in before set regulator function. IO's should not be powered ON when regulator is OFF. Keep the IO's in power pown mode after regulator OFF otherwise VMODE_ERROR interrupt is generated due to mismatch in input (regulator) voltage and MMC IO drive voltage. Delete incorrect comments which are not applicable for OMAP4. Signed-off-by: Balaji T K <balajitk(a)ti.com> Signed-off-by: Kishore Kadiyala <kishore.kadiyala(a)ti.com> Reported-by: Viswanath Puttagunta <vishp(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit 8c28dd71ce224783c5be557389ceab768e78bb6d Author: Paul Walmsley <paul(a)pwsan.com> Date: Thu Oct 6 14:39:28 2011 -0600 ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list Commit d6504acd2125984c61dce24727dd3842d0144015 ("OMAP2+: hwmod: remove OMAP_CHIP*") tests the inverse condition of what it should be testing for the return value from omap_hwmod_register(). This causes several IP blocks to not be registered on several OMAP3 family devices. Fixing that bug also unmasked another bug, originally reported by Chase Maupin <chase.maupin(a)ti.com> and then subsequently by Abhilash K V <abhilash.kv(a)ti.com>, which caused SmartReflex IP blocks to be registered on SoCs that don't support them. Thanks to Russell King - ARM Linux <linux(a)arm.linux.org.uk> for comments on a previous version of the patch. Signed-off-by: Paul Walmsley <paul(a)pwsan.com> Cc: Chase Maupin <chase.maupin(a)ti.com> Cc: Abhilash K V <abhilash.kv(a)ti.com> Cc: Russell King - ARM Linux <linux(a)arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit 21a67921ea004735230c49970fb667ce2a84793e Author: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Date: Wed Nov 2 12:54:03 2011 +0100 ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success Commit 4d17aeb1c5b2375769446d13012a98e6d265ec13 ("OMAP: I2C: split device registration and convert OMAP2+ to omap_device") makes omap2_i2c_add_bus() return a pointer to an omap_device instead on success instead of 0. This breaks the omap_register_i2c_bus() ABI and results in the igep0020 board code detecting an I2C bus registration error when there is none. Fix the problem by using PTR_RET() instead of PTR_ERR() in omap2_i2c_add_bus(). Reported-by: Alexander Kinzer <a.kinzer(a)plusoptix.de> Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> [tony(a)atomide.com: updated to return pdev instead of od] Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit c94de153b49c13fe29be0c3ce0ef5d05a83fe500 Author: Axel Lin <axel.lin(a)gmail.com> Date: Wed Nov 2 09:49:46 2011 +0800 ARM: OMAP: dmtimer: Include linux/module.h Include linux/module.h to fix below build error: CC arch/arm/plat-omap/dmtimer.o arch/arm/plat-omap/dmtimer.c:184: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:184: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:184: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:215: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:215: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:215: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:228: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:228: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:228: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:234: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:234: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:234: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:240: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:240: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:240: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:248: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:248: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:248: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:294: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:294: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:294: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:302: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:302: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:302: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:316: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:316: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:316: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:344: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:344: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:344: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:361: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:361: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:361: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:380: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:380: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:380: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:406: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:406: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:406: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:443: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:443: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:443: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:468: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:468: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:468: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:494: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:494: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:494: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:517: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:517: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:517: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:534: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:534: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:534: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:549: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:549: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:549: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:561: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:561: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:561: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:572: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:572: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:572: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:587: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:587: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:587: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:604: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:604: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/plat-omap/dmtimer.c:604: warning: parameter names (without types) in function declaration arch/arm/plat-omap/dmtimer.c:746: error: expected declaration specifiers or '...' before string constant arch/arm/plat-omap/dmtimer.c:746: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:746: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION' arch/arm/plat-omap/dmtimer.c:746: warning: function declaration isn't a prototype arch/arm/plat-omap/dmtimer.c:747: error: expected declaration specifiers or '...' before string constant arch/arm/plat-omap/dmtimer.c:747: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:747: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE' arch/arm/plat-omap/dmtimer.c:747: warning: function declaration isn't a prototype arch/arm/plat-omap/dmtimer.c:748: error: expected declaration specifiers or '...' before string constant arch/arm/plat-omap/dmtimer.c:748: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:748: warning: type defaults to 'int' in declaration of 'MODULE_ALIAS' arch/arm/plat-omap/dmtimer.c:748: warning: function declaration isn't a prototype arch/arm/plat-omap/dmtimer.c:749: error: expected declaration specifiers or '...' before string constant arch/arm/plat-omap/dmtimer.c:749: warning: data definition has no type or storage class arch/arm/plat-omap/dmtimer.c:749: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR' arch/arm/plat-omap/dmtimer.c:749: warning: function declaration isn't a prototype make[1]: *** [arch/arm/plat-omap/dmtimer.o] Error 1 make: *** [arch/arm/plat-omap] Error 2 Signed-off-by: Axel Lin <axel.lin(a)gmail.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit d9f153665edd0744b33e7b5a2ba6121e6c8b6fc8 Author: Axel Lin <axel.lin(a)gmail.com> Date: Wed Nov 2 09:40:11 2011 +0800 ARM: OMAP2+: l3-noc: Include linux/module.h Include linux/module.h to fix below build error: CC arch/arm/mach-omap2/omap_l3_noc.o arch/arm/mach-omap2/omap_l3_noc.c:240: error: expected ',' or ';' before 'MODULE_DEVICE_TABLE' arch/arm/mach-omap2/omap_l3_noc.c:250: error: 'THIS_MODULE' undeclared here (not in a function) make[1]: *** [arch/arm/mach-omap2/omap_l3_noc.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 Signed-off-by: Axel Lin <axel.lin(a)gmail.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit d8b5eb6d10b170e582c997217473a2a8e9a16cdf Author: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Thu Nov 3 10:41:22 2011 +0200 ARM: OMAP2+: devices: Fixes for McPDM Commit f718e2c034bf6ff872106344935006230764cb12 (ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures) removed these structures. Commit 3528c58eb9e818b7821501afa2916eb12131994a (OMAP: omap_device: when building return platform_device instead of omap_device) now returns platform_device instead of omap_device. Fix up the omap-mcpdm init function since this part comes via sound tree, and there has been changes regarding to hwmod/omap_device_build. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> CC: Benoit Cousson <b-cousson(a)ti.com> CC: Kevin Hilman <khilman(a)ti.com> [tony(a)atomide.com: updated comments] Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit a806e9acea89c048c75288c2e961b484d1bdb940 Author: Sanjeev Premi <premi(a)ti.com> Date: Thu Oct 13 21:44:10 2011 +0530 ARM: OMAP: Fix errors and warnings when building for one board When customizing omap2plus_defconfig to build for only one board (omap3evm), I came across these warnings and errors (filenames truncated): arch/arm/mach-omap2/board-generic.c:76:20: warning: 'omap4_init' defined but not used arch/arm/mach-omap2/built-in.o: In function `omap2420_init_early': arch/arm/mach-omap2/io.c:364: undefined reference to `omap2_set_globals_242x' arch/arm/mach-omap2/io.c:366: undefined reference to `omap2xxx_voltagedomains_init' arch/arm/mach-omap2/io.c:367: undefined reference to `omap242x_powerdomains_init' arch/arm/mach-omap2/io.c:368: undefined reference to `omap242x_clockdomains_init' arch/arm/mach-omap2/io.c:369: undefined reference to `omap2420_hwmod_init' arch/arm/mach-omap2/built-in.o: In function `omap2430_init_early': arch/arm/mach-omap2/io.c:376: undefined reference to `omap2_set_globals_243x' arch/arm/mach-omap2/io.c:378: undefined reference to `omap2xxx_voltagedomains_init' arch/arm/mach-omap2/io.c:379: undefined reference to `omap243x_powerdomains_init' arch/arm/mach-omap2/io.c:380: undefined reference to `omap243x_clockdomains_init' arch/arm/mach-omap2/io.c:381: undefined reference to `omap2430_hwmod_init' arch/arm/mach-omap2/built-in.o: In function `omap4430_init_early': arch/arm/mach-omap2/io.c:436: undefined reference to `omap2_set_globals_443x' arch/arm/mach-omap2/io.c:438: undefined reference to `omap44xx_voltagedomains_init' arch/arm/mach-omap2/io.c:439: undefined reference to `omap44xx_powerdomains_init' arch/arm/mach-omap2/io.c:440: undefined reference to `omap44xx_clockdomains_init' arch/arm/mach-omap2/io.c:441: undefined reference to `omap44xx_hwmod_init' This patch fixes them. Signed-off-by: Sanjeev Premi <premi(a)ti.com> Acked-by: Thomas Weber <weber(a)corscience.de> [tony(a)atomide.com: updated to fix warnings for board-generic.c] Signed-off-by: Tony Lindgren <tony(a)atomide.com> commit cc8eff5e5bdaaf425acf27d6596228dd99644e7b Author: Paul Walmsley <paul(a)pwsan.com> Date: Thu Oct 6 13:43:23 2011 -0600 ARM: OMAP3: PM: restrict erratum i443 handling to OMAP3430 only Based on the documents that I have here, there doesn't appear to be an equivalent to erratum i443 for OMAP3630, so restrict this one to OMAP34xx chips. Also, explicitly restrict this erratum to EMU and HS devices. Signed-off-by: Paul Walmsley <paul(a)pwsan.com> Signed-off-by: Kevin Hilman <khilman(a)ti.com> commit cd416be1c6b93ff4316d80b8e58e1b0232dbdafe Author: Paul Walmsley <paul(a)pwsan.com> Date: Thu Oct 6 17:18:45 2011 -0600 ARM: OMAP3: PM: fix I/O wakeup and I/O chain clock control detection The way that we detect which OMAP3 chips support I/O wakeup and software I/O chain clock control is broken. Currently, I/O wakeup is marked as present for all OMAP3 SoCs other than the AM3505/3517. The TI81xx family of SoCs are at present considered to be OMAP3 SoCs, but don't support I/O wakeup. To resolve this, convert the existing blacklist approach to an explicit, whitelist support, in which only SoCs which are known to support I/O wakeup are listed. (At present, this only includes OMAP34xx, OMAP3503, OMAP3515, OMAP3525, OMAP3530, and OMAP36xx.) Also, the current code incorrectly detects the presence of a software-controllable I/O chain clock on several chips that don't support it. This results in writes to reserved bitfields, unnecessary delays, and console messages on kernels running on those chips: http://www.spinics.net/lists/linux-omap/msg58735.html Convert this test to a feature test with a chip-by-chip whitelist. Thanks to Dave Hylands <dhylands(a)gmail.com> for reporting this problem and doing some testing to help isolate the cause. Thanks to Steve Sakoman <sakoman(a)gmail.com> for catching a bug in the first version of this patch. Thanks to Russell King <linux(a)arm.linux.org.uk> for comments. Signed-off-by: Paul Walmsley <paul(a)pwsan.com> Cc: Dave Hylands <dhylands(a)gmail.com> Cc: Steve Sakoman <sakoman(a)gmail.com> Tested-by: Steve Sakoman <sakoman(a)gmail.com> Cc: Russell King - ARM Linux <linux(a)arm.linux.org.uk> Signed-off-by: Kevin Hilman <khilman(a)ti.com> commit ad2d111fa3a9638d8f3e6a0bc62c348e1daaecbb Author: Charulatha V <charu(a)ti.com> Date: Tue Sep 13 18:32:37 2011 +0530 ARM: OMAP3: PM: fix pwrdm_post_transition call sequence The context lost count is modified in omap_sram_idle() path when pwrdm_post_transition() is called. But pwrdm_post_transition() is called only after omap_gpio_resume_after_idle() is called. Correct this so that context lost count is modified before calling omap_gpio_resume_after_idle(). This would be useful when OMAP GPIO save/restore context is called by the OMAP GPIO driver itself. Signed-off-by: Charulatha V <charu(a)ti.com> Reviewed-by: Santosh Shilimkar <santosh.shilimkar(a)ti.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Kevin Hilman <khilman(a)ti.com> commit 6c76fa0664b22da928091d427f2b00ed411c8937 Author: Abhilash K V <abhilash.kv(a)ti.com> Date: Fri Oct 7 03:08:56 2011 -0600 ARM: OMAP: AM35x: remove hwmods that aren't generic Removing modules iva, sr1_hwmod, sr2_hwmod, mailbox from the base omap3xxx_hwmods list, so that they can be excluded for am35x. This removes quite a few warnings on boot for AM35x. Signed-off-by: Abhilash K V <abhilash.kv(a)ti.com> [paul(a)pwsan.com: dropped 'mailbox class' comments; updated changelog] Signed-off-by: Paul Walmsley <paul(a)pwsan.com> commit b2a8ae7185007d58876e7c8c2839484227bf4f82 Author: Archit Taneja <archit(a)ti.com> Date: Fri Oct 7 03:08:44 2011 -0600 ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields Fix the shift and mask macros for DSIx_PPID fields in CONTROL_DSIPHY. The OMAP4430 Public TRM vV has these fields mentioned correctly. Signed-off-by: Archit Taneja <archit(a)ti.com> Acked-by: Benoit Cousson <b-cousson(a)ti.com> Acked-by: Santosh Shilimkar <santosh.shilimkar(a)ti.com> Signed-off-by: Paul Walmsley <paul(a)pwsan.com> commit e009513bdd47d81a0c9181ebc5bc39da9206dfb6 Author: Jon Hunter <jon-hunter(a)ti.com> Date: Fri Oct 7 01:44:20 2011 -0600 ARM: OMAP3+: Update DPLL Fint range for OMAP36xx and OMAP4xxx devices The OMAP36xx and OMAP4xxx DPLLs have a different internal reference clock frequency (fint) operating range than OMAP3430. Update the dpll_test_fint() function to check for the correct frequency ranges for OMAP36xx and OMAP4xxx. For OMAP36xx and OMAP4xxx devices, DPLLs fint range is 0.5MHz to 2.5MHz for j-type DPLLs and otherwise it is 32KHz to 52MHz for all other DPLLs. Signed-off-by: Jon Hunter <jon-hunter(a)ti.com> Signed-off-by: Paul Walmsley <paul(a)pwsan.com> commit c6569b60ed42a8dc69936b4bf7d0f928715711d2 Author: Jon Hunter <jon-hunter(a)ti.com> Date: Fri Oct 7 00:53:09 2011 -0600 ARM: OMAP4: clock: Add missing clock divider for OCP_ABE_ICLK The parent clock of the OCP_ABE_ICLK is the AESS_FCLK and the parent clock of the AESS_FCLK is the ABE_FCLK... ABE_FCLK --> AESS_FCLK --> OCP_ABE_ICLK The AESS_FCLK and OCP_ABE_ICLK clocks both have dividers which determine their operational frequency. However, the dividers for the AESS_FCLK and OCP_ABE_ICLK are controlled via a single bit, which is the CM1_ABE_AESS_CLKCTRL[24] bit. When this bit is set to 0, the AESS_FCLK divider is 1 and the OCP_ABE_ICLK divider is 2. Similarly, when this bit is set to 1, the AESS_FCLK divider is 2 and the OCP_ABE_ICLK is 1. The above relationship between the AESS_FCLK and OCP_ABE_ICLK dividers ensure that the OCP_ABE_ICLK clock is always half the frequency of the ABE_CLK... OCP_ABE_ICLK = ABE_FCLK/2 The divider for the OCP_ABE_ICLK is currently missing so add a divider that will ensure the OCP_ABE_ICLK frequency is always half the ABE_FCLK frequency. Signed-off-by: Jon Hunter <jon-hunter(a)ti.com> Signed-off-by: Paul Walmsley <paul(a)pwsan.com> commit 667d4a71f832f55e8fcbe8377c8c9aa2de832fc4 Author: Paul Walmsley <paul(a)pwsan.com> Date: Fri Oct 7 00:53:08 2011 -0600 ARM: OMAP4460: Clock: Adding support for 4460 specific clocks OMAP4460 specific clocks are not getting added as the cpu_is_omap44xx is choosing only OMAP4430 specific clock nodes. Changing it to add to OMAP4460 specific clocks also. This is clocks are required of temperature sensor. Signed-off-by: Vishwanath BS <vishwanath.bs(a)ti.com> Signed-off-by: Keerthy <j-keerthy(a)ti.com> Cc: paul(a)pwsan.com [paul(a)pwsan.com: updated to apply] Signed-off-by: Paul Walmsley <paul(a)pwsan.com> commit 3980faa76b14724e5699f42009f9c9cf79766820 Author: Jon Hunter <jon-hunter(a)ti.com> Date: Fri Oct 7 00:53:01 2011 -0600 ARM: OMAP3+: dpll: use DPLLs recalc function instead of omap2_get_dpll_rate This is a continuation of Mike Turquette's patch "OMAP3+: use DPLL's round_rate when setting rate". omap3_noncore_dpll_set_rate() and omap3_noncore_dpll_enable() call omap2_get_dpll_rate() explicitly. It may be necessary for some DPLLs to use a different function and so use the DPLLs recalc() function pointer instead. An example is the DPLL_ABE on OMAP4 which can have a 4X multiplier in addition to the usual MN multipler and dividers and therefore uses a different round_rate and recalc function. Signed-off-by: Jon Hunter <jon-hunter(a)ti.com> Cc: Mike Turquette <mturquette(a)ti.com> Cc: Misael Lopez Cruz <misael.lopez(a)ti.com> [paul(a)pwsan.com: merged this patch with Mike's "use clock's recalc in DPLL handling" patch; also reported by Misael] Signed-off-by: Paul Walmsley <paul(a)pwsan.com> commit 10e8653a8169ec4a6da7ab59c787198a413a3241 Author: Mike Turquette <mturquette(a)ti.com> Date: Fri Oct 7 00:53:00 2011 -0600 ARM: OMAP3+: dpll: assign clk rate from rounded rate during rate set The rounded rate can differ from target rate, so to better reflect reality set clk->rate equal to the rounded rate when setting DPLL frequency. This avoids issues where the DPLL frequency is slightly different than what debugfs clock tree reports using the old target rate. An example of a clock that requires this is DPLL_ABE on OMAP4 which can have a 4x multiplier on top of the usual MN dividers depending on register settings. This requires a special round_rate function that might yield a rate different from the initial target. Signed-off-by: Mike Turquette <mturquette(a)ti.com> Signed-off-by: Jon Hunter <jon-hunter(a)ti.com> Signed-off-by: Paul Walmsley <paul(a)pwsan.com> commit 52df35dcbfeb22fbf4ab1a94e4e961c23e845ca1 Author: Mike Turquette <mturquette(a)ti.com> Date: Fri Oct 7 00:52:59 2011 -0600 ARM: OMAP3+: dpll: use DPLL's round_rate when setting rate omap3_noncore_dpll_set_rate uses omap2_dpll_round_rate explicitly. Instead use the struct clk pointer's round_rate function to allow for DPLL's with special needs. An example of a clock that requires this is DPLL_ABE on OMAP4 which can have a 4x multiplier on top of the usual MN dividers depending on register settings. This requires a special round_rate function that might yield a rate different from the initial target. Signed-off-by: Mike Turquette <mturquette(a)ti.com> Signed-off-by: Jon Hunter <jon-hunter(a)ti.com> [paul(a)pwsan.com: split rate assignment portion into a separate patch] Signed-off-by: Paul Walmsley <paul(a)pwsan.com> commit 82f966b593d03b82eb812d27cd5bcee02193cbdd Author: Mike Turquette <mturquette(a)ti.com> Date: Fri Oct 7 00:52:58 2011 -0600 ARM: OMAP4: clock: round_rate and recalc functions for DPLL_ABE OMAP4 DPLL_ABE can enable a 4X multipler on top of the normal MN multipler and divider. This is achieved by setting CM_CLKMODE_DPLL_ABE.DPLL_REGM4XEN bit in CKGEN module of CM1. From the OMAP4 TRM: Fdpll = Fref x 2 x (4 x M/(N+1)) in case REGM4XEN bit field is set (only applicable to DPLL_ABE). Add new round_rate() and recalc() functions for OMAP4, that check the setting of REGM4XEN bit and handle this appropriately. The new functions are a simple wrapper on top of the existing omap2_dpll_round_rate() and omap2_dpll_get_rate() functions to handle the REGM4XEN bit. The REGM4XEN bit is only implemented for the ABE DPLL on OMAP4 and so only dpll_abe_ck uses omap4_dpll_regm4xen_round_rate() and omap4_dpll_regm4xen_recalc() functions. Signed-off-by: Mike Turquette <mturquette(a)ti.com> Tested-by: Jon Hunter <jon-hunter(a)ti.com> Signed-off-by: Jon Hunter <jon-hunter(a)ti.com> [paul(a)pwsan.com: fixed attempt to return a negative from a fn returning unsigned; pass along errors from omap2_dpll_round_rate(); added documentation; added Jon's S-o-b] Signed-off-by: Paul Walmsley <paul(a)pwsan.com> commit e3c46f3d62af44d87f14ab1de82b9fe8e5dfc4b1 Author: Al Viro <viro(a)ZenIV.linux.org.uk> Date: Mon Nov 7 21:21:26 2011 +0000 VFS: we need to set LOOKUP_JUMPED on mountpoint crossing Mountpoint crossing is similar to following procfs symlinks - we do not get ->d_revalidate() called for dentry we have arrived at, with unpleasant consequences for NFS4. Simple way to reproduce the problem in mainline: cat >/tmp/a.c <<'EOF' #include <unistd.h> #include <fcntl.h> #include <stdio.h> main() { struct flock fl = {.l_type = F_RDLCK, .l_whence = SEEK_SET, .l_len = 1}; if (fcntl(0, F_SETLK, &fl)) perror("setlk"); } EOF cc /tmp/a.c -o /tmp/test then on nfs4: mount --bind file1 file2 /tmp/test < file1 # ok /tmp/test < file2 # spews "setlk: No locks available"... What happens is the missing call of ->d_revalidate() after mountpoint crossing and that's where NFS4 would issue OPEN request to server. The fix is simple - treat mountpoint crossing the same way we deal with following procfs-style symlinks. I.e. set LOOKUP_JUMPED... Cc: stable(a)kernel.org Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> commit 25ca0007f519da8c19d7290b7780db8021cb3d4f Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Thu Nov 3 11:31:26 2011 -0200 perf top: Fix live annotation in the --stdio interface In the old --stdio interface the annotation is done just after one selects a symbol, while in --tui, now the default when the required libs are installed, we annotate all symbols with samples so that when annotation is asked we see what happened recently on that symbol. To achieve that the --stdio variant checks if the hist_entry being processed is the one selected by the user via the 's' hotkey. What happens now that we share the hist_entry abstractions with 'perf report' is that for minimizing locking contention multiple rb_trees are used, one for collecting the samples and other to browse/show them after resorting it by number of samples and decay them, which is done periodically. So the simple test in record_precise_ip doesn't work as we move hist_entries between those rb_trees. To fix it just check that the underlying struct symbol associated with those hist_entries is the same. Reported-by: Mike Galbraith <efault(a)gmx.de> Tested-by: Mike Galbraith <efault(a)gmx.de> Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-bcfnraqkux88fox9ba9767ds@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit 7850d784e3ac7f8b31415074182d4e307811b38e Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Wed Nov 2 12:46:18 2011 -0200 perf top tui: Don't recalc column widths considering just the first page It makes sense for the stdio where we can't navigate to the other pages. On the TUI it breaks as soon as we navigate to other pages that have, DSOs with longer names than the ones on the first page. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-zvqfp18mw229agb43cikgb0k@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit 28fe592124eb474762b6b65e64e03841878dc043 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Sat Oct 29 12:41:45 2011 -0200 perf report: Add progress bar when processing time ordered events So that for large perf.data files the user can have visual feedback that activity is being performed. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-3ysn01mpspfrbsy56gznzqqz@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit f46316f4f5f53cf3293ed9ed8e9a8251d66d877e Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Sat Oct 29 12:15:04 2011 -0200 perf hists browser: Warn about lost events Just like the old perf top --tui and the --stdio version. But because we have the initial menu to choose which event to show in a session with multiple events we can see how many chunks were lost in each of the event types, clarifying which events are being affected the most. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-47yyqbubmjzch2chezmb21m6@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit d44c22df69b4fe983bc3bdb4144315233e9ab164 Author: Masami Hiramatsu <masami.hiramatsu.pt(a)hitachi.com> Date: Tue Oct 4 19:44:56 2011 +0900 perf tools: Fix a typo of command name as trace-cmd Fix a typo which may be introduced when original code has been copied from trace-cmd. Cc: Ingo Molnar <mingo(a)elte.hu> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <a.p.zijlstra(a)chello.nl> Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: yrl.pp-manager.tt(a)hitachi.com Link: http://lkml.kernel.org/r/20111004104456.14591.37395.stgit@fedora15 Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt(a)hitachi.com> Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit 4a40c871213f9ffb7a6d3dd741685903b2fce3ee Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Thu Oct 27 09:19:48 2011 -0200 perf hists: Fix recalculation of total_period when sorting entries We were doing parts of it in hists__collapse_resort and parts of it in hists__output_resort, leading to a bogus total_period. Fix it by doing just the filtering operation when collapsing because there we know that the Zoom operations adds filters just what is in hists->entries, not to the new batch of entries being collapsed. And move all the nr_entries + total_period recalculation to hists__output_resort since we will traverse all entries anyway there. Problem introduced when developing threaded addition of new batches of hist_entries, i.e. post v3.1. Reported-by: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-8xyh165h7hmwy0696hu25en6@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit d51c94c16a93fb196bb75d9e1c0d7256e55caeb0 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Wed Oct 26 12:41:38 2011 -0200 perf header: Fix build on old systems For instance, on Fedora 8: CC /home/acme/git/build/perf/util/header.o cc1: warnings being treated as errors util/header.c: In function ‘write_cpudesc’: util/header.c:281: warning: implicit declaration of function ‘getline’ util/header.c:281: warning: nested extern declaration of ‘getline’ make: *** [/home/acme/git/build/perf/util/header.o] Error 1 make: Leaving directory `/home/acme/git/linux/tools/perf' [acme@localhost linux]$ This happens due to header ordering, in perf util.h sets _GNU_SOURCE, so it must come first. Reported-by: Ingo Molnar <mingo(a)elte.hu> Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-alfra9wao63euguj7gr8jw7e@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit 8f4fee6aa502c1c5b79f28ee64ab3655cc6e0424 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Wed Oct 26 12:04:37 2011 -0200 perf ui browser: Handle K_RESIZE in dialog windows Just provide wrappers for things like ui__warning, ui__dialog_yesno and if they return K_RESIZE, refresh dimensions, redraw the entries, etc. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-3ih7hyk9weryxaxb501sfq4u@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit 32753c3cdedd5c0179db82115d472cd627b81aee Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Wed Oct 26 08:19:05 2011 -0200 perf ui browser: No need to switch char sets that often Just before and after the loop. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-0lh91cedngyg1pqarbky5vn7@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit 9f53e9f10c7dcb252d73e8fcf36612eeff34b175 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Wed Oct 26 08:05:34 2011 -0200 perf hists browser: Use K_TIMER In the switch case entry for the timer routine. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-ypw3i9kmxoq28skx7jy914it@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit 357ab3f500d865daad50fc31dc3a9bcf6033f6e5 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Wed Oct 26 08:02:55 2011 -0200 perf ui: Rename ui__warning_paranoid to ui__error_paranoid As it will exit the tool after the user is notified. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-vy06m8xzlvkhr8tk7nylhbng@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit 1667f314b1518421e89bf6d3a817a7eaa0c33512 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Wed Oct 26 08:00:55 2011 -0200 perf ui: Reimplement the popup windows using libslang Just another step in stopping the use of libnewt in perf. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-vtxnmz1t1807ykprapnk9njl@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit e203b9676f597350a1b48567bcd1cf3a73c9ad00 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Wed Oct 26 07:11:03 2011 -0200 perf ui: Reimplement ui__popup_menu using ui__browser Right now let it work just like the other browsers: in full screen, at the top left corner. If people complain we can revisit, I found it OK and the laziest/quickest approach at reusing the ui_browser ;-) Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-4bgeqizcxh04q0sk24cw43gk@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit aa18b1a379a9316c273a95667f254950ec97cba7 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Tue Oct 25 13:52:05 2011 -0200 perf ui: Reimplement ui_helpline using libslang Just another step in stopping the use of libnewt in perf. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-gh7e1v2z7pzqmok02r6zvp17@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit c61c7626d22eb42efa372a1a214e531663f56f06 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Tue Oct 25 13:45:16 2011 -0200 perf ui: Improve handling sigwinch a bit No need to unblock it at each ui__getch() and also allow other users to check if a resize is needed, or force an refresh of terminal dimensions. The 'force' one shouldn't be needed, but its in a slow path, so leave it like that for now, I'll revisit this another day. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-aujchu6yx3bfy64non1rky0w@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit b39acd9f81d0d7d1035b20f7ec4ac49ea35e3861 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Tue Oct 25 13:29:11 2011 -0200 perf ui progress: Reimplement using slang Just another step in stopping the use of libnewt in perf. Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-vkb9jh5kkzl5ep3puoatd6an@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> commit 8d299000c770234fae997f4d4960fe6ccdf61882 Author: Arnaldo Carvalho de Melo <acme(a)redhat.com> Date: Tue Oct 25 10:42:19 2011 -0200 perf evlist: Fix grouping of multiple events The __perf_evsel__open routing was grouping just the threads for that specific events per cpu when we want to group all threads in all events to the first fd opened on that cpu. So pass the xyarray with the first event, where the other events will be able to get that first per cpu fd. At some point top and record will switch to using perf_evlist__open that takes care of this detail and probably will also handle the fallback from hw to soft counters, etc. Reported-by: Deng-Cheng Zhu <dczhu(a)mips.com> Tested-by: Deng-Cheng Zhu <dczhu(a)mips.com> Cc: David Ahern <dsahern(a)gmail.com> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Stephane Eranian <eranian(a)google.com> Link: http://lkml.kernel.org/n/tip-ebm34rh098i9y9v4cytfdp0x@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, v3.2-rc3, created. v3.2-rc3
by postmaster＠open-mesh.org 24 Nov '11

24 Nov '11

The annotated tag, v3.2-rc3 has been created at e0f79b438798057b03d1a06704d63c8e4297b053 (tag) tagging caca6a03d365883564885f2c1da3e88dcf65d139 (commit) replaces v3.2-rc2 tagged by Linus Torvalds on Wed Nov 23 20:20:41 2011 -0800 - Shortlog ------------------------------------------------------------ Linux 3.2-rc3 .. pre thanksgiving-induced food coma -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJOzcYxAAoJEHm+PkMAQRiG8SUH/3Ei//qt/l0o/4sMeh2dnTBV H8MCt6wzZnh/xrVTL84c/dcZhPGPn2QyUeriag8gxOZZeMx7xt0muwMcUapzqQ3a 8TUjF4jBfL6iyKerNqqK8YGMvm8Qbs7eK9+cBevwZo6ZgpMjHSa1ODNm/szpSjrs CAHVwO/gsufFB91psD2HFIEcYHDUIDraIGEDePr8y2KMDOhkp3YYOEb4FyhgqFDg 5zUa3ElsLKa+QzIrXNCacl11ZYoVqa+u03NuyjEOhyChakmqJB4DN+3SJE9KPUlp aSpn/ZkdRU52ns8mWkOBUFCLFf8nQgZKC50AN8H4uwtY44RrSp/vY50aD38Hg/A= =1nz5 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2011