)]}' { "log": [ { "commit": "a44f99c7efdb88fa41128065c9a9445c19894e34", "tree": "9d9dc6026b2c0409eca05e360c98b8a688ccdb1e", "parents": [ "b87a2d3e3147bd140da2eae584772c353d11421b", "22942c00a6ad6e9e93b53811a6de72c821c15d22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 20 18:14:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 20 18:14:55 2011 -0700" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)\n video: change to new flag variable\n scsi: change to new flag variable\n rtc: change to new flag variable\n rapidio: change to new flag variable\n pps: change to new flag variable\n net: change to new flag variable\n misc: change to new flag variable\n message: change to new flag variable\n memstick: change to new flag variable\n isdn: change to new flag variable\n ieee802154: change to new flag variable\n ide: change to new flag variable\n hwmon: change to new flag variable\n dma: change to new flag variable\n char: change to new flag variable\n fs: change to new flag variable\n xtensa: change to new flag variable\n um: change to new flag variables\n s390: change to new flag variable\n mips: change to new flag variable\n ...\n\nFix up trivial conflict in drivers/hwmon/Makefile\n" }, { "commit": "e16b396ce314b2bcdfe6c173fe075bf8e3432368", "tree": "640f0f56f2ea676647af4eb42d32fa56be2ee549", "parents": [ "7fd23a24717a327a66f3c32d11a20a2f169c824f", "e6e8dd5055a974935af1398c8648d4a9359b0ecb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)\n doc: CONFIG_UNEVICTABLE_LRU doesn\u0027t exist anymore\n Update cpuset info \u0026 webiste for cgroups\n dcdbas: force SMI to happen when expected\n arch/arm/Kconfig: remove one to many l\u0027s in the word.\n asm-generic/user.h: Fix spelling in comment\n drm: fix printk typo \u0027sracth\u0027\n Remove one to many n\u0027s in a word\n Documentation/filesystems/romfs.txt: fixing link to genromfs\n drivers:scsi Change printk typo initate -\u003e initiate\n serial, pch uart: Remove duplicate inclusion of linux/pci.h header\n fs/eventpoll.c: fix spelling\n mm: Fix out-of-date comments which refers non-existent functions\n drm: Fix printk typo \u0027failled\u0027\n coh901318.c: Change initate to initiate.\n mbox-db5500.c Change initate to initiate.\n edac: correct i82975x error-info reported\n edac: correct i82975x mci initialisation\n edac: correct commented info\n fs: update comments to point correct document\n target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c\n ...\n\nTrivial conflict in fs/eventpoll.c (spelling vs addition)\n" }, { "commit": "6d7ed21d17e640b120b902a314143e5ef4917a70", "tree": "87d00d7057dd9c57175f3367715d18b1958f096a", "parents": [ "ec0afc9311adcfb10b90e547c23250f63939f990", "bafc8205dc7bf2488175008deedc14ff4939d174", "9c9585e0e96f8340d704256db00b2ec28240c36e", "bfddc1c325d1e092d9fb1b5b03a05b818f82d35f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:48:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:48:35 2011 -0700" }, "message": "Merge branches \u0027defcfg\u0027, \u0027drivers\u0027 and \u0027cyberpro-next\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027defcfg\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6647/1: add Versatile Express defconfig\n ARM: 6644/1: mach-ux500: update the U8500 defconfig\n\n* \u0027drivers\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6764/1: pl011: factor out FIFO to TTY code\n ARM: 6763/1: pl011: add optional RX DMA to PL011 v2\n ARM: 6758/1: amba: support pm ops\n ARM: amba: make amba_driver id_table const\n ARM: amba: make internal ID table handling const\n ARM: amba: make probe() functions take const id tables\n ARM: 6662/1: amba: make amba_bustype non-static\n ARM: mmci: add dmaengine-based DMA support\n ARM: mmci: no need for separate host-\u003edata_xfered\n ARM: mmci: avoid unnecessary switch to data available PIO interrupts\n ARM: mmci: no need to call flush_dcache_page() with sg_miter API\n ARM: mmci: avoid reporting too many completed bytes on fifo overrun\n ALSA: AACI: make fifo variables more explanitory\n ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period\n ALSA: AACI: use snd_pcm_lib_period_bytes()\n ALSA: AACI: clean up AACI announcement printk\n ALSA: AACI: fix channel mask selection\n ALSA: AACI: fix number of channels for record\n ALSA: AACI: fix multiple IRQ claiming\n\n* \u0027cyberpro-next\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()\n VIDEO: cyberpro: remove useless function extreg pointers\n VIDEO: cyberpro: update handling of device structures\n VIDEO: cyberpro: add support for video capture I2C\n VIDEO: cyberpro: make \u0027reg_b0_lock\u0027 always present\n VIDEO: cyberpro: add I2C support\n VIDEO: cyberpro: select lowest multipler/divisor for PLL\n" }, { "commit": "990710ca5ddf28aef9c34594b3ffe71544e5faa4", "tree": "c3bb05e0685919ffa0682b36cc717f824e60d6fd", "parents": [ "8ec3b8432e4fe8d452f88f1ed9a3450e715bb797" ], "author": { "name": "matt mooney", "email": "mfm@muteddisk.com", "time": "Fri Jan 14 06:12:37 2011 -0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Thu Mar 17 14:02:59 2011 +0100" }, "message": "dma: change to new flag variable\n\nReplace EXTRA_CFLAGS with ccflags-y.\n\nSigned-off-by: matt mooney \u003cmfm@muteddisk.com\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "ae0e47f02aaedbfdd5e4bec73f79b714d758223d", "tree": "348f99385f42a2f698bddb4ced3e6c472e5d68cc", "parents": [ "ddf12286951aee1e7763112cf26629de3fabe6ae" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Tue Mar 01 15:06:02 2011 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Mar 01 15:47:58 2011 +0100" }, "message": "Remove one to many n\u0027s in a word\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "000061245a6797d542854106463b6b20fbdcb12e", "tree": "08ead444b59ce33cf533b19c1c6d338dcec4649d", "parents": [ "710ac54be44e0cc53f5bf29b03d12c8706e7077a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 22 19:59:54 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 01:36:39 2011 -0700" }, "message": "dt/powerpc: Eliminate users of of_platform_{,un}register_driver\n\nGet rid of old users of of_platform_driver in arch/powerpc. Most\nof_platform_driver users can be converted to use the platform_bus\ndirectly.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n\n" }, { "commit": "aa25afad2ca60d19457849ea75e9c31236f4e174", "tree": "24c8c815caf191af56f8de287637087c298711b2", "parents": [ "394d5aefcdecb51bbf7d6df757e73559c9692a08" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 19 15:55:00 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 16:24:14 2011 +0000" }, "message": "ARM: amba: make probe() functions take const id tables\n\nMake Primecell driver probe functions take a const pointer to their\nID tables. Drivers should never modify their ID tables in their\nprobe handler.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "bc0b44c35928a04061e19663061af9f029dbebcc", "tree": "5c8add72ac2639c969f24124b1c0a797259394fa", "parents": [ "74ab0030b574a555a30d6520f84dd644628033a8" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Fri Jan 28 11:48:18 2011 -0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Feb 17 16:50:49 2011 +0100" }, "message": "coh901318.c: Change initate to initiate.\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "0a9d59a2461477bd9ed143c01af9df3f8f00fa81", "tree": "df997d1cfb0786427a0df1fbd6f0640fa4248cf4", "parents": [ "a23ce6da9677d245aa0aadc99f4197030350ab54", "795abaf1e4e188c4171e3cd3dbb11a9fcacaf505" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 15 10:24:31 2011 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 15 10:24:31 2011 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "e19d1d4988f8020c25bf1758f9a898e1374cef35", "tree": "5bd1ba3f13178becefad85b41a8bfe8c4652cee2", "parents": [ "a646bd7f0824d3e0f02ff8d7410704f965de01bc", "60f1df5dc6ecd07befc332ae30109fb86505634c" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon Feb 14 02:40:46 2011 -0800" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon Feb 14 02:40:46 2011 -0800" }, "message": "Merge branch \u0027imx\u0027 into dmaengine-fixes\n" }, { "commit": "a646bd7f0824d3e0f02ff8d7410704f965de01bc", "tree": "8504b83156a36ce508821a334b67d8a55b7dca89", "parents": [ "8179661694595eb3a4f2ff9bb0b73acbb7d2f4a9" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Mon Jan 31 13:22:29 2011 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon Feb 14 02:28:16 2011 -0800" }, "message": "dma: ipu_idmac: do not lose valid received data in the irq handler\n\nCurrently when two or more buffers are queued by the camera driver\nand so the double buffering is enabled in the idmac, we lose one\nframe comming from CSI since the reporting of arrival of the first\nframe is deferred by the DMAIC_7_EOF interrupt handler and reporting\nof the arrival of the last frame is not done at all. So when requesting\nN frames from the image sensor we actually receive N - 1 frames in\nuser space.\n\nThe reason for this behaviour is that the DMAIC_7_EOF interrupt\nhandler misleadingly assumes that the CUR_BUF flag is pointing to the\nbuffer used by the IDMAC. Actually it is not the case since the\nCUR_BUF flag will be flipped by the FSU when the FSU is sending the\n\u003cTASK\u003e_NEW_FRM_RDY signal when new frame data is delivered by the CSI.\nWhen sending this singal, FSU updates the DMA_CUR_BUF and the\nDMA_BUFx_RDY flags: the DMA_CUR_BUF is flipped, the DMA_BUFx_RDY\nis cleared, indicating that the frame data is beeing written by\nthe IDMAC to the pointed buffer. DMA_BUFx_RDY is supposed to be\nset to the ready state again by the MCU, when it has handled the\nreceived data. DMAIC_7_CUR_BUF flag won\u0027t be flipped here by the\nIPU, so waiting for this event in the EOF interrupt handler is wrong.\nActually there is no spurious interrupt as described in the comments,\nthis is the valid DMAIC_7_EOF interrupt indicating reception of the\nframe from CSI.\n\nThe patch removes code that waits for flipping of the DMAIC_7_CUR_BUF\nflag in the DMAIC_7_EOF interrupt handler. As the comment in the\ncurrent code denotes, this waiting doesn\u0027t help anyway. As a result\nof this removal the reporting of the first arrived frame is not\ndeferred to the time of arrival of the next frame and the drivers\nsoftware flag \u0027ichan-\u003eactive_buffer\u0027 is in sync with DMAIC_7_CUR_BUF\nflag, so the reception of all requested frames works.\n\nThis has been verified on the hardware which is triggering the\nimage sensor by the programmable state machine, allowing to\nobtain exact number of frames. On this hardware we do not tolerate\nlosing frames.\n\nThis patch also removes resetting the DMA_BUFx_RDY flags of\nall channels in ipu_disable_channel() since transfers on other\nDMA channels might be triggered by other running tasks and the\nbuffers should always be ready for data sending or reception.\n\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nReviewed-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nTested-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "60f1df5dc6ecd07befc332ae30109fb86505634c", "tree": "77cb78a15424ff493f4d171d66752009b4483420", "parents": [ "2335d338a20a6f5ac70ae4338733c8ff5933f978", "341b9419a8c0a4cdb75773c576870f1eb655516d" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:42:51 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:42:51 2011 +0100" }, "message": "Merge branch \u0027dmaengine-shawn\u0027 into dmaengine\n" }, { "commit": "2335d338a20a6f5ac70ae4338733c8ff5933f978", "tree": "32d4d5270a761c72854258c9c3d1180de34ebb4b", "parents": [ "f8a356ff96a9070156f863e4f7716e2a0eb8c995", "23889c6352ab4a842a30221bb412ff49954b2fb3" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:42:48 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:42:48 2011 +0100" }, "message": "Merge branch \u0027dmaengine-sdma\u0027 into dmaengine\n" }, { "commit": "341b9419a8c0a4cdb75773c576870f1eb655516d", "tree": "cfa8912c361d8cf24a67a8bc560523537769695f", "parents": [ "1e9cebb42de57f1243261939c77ab5b0f9bcf311" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@freescale.com", "time": "Thu Jan 20 05:50:39 2011 +0800" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:42:23 2011 +0100" }, "message": "dmaengine: imx-sdma: fix up param for the last BD in sdma_prep_slave_sg()\n\nAs per the reference manual, bit \"L\" should be set while bit \"C\"\nshould be cleared for the last buffer descriptor in the non-cyclic\nchain, so that sdma can stop trying to find the next BD and end\nthe transfer.\n\nIn case of sdma_prep_slave_sg(), BD_LAST needs to be set and BD_CONT\nbe cleared for the last BD.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "1e9cebb42de57f1243261939c77ab5b0f9bcf311", "tree": "aaeee8f1f5d9e61e0adc7adb9273558761b3892f", "parents": [ "8a9659114c7be6f88253618252881ea6fe0588b4" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@freescale.com", "time": "Thu Jan 20 05:50:38 2011 +0800" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:42:12 2011 +0100" }, "message": "dmaengine: imx-sdma: correct sdmac-\u003estatus in sdma_handle_channel_loop()\n\nsdma_handle_channel_loop() is the handler of cyclic tx. One period\nsuccess does not really mean the success of the tx. Instead of\nDMA_SUCCESS, DMA_IN_PROGRESS should be the one to tell.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "8a9659114c7be6f88253618252881ea6fe0588b4", "tree": "4845609a6f7c48391ec1fee2a01c854590855415", "parents": [ "4b2ce9ddb370c4eb573540611c347d78ac4b54a0" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@freescale.com", "time": "Thu Jan 20 05:50:37 2011 +0800" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:41:59 2011 +0100" }, "message": "dmaengine: imx-sdma: return sdmac-\u003estatus in sdma_tx_status()\n\nThe sdmac-\u003estatus was designed to reflect the status of the tx,\nso simply return it in sdma_tx_status(). Then dma client can call\ndma_async_is_tx_complete() to know the status of the tx.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "4b2ce9ddb370c4eb573540611c347d78ac4b54a0", "tree": "c4fa0f7baab20d7990ca4b2628af6f60ac249386", "parents": [ "1797c33f0edcdcc9a483c06233a203786666a97f" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@freescale.com", "time": "Thu Jan 20 05:50:36 2011 +0800" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:41:50 2011 +0100" }, "message": "dmaengine: imx-sdma: set sdmac-\u003estatus to DMA_ERROR in err_out of sdma_prep_slave_sg()\n\nsdma_prep_dma_cyclic() sets sdmac-\u003estatus to DMA_ERROR in err_out,\nand sdma_prep_slave_sg() needs to do the same. Otherwise,\nsdmac-\u003estatus stays at DMA_IN_PROGRESS, which will make the function\nreturn immediately next time it gets called.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "1797c33f0edcdcc9a483c06233a203786666a97f", "tree": "2916f6f267029f871028347c9fcb9739f7110329", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@freescale.com", "time": "Thu Jan 20 05:50:35 2011 +0800" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:41:43 2011 +0100" }, "message": "dmaengine: imx-sdma: remove IMX_DMA_SG_LOOP handling in sdma_prep_slave_sg()\n\nThis is a leftover from the time that the driver did not have\nsdma_prep_dma_cyclic callback and implemented sound dma as a looped\nsg chain. And it can be removed now.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "f8a356ff96a9070156f863e4f7716e2a0eb8c995", "tree": "841388fffbd9bbca97f48cc64d6b58c8cfa829cd", "parents": [ "97a43dfe84119528ec2576129b91d619219ab716" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 11:35:59 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:36:23 2011 +0100" }, "message": "dmaengine i.MX dma: initialize dma capabilities outside channel loop\n\nThe capabilities are device specific fields, not channel specific fields.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "97a43dfe84119528ec2576129b91d619219ab716", "tree": "575ba990a8d34e35534366aa91d41b4afc474855", "parents": [ "d07102a1bb0e759ce4571df30c62998ef5d8a8d3" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 11:35:44 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:36:10 2011 +0100" }, "message": "dmaengine i.MX DMA: do not initialize chan_id field\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "d07102a1bb0e759ce4571df30c62998ef5d8a8d3", "tree": "f1b093f2a642600823ef733ca0da7245751a8a2b", "parents": [ "1e070a60997f5bbaadd498c34380e2aa110336cf" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Jan 12 14:13:23 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:36:02 2011 +0100" }, "message": "dmaengine i.MX dma: check sg entries for valid addresses and lengths\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "1e070a60997f5bbaadd498c34380e2aa110336cf", "tree": "a590491c8bcc33851553b5d70cfa4eb2ae4640be", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Jan 12 13:14:37 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:35:52 2011 +0100" }, "message": "dmaengine i.MX dma: set maximum segment size for our device\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "23889c6352ab4a842a30221bb412ff49954b2fb3", "tree": "1a8c6fbd0509c6dbed9702c9ab0314a8c911de22", "parents": [ "7214a8b14f63a1603401124bc150e17b145aa476" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 10:56:58 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:34:31 2011 +0100" }, "message": "dmaengine i.MX SDMA: reserve channel 0 by not registering it\n\nWe need channel 0 of the sdma engine for internal purposes. We\naccomplished this by calling dma_request_channel() in the probe\nfunction. This does not work when multiple dma engines are\npresent which is the case when IPU support for i.MX31/35 is\ncompiled in. So instead of registering channel 0 and reserving\nit afterwards simply do not register it in the first place.\nWith this the dmaengine channel counting does not match sdma\nchannel counting anymore, so we have to use sdma channel counting\nin the driver.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "7214a8b14f63a1603401124bc150e17b145aa476", "tree": "59c41a00966f3935edc235514a3780a7313d3437", "parents": [ "7a0e9b2557902bdca563a5eb1bbac87560bd7d20" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 10:21:35 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:34:24 2011 +0100" }, "message": "dmaengine i.MX SDMA: initialize dma capabilities outside channel loop\n\nThe capabilities are device specific fields, not channel specific fields.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "7a0e9b2557902bdca563a5eb1bbac87560bd7d20", "tree": "194f1735c5c25357cd4991081231525441b749a8", "parents": [ "1fa81c270da4d8dffa84fcca448654a10ed0a5dc" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 10:19:53 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:33:18 2011 +0100" }, "message": "dmaengine i.MX SDMA: do not initialize chan_id field\n\nThis is bogus as the dmaengine core will overwrite this field.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "1fa81c270da4d8dffa84fcca448654a10ed0a5dc", "tree": "2582ad91ea12c462745b2ef11d0fccfee73acee5", "parents": [ "b9b3f82f94b52ebb0bbdf6cd77ccc5e8ee3f53b5" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Jan 12 13:02:28 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:33:08 2011 +0100" }, "message": "dmaengine i.MX sdma: check sg entries for valid addresses and lengths\n\nThis patch lets sdma_prep_slave_sg fail if the entries of an\nsg list do not start on multiples of the word size or if the\nlengths are not multiple of the word size.\nAlso, catch the previously unhandled DMA_SLAVE_BUSWIDTH_8_BYTES\nand DMA_SLAVE_BUSWIDTH_UNDEFINED cases.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "b9b3f82f94b52ebb0bbdf6cd77ccc5e8ee3f53b5", "tree": "6ea87b15f9f74327c202fc5aa72e6199897c176d", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Jan 12 12:12:31 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 31 12:32:52 2011 +0100" }, "message": "dmaengine i.MX sdma: set maximum segment size for our device\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "8179661694595eb3a4f2ff9bb0b73acbb7d2f4a9", "tree": "5251a404b7b58f0486f422d3db333b2449e33e5c", "parents": [ "fb526210b2b961b5d590b89fd8f45c0ca5769688" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Thu Jan 27 12:37:44 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sun Jan 30 22:03:47 2011 -0800" }, "message": "DMA: PL08x: fix channel pausing to timeout rather than lockup\n\nIf a transfer is initiated from memory to a peripheral, then data is\nfetched and the channel is marked busy. This busy status persists until\nthe HALT bit is set and the queued data has been transfered to the\nperipheral. Waiting indefinitely after setting the HALT bit results in\nsystem lockups. Timeout this operation, and print an error when this\nhappens.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "fb526210b2b961b5d590b89fd8f45c0ca5769688", "tree": "4998a89c11eed597b3197d013ff7b558c9566f2d", "parents": [ "d718f4ebddcb0bebdbf771a6672756b666e5c31b" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Thu Jan 27 12:32:53 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sun Jan 30 22:00:48 2011 -0800" }, "message": "DMA: PL08x: fix infinite wait when terminating transfers\n\nIf we try to pause a channel when terminating a transfer, we could end\nup spinning for it to become inactive indefinitely, and can result in\nan uninterruptible wait requiring a reset to recover from.\n\nTerminating a transfer is supposed to take effect immediately, but may\nresult in data loss.\n\nTo make this clear, rename the function to pl08x_terminate_phy_chan().\nAlso, make sure it is always consistently called - with the spinlock\nheld and IRQs disabled, and ensure that the TC and ERR interrupt status\nis always cleared.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "d718f4ebddcb0bebdbf771a6672756b666e5c31b", "tree": "b1e7e6470f16b799d41d1e942cf0ff7ac38eec63", "parents": [ "939fd4f077269dd863cd630a3b3195a20acf7d02" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@freescale.com", "time": "Mon Jan 17 22:39:24 2011 +0800" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat Jan 29 22:35:10 2011 -0800" }, "message": "dmaengine: imx-sdma: fix inconsistent naming in sdma_assign_cookie()\n\nVariable name sdma and sdmac are consistently used as the pointer to\nsdma_engine and sdma_channel respectively throughout the file. The\npatch fixes the inconsistency seen in function sdma_assign_cookie().\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "939fd4f077269dd863cd630a3b3195a20acf7d02", "tree": "f889d81f417645d3e3a903d0fb9422e84dfea5b9", "parents": [ "6866fd3b7289a283741752b73e0e09f410b7639d" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@freescale.com", "time": "Wed Jan 19 19:13:06 2011 +0800" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat Jan 29 19:34:10 2011 -0800" }, "message": "dmaengine: imx-sdma: propagate error in sdma_probe() instead of returning 0\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nAcked-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "6866fd3b7289a283741752b73e0e09f410b7639d", "tree": "aa8bec586fb4cae492ae63931523ba560f722b1a", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Jan 12 11:18:14 2011 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat Jan 29 16:14:49 2011 -0800" }, "message": "dmaengine i.MX SDMA: Fix firmware loading\n\nWhen loading the microcode to the SDMA engine we have to use\nthe ram_code_start_addr found in the firmware image. The copy\nin the sdma engine is not initialized correctly. This is broken\nsince:\n5b28aa3 dmaengine i.MX SDMA: Allow to run without firmware\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "5a3a7658863f74f28cef53b9336bff7423659801", "tree": "9422c16705938f011ec97d6255e90218bc9b52eb", "parents": [ "7044882ef231201ed84e14b766d948d4c6b46f82" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Wed Jan 19 15:36:38 2011 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jan 19 15:37:19 2011 +0100" }, "message": "Comment typo fixes for \u0027descriptor\u0027\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e1288cd72f54e7fc16ae9ebb4d0647537ef848d4", "tree": "b4fd87b9307d8041fb680cb9b8fbf787ec968df7", "parents": [ "e78bf5e6cbe837daa6ab628a5f679548742994d3", "94ae85220a07d357d4937086c490854f63344de4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 10:54:41 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 10:54:41 2011 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (63 commits)\n ARM: PL08x: cleanup comments\n Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c\n ARM: PL08x: fix a warning\n Fix dmaengine_submit() return type\n dmaengine: at_hdmac: fix race while monitoring channel status\n dmaengine: at_hdmac: flags located in first descriptor\n dmaengine: at_hdmac: use subsys_initcall instead of module_init\n dmaengine: at_hdmac: no need set ACK in new descriptor\n dmaengine: at_hdmac: trivial add precision to unmapping comment\n dmaengine: at_hdmac: use dma_address to program DMA hardware\n pch_dma: support new device ML7213 IOH\n ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels\n ARM: PL08x: allow dma_set_runtime_config() to return errors\n ARM: PL08x: fix locking between prepare function and submit function\n ARM: PL08x: introduce \u0027phychan_hold\u0027 to hold on to physical channels\n ARM: PL08x: put txd\u0027s on the pending list in pl08x_tx_submit()\n ARM: PL08x: rename \u0027desc_list\u0027 as \u0027pend_list\u0027\n ARM: PL08x: implement unmapping of memcpy buffers\n ARM: PL08x: store prep_* flags in async_tx structure\n ARM: PL08x: shrink srcbus/dstbus in txd structure\n ...\n" }, { "commit": "94ae85220a07d357d4937086c490854f63344de4", "tree": "8dda364dc7cbae73a30bbe5ef47ac8d674d998c6", "parents": [ "0261f7416362f6affc2d4fe7fea9320a6bdaaee6" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Sun Jan 16 20:18:05 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sun Jan 16 16:55:43 2011 -0800" }, "message": "ARM: PL08x: cleanup comments\n\nCleanup the formatting of comments, remove some which don\u0027t make sense\nanymore.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n[fix conflict with 96a608a4]\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "0261f7416362f6affc2d4fe7fea9320a6bdaaee6", "tree": "93ea0cddd66bf96d6baa461166276dd8052fad7e", "parents": [ "96a608a4bfd8468c21881b3f92024923886eb015" ], "author": { "name": "Wei Yongquan", "email": "weiyqlq@gmail.com", "time": "Wed Dec 29 20:30:55 2010 +0800" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 14 17:58:12 2011 -0800" }, "message": "Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c\n\nCommit f5e70d0fe3ea990cfb3fc8d7f76a719adcb1e0b5 renamed MD_RAID6_PQ to RAID6_PQ,\nbut iop-adma.c didn\u0027t update synchronously.\n\nSigned-off-by: Wei Yongquan \u003cweiyqlq@gmail.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "dda36f9821321edf65d69da5c0807df7e73d26fc", "tree": "2a629da4c1650c11bb0b1783317fbda0a1799ec6", "parents": [ "568f7f0c2e597671d3e646e0b85c95c4a5756fef" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Wed Jan 12 15:39:10 2011 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 14 16:54:44 2011 -0800" }, "message": "dmaengine: at_hdmac: fix race while monitoring channel status\n\nWe were reading channel status then taking a lock. This lead to a race because\nthis lock may delay us and then make this channel not idle anymore.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "568f7f0c2e597671d3e646e0b85c95c4a5756fef", "tree": "919c1003e73ee4e815dff0276a1dc73a0780516f", "parents": [ "93d0bec2be4b0f036a27da207ecab97fc3d3bbbe" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Wed Jan 12 15:39:09 2011 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 14 16:54:44 2011 -0800" }, "message": "dmaengine: at_hdmac: flags located in first descriptor\n\nPlace flags on first descriptor of chain instead of last.\nThis is the one used by atc_chain_complete() function while unmapping.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "93d0bec2be4b0f036a27da207ecab97fc3d3bbbe", "tree": "303d0b8e3c7bc7fdfc526c8b9c41316e8561d2fc", "parents": [ "58344f25cf5f3453bfcf4b845ea9ec71153e45c3" ], "author": { "name": "Eric Xu", "email": "hong.xu@atmel.com", "time": "Wed Jan 12 15:39:08 2011 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 14 16:54:43 2011 -0800" }, "message": "dmaengine: at_hdmac: use subsys_initcall instead of module_init\n\nUse subsys_initcall instead of module_init in order to keep DMA engine rolling\nbefore other peripheral drivers.\n\nSigned-off-by: Eric Xu \u003chong.xu@atmel.com\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "58344f25cf5f3453bfcf4b845ea9ec71153e45c3", "tree": "7c2f6dd1a59f48c797635de84297c6e6c5e7dc5c", "parents": [ "ebcf9b80f9657f44fcb60ee17abe14eadebf3386" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Wed Jan 12 15:39:07 2011 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 14 16:54:43 2011 -0800" }, "message": "dmaengine: at_hdmac: no need set ACK in new descriptor\n\nFollowing descriptor flow in at_hdmac driver, descriptor comming from\natc_desc_get() as already DMA_CTRL_ACK flag set. No need to set it again.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "ebcf9b80f9657f44fcb60ee17abe14eadebf3386", "tree": "8147fa2c862cc87a953dd6e1cc7c41ae4fd3144c", "parents": [ "0f70e8cea3ac6a765289811c590a16934bf47711" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Wed Jan 12 15:39:06 2011 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 14 16:54:43 2011 -0800" }, "message": "dmaengine: at_hdmac: trivial add precision to unmapping comment\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "0f70e8cea3ac6a765289811c590a16934bf47711", "tree": "8e7800effeaf4a37080744f7694f9f1c5677179e", "parents": [ "2cdf2455a660ea860272ef3f833f0e5c4cc80205" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Wed Dec 15 18:50:16 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 14 16:25:58 2011 -0800" }, "message": "dmaengine: at_hdmac: use dma_address to program DMA hardware\n\nIn atc_prep_slave_sg() function we use dma_address field of scatterlist with\nsg_dma_address() macro instead of sg_phys(). DMA address is already computed\nby dma_map_sg() or another mapping function in calling driver.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "2cdf2455a660ea860272ef3f833f0e5c4cc80205", "tree": "716d5ba5695ea3a13c5bebe1d5afab5d115dee18", "parents": [ "bc0fa81473c077bf4403e3b7b3397326204b65cd" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya-linux@dsn.okisemi.com", "time": "Wed Jan 05 17:43:52 2011 +0900" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 14 16:24:53 2011 -0800" }, "message": "pch_dma: support new device ML7213 IOH\n\nSupport new device OKI SEMICONDUCTOR\u0027s ML7213 IOH(Input/Output Hub) which is for\nIVI(In-Vehicle Infotainment) use.\nThe ML7213 is companion chip for Intel Atom E6xx series.\nThe ML7213 is completely compatible for Intel EG20T PCH.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya-linux@dsn.okisemi.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "5a62f995446be44811fefa48f91f9efb7ea172d7", "tree": "e297371f0d513dc6278bb67d582d2216eb7d74ed", "parents": [ "f1d6d6cd9029daa7e7d4a0b14347b5392320f22a", "5d7d8072edc11080a7cf6cc37c9f4e61ca1e93c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 16:31:41 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 11 16:31:41 2011 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits)\n powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA\n powerpc/pseries: Fix VPHN build errors on non-SMP systems\n powerpc/83xx: add mpc8308_p1m DMA controller device-tree node\n powerpc/83xx: add DMA controller to mpc8308 device-tree node\n powerpc/512x: try to free dma descriptors in case of allocation failure\n powerpc/512x: add MPC8308 dma support\n powerpc/512x: fix the hanged dma transfer issue\n powerpc/512x: scatter/gather dma fix\n powerpc/powermac: Make auto-loading of therm_pm72 possible\n of/address: Use propper endianess in get_flags\n powerpc/pci: Use printf extension %pR for struct resource\n powerpc: Remove unnecessary casts of void ptr\n powerpc: Disable VPHN polling during a suspend operation\n powerpc/pseries: Poll VPA for topology changes and update NUMA maps\n powerpc: iommu: Add device name to iommu error printks\n powerpc: Record vma-\u003ephys_addr in ioremap()\n powerpc: Update compat_arch_ptrace\n powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S\n powerpc/time: printk time stamp init not correct\n powerpc: Minor cleanups for machdep.h\n ...\n" }, { "commit": "bc0fa81473c077bf4403e3b7b3397326204b65cd", "tree": "43e8c8792f787d4b7d23aecd4cc0efccd5ffb248", "parents": [ "0a4bbddde29c038f2c51a7abb03d6d07e679d8af", "b7f758659265c173380b792862aaad1c23c0e004", "d49278e3351b34870cbffffc5067348a318e7b06" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 07 12:47:05 2011 -0800" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jan 07 12:47:05 2011 -0800" }, "message": "Merge branches \u0027amba\u0027 and \u0027dma40\u0027 into dmaengine\n" }, { "commit": "661382fe190475c17d0b3a6b5f0350b4f82f5939", "tree": "3609fdecc5b29a6875cbe92cca747096819db7b4", "parents": [ "3c0cb7c31c206aaedb967e44b98442bbeb17a6c4" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Thu Jan 06 17:04:50 2011 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Jan 07 11:03:26 2011 +0900" }, "message": "dma: shdma: don\u0027t register the global die notifier multiple times\n\nA recent patch has added a die notifier to the shdma driver, however,\nit registers a static die-notifier object in the probe routine, i.e.,\nfor each device instance. This is wrong and leads to a system lockup.\nThis patch moves the die notifier registration to module init and\nexit routines respectively.\n\nReported-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "3c0cb7c31c206aaedb967e44b98442bbeb17a6c4", "tree": "3ecba45d7ffae4fba4a5aafaef4af5b0b1105bde", "parents": [ "f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234", "404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 16:50:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 16:50:35 2011 -0800" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)\n ARM: DMA: add support for DMA debugging\n ARM: PL011: add DMA burst threshold support for ST variants\n ARM: PL011: Add support for transmit DMA\n ARM: PL011: Ensure IRQs are disabled in UART interrupt handler\n ARM: PL011: Separate hardware FIFO size from TTY FIFO size\n ARM: PL011: Allow better handling of vendor data\n ARM: PL011: Ensure error flags are clear at startup\n ARM: PL011: include revision number in boot-time port printk\n ARM: vexpress: add sched_clock() for Versatile Express\n ARM i.MX53: Make MX53 EVK bootable\n ARM i.MX53: Some bug fix about MX53 MSL code\n ARM: 6607/1: sa1100: Update platform device registration\n ARM: 6606/1: sa1100: Fix platform device registration\n ARM i.MX51: rename IPU irqs\n ARM i.MX51: Add ipu clock support\n ARM: imx/mx27_3ds: Add PMIC support\n ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()\n mx51: fix usb clock support\n MX51: Add support for usb host 2\n arch/arm/plat-mxc/ehci.c: fix errors/typos\n ...\n" }, { "commit": "404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34", "tree": "99119edc53fdca73ed7586829b8ee736e09440b3", "parents": [ "28cdac6690cb113856293bf79b40de33dbd8f974", "1051b9f0f9eab8091fe3bf98320741adf36b4cfa" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:33:32 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:33:32 2011 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/mach-pxa/clock.c\n\tarch/arm/mach-pxa/clock.h\n" }, { "commit": "f862f904d357dc0d3612347a8dbabe6fae037fbb", "tree": "d7f5c2d5f85fd9e1cfc36beae904dc4f9cca04a3", "parents": [ "6f09e41d704fe0bc9157a5357480751d39361d01", "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Jan 06 18:24:07 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Jan 06 18:24:07 2011 +0900" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest\n\nConflicts:\n\tarch/sh/kernel/cpu/sh2a/clock-sh7201.c\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "1051b9f0f9eab8091fe3bf98320741adf36b4cfa", "tree": "68ea1c8f9c446d6ebd96caf3ba4ec73f1fa5ace6", "parents": [ "cde9efef401563943d5a58eb9b7274bfdc08ca9b", "a58154d1c3535f451a409abbd0bda6770b2d9380" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 05 10:23:38 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 05 10:23:38 2011 +0000" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable\n" }, { "commit": "b7f758659265c173380b792862aaad1c23c0e004", "tree": "b67550bae43e48026c00284a9a64257ef11aae43", "parents": [ "f0fd944625b6e406dc273b8dffa16e0728c973e6" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:46:17 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:14 2011 -0800" }, "message": "ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels\n\nPrevent dma_set_runtime_config() being used to alter the configuration\nsupplied by the platform for memcpy channel configuration. No one\nshould be trying to change this configuration.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "f0fd944625b6e406dc273b8dffa16e0728c973e6", "tree": "d30767326785455dba0a99de2b6dd1a859be3c26", "parents": [ "c370e594efe2993620d24d41a78f325102e99d1c" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:45:57 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:14 2011 -0800" }, "message": "ARM: PL08x: allow dma_set_runtime_config() to return errors\n\nThere are cases in dma_set_runtime_config() where we fail to perform\nthe requested action - and we just issue a KERN_ERR message in that\ncase. We have the facility to return an error to the caller, so that\nis what we should do.\n\nWhen we encounter an error due to invalid parameters, we should not\nmodify driver state.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "c370e594efe2993620d24d41a78f325102e99d1c", "tree": "dfbb5c904bf6ca85c9aba1eec17070fe05c12ca4", "parents": [ "8087aacda040bdbf84940712d132ce80c30b9d5d" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:45:37 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:14 2011 -0800" }, "message": "ARM: PL08x: fix locking between prepare function and submit function\n\nThe PL08x driver holds on to the channel lock with interrupts disabled\nbetween the prepare and the subsequent submit API functions. This\nmeans that the locking state when the prepare function returns is\ndependent on whether it suceeeds or not.\n\nIt did this to ensure that the physical channel wasn\u0027t released, and\nas it used to add the descriptor onto the pending list at prepare time\nrather than submit time.\n\nNow that we have reorganized the code to remove those reasons, we can\nnow safely release the spinlock at the end of preparation and reacquire\nit in our submit function.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "8087aacda040bdbf84940712d132ce80c30b9d5d", "tree": "3a59272bc4555eae854a012940a36f80a8f4c1a5", "parents": [ "501e67e82dee68d0a594ec0549f3d6a2943c91f5" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:45:17 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:14 2011 -0800" }, "message": "ARM: PL08x: introduce \u0027phychan_hold\u0027 to hold on to physical channels\n\nIntroduce \u0027phychan_hold\u0027 to hold on to physical DMA channels while we\u0027re\npreparing a new descriptor for it. This will be incremented when we\nallocate a physical channel and set the MUX registers during the\npreparation of the TXD, and will only be decremented when the TXD is\nsubmitted.\n\nThis prevents the physical channel being given up before the new TXD\nis placed on the queue.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "501e67e82dee68d0a594ec0549f3d6a2943c91f5", "tree": "c211a6a59ab79a8c83d432e2053f64586d5b159a", "parents": [ "15c17232fbd1f7687c740c3c26f9e7f337bd9e36" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:44:57 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:14 2011 -0800" }, "message": "ARM: PL08x: put txd\u0027s on the pending list in pl08x_tx_submit()\n\nDon\u0027t place TXDs on the pending list when they\u0027re prepared - place\nthem on the list when they\u0027re ready to be submitted. Also, only\nplace memcpy requests in the wait state when they\u0027re submitted and\ndon\u0027t have a physical channel associated.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "15c17232fbd1f7687c740c3c26f9e7f337bd9e36", "tree": "c3380cdde212259a7b3c790404b870aa2b9aa01d", "parents": [ "3d992e1a6f8465db3921ef75bfc490fbd2f40cd3" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:44:36 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:14 2011 -0800" }, "message": "ARM: PL08x: rename \u0027desc_list\u0027 as \u0027pend_list\u0027\n\nThis \u0027desc_list\u0027 is actually a list of pending descriptors, so name\nit after its function (pending list) rather than what it contains\n(descriptors).\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "3d992e1a6f8465db3921ef75bfc490fbd2f40cd3", "tree": "4d7935045ef1654777754360f319c093f5f041e8", "parents": [ "c04287948ec8308fceedda980373bc7d53620255" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:44:16 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:14 2011 -0800" }, "message": "ARM: PL08x: implement unmapping of memcpy buffers\n\nThe DMA engine API requires DMA engine implementations to unmap buffers\npassed into the non-slave DMA methods unless the relevant completion\nflag is set. We aren\u0027t doing this, so implement this facility.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "c04287948ec8308fceedda980373bc7d53620255", "tree": "ee5ab1d84715b7c9335036d7471f5d13d237eb84", "parents": [ "d7244e9a27a3da27d62aabf560ee828d7991493e" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:43:56 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: store prep_* flags in async_tx structure\n\nLike other DMA engine drivers do, store the passed flags into the\nasync_tx structure, so they can be checked when the operation\ncompletes.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "d7244e9a27a3da27d62aabf560ee828d7991493e", "tree": "a745ef1a7b87208738f379532d10a8932751abb4", "parents": [ "542361f8e385355c68e263eba49d4306739b9220" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:43:35 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: shrink srcbus/dstbus in txd structure\n\nWe only need to store the dma address.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "542361f8e385355c68e263eba49d4306739b9220", "tree": "64d465d026c348f4b5d945cb53aaaf12fb8338a3", "parents": [ "5f638b4f313e345bf02700910e581bccf71212f5" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:43:15 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: don\u0027t manipulate txd-\u003esrcbus or txd-\u003edstbus during LLI fill\n\nDon\u0027t alter any txd-\u003esrcbus or txd-\u003edstbus values while building the\nLLI list. This allows us to see the original dma_addr_t values passed\nin via the prep_memcpy() method.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "5f638b4f313e345bf02700910e581bccf71212f5", "tree": "423d49f0935c3f2977e3aae1cb7b4d402d0c257a", "parents": [ "d6cf7b597f7158616106068930d1c6203d9359eb" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:42:55 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: fix fill_bytes calculation\n\nThe number of bytes we want to fill into any LLI is the minimum of:\n- number of bytes remaining in the transfer\n- number of bytes we can transfer in a single LLI\n- number of bytes we can transfer without overflowing the source boundary\n- number of bytes we can transfer without overflowing the destination boundary\n\nThe minimum of the first two is already calculated (target_len). We\nlimit the boundary calculations to this number of bytes, which will\nthen give us the number of bytes we can place into this LLI.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "d6cf7b597f7158616106068930d1c6203d9359eb", "tree": "a1d640957f21926f2f65e96804ecd18f72047413", "parents": [ "b61be8d728abad7fd98e62e98f22325f8f254b51" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:42:34 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: use min() to calculate target_len\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "b61be8d728abad7fd98e62e98f22325f8f254b51", "tree": "a4c5d5aa7e942122fc24d45d6ab977de5032be99", "parents": [ "0059005f2cbf4847551b9ad9915ffffe23aef0b9" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:42:14 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: ensure pl08x_pre_boundary() works for any value of addr\n\npl08x_pre_boundary() was unsafe with addresses towards the top of\nmemory space:\n\n\tboundary \u003d ((addr \u003e\u003e PL08X_BOUNDARY_SHIFT) + 1)\n\t\t\t\u003c\u003c PL08X_BOUNDARY_SHIFT;\n\nThis can overflow a 32-bit number, producing zero. When it does:\n\n\tif (boundary \u003c addr + len)\n\t\treturn boundary - addr;\n\telse\n\t\treturn len;\n\nresults in (boundary - addr) returning either a large positive value.\nAlso if addr + len overflows, this calculation also fails.\n\nWe can fix this trivially as the only thing we\u0027re actually interested\nin is the value of the least significant PL08X_BOUNDARY_SHIFT bits:\n\n\tboundary_len \u003d PL08X_BOUNDARY_SIZE -\n\t\t(addr \u0026 (PL08X_BOUNDARY_SIZE - 1));\n\ngives us the number of bytes before \u0027addr\u0027 becomes a multiple of\nPL08X_BOUNDARY_SIZE. We can then just take the min() of the two\ncalculated lengths.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "0059005f2cbf4847551b9ad9915ffffe23aef0b9", "tree": "ff40c68f8c836d217b81d5c385e4ff2275a335be", "parents": [ "858c21c0f380fb9c78f47f3e372f9baadc54dffe" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:41:54 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: make pl08x_fill_lli_for_desc() return void\n\nWe don\u0027t need pl08x_fill_lli_for_desc() to return num_llis + 1 as\nwe know that\u0027s what it always does. We can just pass in num_llis\nand use post-increment in the caller.\n\nThis makes the code slightly easier to read.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "858c21c0f380fb9c78f47f3e372f9baadc54dffe", "tree": "236ca2bf8b319a38ad7d0988491a64add47d5b55", "parents": [ "30749cb4a40f02a199640011e5ab5c5f60b8482e" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:41:34 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: move callback outside spinlock\u0027d region\n\nCalling the callback handler with spinlocks in the tasklet held leads\nto deadlock when dmaengine functions are called:\n\nBUG: spinlock lockup on CPU#0, sh/417, c1870a08\nBacktrace:\n...\n[\u003cc017b408\u003e] (do_raw_spin_lock+0x0/0x154) from [\u003cc02c4b98\u003e] (_raw_spin_lock_irqsave+0x54/0x60)\n[\u003cc02c4b44\u003e] (_raw_spin_lock_irqsave+0x0/0x60) from [\u003cc01f5828\u003e] (pl08x_prep_channel_resources+0x718/0x8b4)\n[\u003cc01f5110\u003e] (pl08x_prep_channel_resources+0x0/0x8b4) from [\u003cc01f5bb4\u003e] (pl08x_prep_slave_sg+0x120/0x19c)\n[\u003cc01f5a94\u003e] (pl08x_prep_slave_sg+0x0/0x19c) from [\u003cc01be7a0\u003e] (pl011_dma_tx_refill+0x164/0x224)\n[\u003cc01be63c\u003e] (pl011_dma_tx_refill+0x0/0x224) from [\u003cc01bf1c8\u003e] (pl011_dma_tx_callback+0x7c/0xc4)\n[\u003cc01bf14c\u003e] (pl011_dma_tx_callback+0x0/0xc4) from [\u003cc01f4d34\u003e] (pl08x_tasklet+0x60/0x368)\n[\u003cc01f4cd4\u003e] (pl08x_tasklet+0x0/0x368) from [\u003cc004d978\u003e] (tasklet_action+0xa0/0x100)\n\nDan quoted the documentation:\n\u003e 2/ Completion callback routines cannot submit new operations.  This\n\u003e    results in recursion in the synchronous case and spin_locks being\n\u003e    acquired twice in the asynchronous case.\n\nbut then followed up to say:\n\u003e I should clarify, this is the async_memcpy() api requirement which is\n\u003e not used outside of md/raid5. DMA drivers can and do allow new\n\u003e submissions from callbacks, and the ones that do so properly move the\n\u003e callback outside of the driver lock.\n\nSo let\u0027s fix it by moving the callback out of the spinlocked region.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "30749cb4a40f02a199640011e5ab5c5f60b8482e", "tree": "2b079f8f3fb2f888d7afa36423b41c63a1583c3b", "parents": [ "c7da9a56d608145cc763bcfc9329b92c4244d8d9" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:41:13 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: allow AHB master port selection to be configured\n\nPlatforms need to be able to control which AHB master interface is used,\nas each AHB master interface may be asymetric. Allow the interfaces\nused for fetching LLIs, memory, and each peripheral to be configured\nindividually.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "c7da9a56d608145cc763bcfc9329b92c4244d8d9", "tree": "2e85075b24b15bc3e252f0295099ad8649c77ade", "parents": [ "1cae78f12028eebdc9107eaf168add46e66fb3f8" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:40:53 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: move AHB master port selection into prep_* functions\n\nAs we initialize the default cctl value in the prep_* functions along\nwith the increment settings, we don\u0027t need to repeat the selection of\nthe AHB ports each time we create a LLI entry. Do this in the prep_*\nfunctions once per transfer.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "1cae78f12028eebdc9107eaf168add46e66fb3f8", "tree": "9d014ecb90ce04452094cab5d2726321ee92f123", "parents": [ "70b5ed6b6d72cd8b1a3d4b7b878a0dd132bec7ba" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:40:33 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:13 2011 -0800" }, "message": "ARM: PL08x: move cctl increment and protection setup to prep_slave_sg\n\nWe don\u0027t need to initialize the cctl increment and protection values\nin the runtime_config method - we have all the inforamtion to setup\nthese values in prep_slave_sg(). Move their initialization there.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "70b5ed6b6d72cd8b1a3d4b7b878a0dd132bec7ba", "tree": "07f37758bcc4f7f44ba9b5f0f04190fd7e38a64a", "parents": [ "09b3c323332206aaadfb7aa13efffa82e7719b35" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:40:13 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: move default cctl into txd structure\n\nRather than modifying platform data while preparing a transfer, copy\nthe cctl value into the txd structure and modify the value there.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "09b3c323332206aaadfb7aa13efffa82e7719b35", "tree": "a64ddedf5178eef4bab335f90adcada034c77138", "parents": [ "4983a04fd2562986360b646b378f267308bc22c0" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:39:53 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: assign ccfg DMA request signal in prep_phy_channel()\n\nThere is no need to wait until we start processing a tx descriptor\nbefore setting up the DMA request selection in the ccfg register.\nWe know which channel and request will be used in prep_phy_channel(),\nso setup the ccfg request selection at txd creation time in\nprep_phy_channel().\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "4983a04fd2562986360b646b378f267308bc22c0", "tree": "365b9fcfe69547f27dc1593565a07ad0465bf37c", "parents": [ "19524d77ec34faf58d313ba34fb755ef6e159216" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:39:33 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: move ccfg into txd structure\n\nThe ccfg register is used to configure the channel parameters - the type\nand direction of transfer, the flow control signal and IRQ mask enables.\nThe type and direction of transfer is known in the relevent prep_*\nfunction where a txd is created. The IRQ mask enables are always set,\nand the flow control signals are always set when we start processing a\ntxd according to phychan-\u003esignal.\n\nIf we store the ccfg value in the txd structure, we can avoid modifying\nplatform data - and even having it in platform data at all.\n\nSo, remove it from platform data too.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "19524d77ec34faf58d313ba34fb755ef6e159216", "tree": "63b24d5a82de3ee5fd8e07a311eb8d573cd21f76", "parents": [ "c885bee4f10323a1ff3f19e1aa2aa6f4e7f89dd8" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:39:13 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: avoid duplicating registers in txd and phychan structures\n\nAs we now have all the code accessing the phychan {csrc,cdst,clli,cctl,\nccfg} members in one function, there\u0027s no point storing the data into\nthe struct. Get rid of the struct members. Re-order the register dump\nin the dev_dbg() to reflect the order we write the registers to the DMA\ndevice.\n\nThe txd {csrc,cdst,clli,cctl} values are duplicates of the lli[0]\nvalues, so there\u0027s no point duplicating these either. Program the DMAC\nregisters directly from the lli[0] values.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "c885bee4f10323a1ff3f19e1aa2aa6f4e7f89dd8", "tree": "b087498b048c7f69367123579e20ee872b7fb680", "parents": [ "db9f136a60c8727c8e1c9c4f2494821caebf5a7b" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:38:52 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: combine functions to start DMA into one function\n\nThere is no need for pl08x_config_phychan_for_txd(), pl08x_set_cregs()\nand pl08x_enable_phy_chan() to be separate - they are always called in\nsequence. Combine them into one function.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "db9f136a60c8727c8e1c9c4f2494821caebf5a7b", "tree": "d5311b870e634541e787a680d6d77bf9865f9645", "parents": [ "bfddfb45056fa95a778f0baf463ac0f9fc926d5c" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:38:32 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: clean up LLI lookup\n\nAs the LLI list is an array, we can use maths to locate which LLI\nindex we\u0027re currently at, and then sum up the remaining LLI entries\nuntil we reach the end of the list.\n\nThis makes the code much easier to read, and much less susceptible\nto falling off the end of the array.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "bfddfb45056fa95a778f0baf463ac0f9fc926d5c", "tree": "1839abe79a06f4a7653847b6cc951cc7a08cf01f", "parents": [ "e25761d72c80751c8741f5f93abab14232eef347" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:38:12 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: rename lli.next to lli.lli\n\nThe LLI pointer in the documentation is placed into the LLI register,\nso name it LLI rather than \u0027next\u0027.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "e25761d72c80751c8741f5f93abab14232eef347", "tree": "efc7c9136f7a779800fe2b736eaa2d280f7ea1ff", "parents": [ "cace658572ba5d1075f3891e823130a66f3e330f" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:37:52 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: use \u0027u32\u0027 for LLI structure members, not dma_addr_t\n\nUse \u0027u32\u0027 for the LLI structure members, which are defined by hardware\nto be 32-bit. dma_addr_t is much more vague about its actual size.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "cace658572ba5d1075f3891e823130a66f3e330f", "tree": "b615e42e2eac3ce2adb4d4cace8033df1ec748b9", "parents": [ "56b618820c92a5efa2145fbbac373fffbb024a94" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:37:31 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: use \u0027size_t\u0027 for lengths\n\nUse size_t for variables denoting lengths throughout, and use the \u0027z\u0027\nqualifier for printing the value. For safety, add a BUG_ON() in\npl08x_fill_lli_for_desc() to catch the remainder potentially becoming\nnegative.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "56b618820c92a5efa2145fbbac373fffbb024a94", "tree": "c0e046e1be9007d35d436f4577d3272bec6c45f6", "parents": [ "4c0df6a3ce8eb947647c7ed2640d0172936d8ef3" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:37:10 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:12 2011 -0800" }, "message": "ARM: PL08x: don\u0027t try to use llis_bus as a pointer\n\nllis_bus is the DMA address of the LLI array. Casting it to be a\npointer just to be able to use pointer arithmetic on it is not nice.\nWe can trivially deal with the places where we do arithmetic on it,\nand it\u0027s actually cleaner this way.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "4c0df6a3ce8eb947647c7ed2640d0172936d8ef3", "tree": "4763f62c3f64754864cc8afd70a8792b9ef24008", "parents": [ "19386b3234fdbe4d33492574d83e63a8dace18d3" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:36:50 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: don\u0027t assume that the LLI pointer has the bus bit clear\n\nWe only want use the address of the LLI pointer when locating the\ncorresponding structure in memory, so clear the master bus selection\nbit.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "19386b3234fdbe4d33492574d83e63a8dace18d3", "tree": "0d362485f1dd6fc360f3b707ab2a97ff8b3f2d17", "parents": [ "8c8cc2b1040f51a2f89724edbf976774128339eb" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:36:29 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: ensure loops use cpu_relax()\n\nTight loops should use cpu_relax() to allow CPUs to reduce power\nconsumption while waiting for events.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "8c8cc2b1040f51a2f89724edbf976774128339eb", "tree": "367430b053afd6dd07e994da78f840f5221b9dd3", "parents": [ "ac3cd20df9d74bb205bb34f69407477a884ff8a3" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:36:09 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: consolidate physical channel release code\n\nConsolidate duplicated channel release code into release_phy_channel()\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "ac3cd20df9d74bb205bb34f69407477a884ff8a3", "tree": "6a740291ec8c7b05cd7647c8dc0d90c5c0d0d68e", "parents": [ "7cb72ad959b16ac594118977b7954a7d2ec7a052" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:35:49 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: consolidate common txd initialization\n\nConsolidate code which allocates and initializes txds.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "7cb72ad959b16ac594118977b7954a7d2ec7a052", "tree": "eb6ea7ae69b7a8c2caef7d10eaec1a4dcf1110b4", "parents": [ "f96ca9ec27159c1c8718aa8d0ed03051cd12e884" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:35:28 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: avoid \u0027void *\u0027 struct fields when we can type them properly\n\nAvoid using \u0027void *\u0027 struct fields when the structs are not defined\nin linux/amba/pl08x.h - instead, forward declare the struct names, and\nuse these instead. This ensures we have proper typechecking.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "f96ca9ec27159c1c8718aa8d0ed03051cd12e884", "tree": "38ef312ac8654ab5cf2c19ed258836e1153a6bab", "parents": [ "b58b6b5bedf4d5da7a0cb2dce3b42d010c3aef03" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:35:08 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: constify vendor data pointers\n\nWe should never modify the vendor data structure so make it const.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "b58b6b5bedf4d5da7a0cb2dce3b42d010c3aef03", "tree": "f66787ab02b05ca68aad200b193abef636334c07", "parents": [ "ad0a3ad33c96cbba98ba62116771fb836c551e60" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:34:48 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: remove circular buffer support\n\nThe driver already won\u0027t initialize a channel with a circular buffer;\nthe check in pl08x_prep_channel_resources() sees to that. Remove\ncircular buffer support for the time being.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "ad0a3ad33c96cbba98ba62116771fb836c551e60", "tree": "7d91cc40d91bf63f6bfd0023c114fcc8d549700e", "parents": [ "730404ac1c47403af67420705980c99e90bf182f" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:34:27 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: remove unnecessary NULL and BUG checks\n\nThe tasklet always is initialized with a non-NULL data argument. It\nis not possible for it to be called with a NULL data argument (unless\nsomething is very wrong in the tasklet code - in which case lots of\nstuff will break). Therefore, as plchan can never be NULL, remove\nthis unnecessary BUG check.\n\nIn pl08x_tasklet(), we\u0027ve already dereferenced plchan-\u003eat, so it can\u0027t\nbe NULL here. Remove this unnecessary BUG check.\n\npl08x_fill_llis_for_desc() and pl08x_free_txd() are always called with\na non-NULL txd argument - either as a consequence of the code paths or\nas a result of other checks already in place. We don\u0027t need to repeat\nthe non-NULL check in these functions.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "730404ac1c47403af67420705980c99e90bf182f", "tree": "2ab740731c2f6d09f3c7ace9e8a6d706d364414f", "parents": [ "9c132992689d7d27a4e17545b6279db4e03c0943" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:34:07 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: remove unnecessary includes\n\nWe don\u0027t need to include linux/pci.h as we aren\u0027t a PCI driver. We\naren\u0027t doing any processor specific functions, so asm/processor.h is\nnot required. asm/cacheflush.h shouldn\u0027t be used, we have the DMA API\nfor this. DMA interfaces aren\u0027t required as we\u0027re only implementing\nthe dmaengine API and not a platform-private DMA API.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "9c132992689d7d27a4e17545b6279db4e03c0943", "tree": "d325746290ec84b1b7e03b546c8f585048cbe28a", "parents": [ "b05cd8f4c04a29eebfa65c45fabc78a02f16a782" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:33:47 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: prefix hex numbers with 0x\n\nA driver which emits both decimal and hex numbers in its printk\ncreates confusion as to what is what. Prefix hex numbers with 0x.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "b05cd8f4c04a29eebfa65c45fabc78a02f16a782", "tree": "3fd5cbcb3b4560c8b8380177f108de21df66dc79", "parents": [ "9dc2c200a0551754f91e1b322dcb3d782cd709b2" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:33:26 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:11 2011 -0800" }, "message": "ARM: PL08x: improve the announcement printk\n\nInclude the revision number of the PL08x primecell in the boot-time\nprintk to allow proper identification of the peripheral. Reformat\nthe announcement printk format reflect what we do for other primecell\ndrivers - generally \"PLXXX revX at 0xNNNNNNNN irq X\".\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "9dc2c200a0551754f91e1b322dcb3d782cd709b2", "tree": "aab2fa7ea1ae3f191f5b6c7abdada93a3b232e02", "parents": [ "3e2a037c1de79af999a54581cbf1e8a5c933fd95" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:33:06 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:10 2011 -0800" }, "message": "ARM: PL08x: add comment explaining the flow control methods\n\nExplain the two flow control methods which the PL08x implements, along\nwith the problem which peripheral flow control presents. This helps\npeople understand why we are unable to use these DMA controllers with\n(eg) the MMCI.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "3e2a037c1de79af999a54581cbf1e8a5c933fd95", "tree": "c4efba4ddeeaa99c8eae988feac9a2551d19957c", "parents": [ "98838f90d92f6f0abf6d6a99880c0ff3127633b8" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:32:46 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:10 2011 -0800" }, "message": "ARM: PL08x: fix sparse warnings\n\ndrivers/dma/amba-pl08x.c:1895:40: warning: Unknown escape \u0027%\u0027\ndrivers/dma/amba-pl08x.c:1903:40: warning: Unknown escape \u0027%\u0027\ndrivers/dma/amba-pl08x.c:513:6: warning: symbol \u0027pl08x_choose_master_bus\u0027 was not declared. Should it be static?\ndrivers/dma/amba-pl08x.c:604:5: warning: symbol \u0027pl08x_fill_llis_for_desc\u0027 was not declared. Should it be static?\ndrivers/dma/amba-pl08x.c:1442:32: warning: symbol \u0027pl08x_prep_slave_sg\u0027 was not declared. Should it be static?\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "98838f90d92f6f0abf6d6a99880c0ff3127633b8", "tree": "011581a93e3ab32c3feaf2e8d93e9fbd3d23be1e", "parents": [ "9c0bb43bbd02fba0b235f8993d1f175734fa8735" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:32:26 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:10 2011 -0800" }, "message": "ARM: PL08x: fix deadlock in terminate_all\n\nTrying to disable a tasklet while holding a spinlock which the tasklet\nwill take is a recipe for deadlock - tasklet_disable() will wait for the\ntasklet to finish running, which it will never do. In any case, there\nis not a corresponding tasklet_enable(), so once the tasklet is disabled,\nit will never run again until reboot.\n\nIt\u0027s safe to just remove the tasklet_disable() as we remove all current\nand pending descriptors before releasing this spinlock. This means that\nthe tasklet will find no remaining work if it subsequently runs.\n\nThe only remaining issue is that the callback for an already submitted\ntxd may be in progress, or even called after terminate_all() returns.\nThere\u0027s not much that can be done about that as waiting for the callback\nto complete before returning will also lead to deadlocks.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "9c0bb43bbd02fba0b235f8993d1f175734fa8735", "tree": "b5b5673a0e44a0e5263f7c8a9ec800b53b1bfc12", "parents": [ "dafa73171be8dd31b485f5839e3376b1ca908e24" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:32:05 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:10 2011 -0800" }, "message": "ARM: PL08x: fix missed spin-unlock in pl08x_issue_pending()\n\npl08x_issue_pending() returns with the spinlock locked and interrupts\ndisabled if the channel is waiting for a physical DMA to become free.\nThis is wrong - especially as pl08x_issue_pending() is an API function\nas it leads to deadlocks. Fix it to always return with the spinlock\nunlocked.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "dafa73171be8dd31b485f5839e3376b1ca908e24", "tree": "70d6d14b7be6543cbfe777a523c75dc0a332c402", "parents": [ "bf072af461c166964fb110cfcafccd752fbb4c64" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:31:45 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:10 2011 -0800" }, "message": "ARM: PL08x: fix a leak when preparing TXDs\n\nIf we fail to allocate the LLI, the prep_* function will return NULL.\nHowever, the TXD we allocated will not be placed on any list, nor\nwill it be freed - we\u0027ll just drop all references to it. Make sure\nwe free it rather than leaking TXDs.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "bf072af461c166964fb110cfcafccd752fbb4c64", "tree": "a30b526ad74c2885ae9f8d9f10f412f6d7ff0f59", "parents": [ "91aa5fadb831e7b6ea473a526a6b49c6dc4819ce" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:31:24 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:10 2011 -0800" }, "message": "ARM: PL08x: fix locking in tasklet\n\nTasklets are run from an interruptible context. The slave DMA functions\ncan be called from within IRQ handlers. Taking the spinlock without\ndisabling interrupts allows an interrupt handler to run, which may try\nto take the spinlock again, resulting in deadlock. Fix this by using\nthe irqsave spinlocks.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "91aa5fadb831e7b6ea473a526a6b49c6dc4819ce", "tree": "4f96e2649b8725b6f58bace588e90c9f38c3dc80", "parents": [ "4440aacf3a171a0ab498feda58d100a320c5d9ff" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:31:04 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:10 2011 -0800" }, "message": "ARM: PL08x: fix atomic_t usage and tx_submit() return value range\n\nThe last_issued variable uses an atomic type, which is only\nincremented inside a protected region, and then read. Everywhere else\nonly reads the value, so it isn\u0027t using atomic_t correctly, and it\ndoesn\u0027t even need to. Moreover, the DMA engine code provides us with\na variable for this already - chan.cookie. Use chan.cookie instead.\n\nAlso, avoid negative dma_cookie_t values - negative returns from\ntx_submit() mean failure, yet in reality we always succeed. Restart\nfrom cookie 1, just like other DMA engine drivers do.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "4440aacf3a171a0ab498feda58d100a320c5d9ff", "tree": "582fa3a2b9a99d2f36394e29d02ac001d72d2ff6", "parents": [ "e8b5e11df3d02e7bbd85c025cc705a8e67746f73" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:30:44 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:16:10 2011 -0800" }, "message": "ARM: PL08x: fix array overflow in dma_set_runtime_config()\n\nIf maxburst was passed in as zero, we would overflow the burst_sizes[]\narray. Fix this by checking for this condition, and defaulting to\nsingle transfer \u0027bursts\u0027.\n\nImprove the readability of the loop using a for() loop rather than\na while() loop with the iterator initialized far from the loop.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "e8b5e11df3d02e7bbd85c025cc705a8e67746f73", "tree": "33c31a3b3d56c917babe0c8a675dfb9e6127f8ef", "parents": [ "e8a7e48bb248a1196484d3f8afa53bded2b24e71" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Jan 03 22:30:24 2011 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 19:13:38 2011 -0800" }, "message": "ARM: PL08x: fix spelling errors\n\nCorrect mis-spellings in comments and printk strings.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "d49278e3351b34870cbffffc5067348a318e7b06", "tree": "a8569e9a24286a0bd885f96e27342e4de2fdecbb", "parents": [ "e8a7e48bb248a1196484d3f8afa53bded2b24e71" ], "author": { "name": "Per Forlin", "email": "per.forlin@stericsson.com", "time": "Mon Dec 20 18:31:38 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 04 17:20:43 2011 -0800" }, "message": "dmaengine: dma40: Add support to split up large elements\n\nThe maximum transfer size of the stedma40 is (64k-1) x data-width.\nIf the transfer size of one element exceeds this limit\nthe job is split up and sent as linked transfer.\n\nSigned-off-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" } ], "next": "d45fa563a62c908d0e9a581d4f091fed6371ebd0" }