Commit graph

287,753 commits

Author SHA1 Message Date
Larry Finger
62f27cc4ae staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:15 -07:00
Larry Finger
f38d223b69 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVI
This patch removes all the errors and most of the warnings generated by
checkpatch -f for rtllib_softmac_tx.c..

    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:15 -07:00
Larry Finger
a44be772cb staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XV
This patch removes all the errors and warnings generated by
checkpatch -f for rtllib_softmac_wx.c..

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:14 -07:00
Larry Finger
9d92ece80d staging: rtl8192e: Cleanup checkpatch -f errors - Part XIV
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtllib_softmac.c will need refactoring. In addition,
some of the variables may need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:14 -07:00
Larry Finger
db8971b618 staging: rtl8192e: Cleanup checkpatch -f errors - Part XIII
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtl_dm.c will need refactoring. In addition,
some of the variables will need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:14 -07:00
Larry Finger
8567829a6c staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XII
This patch removes all the errors and most of the warnings generated by
checkpatch -f.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:13 -07:00
Larry Finger
a44325f985 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XI
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:13 -07:00
Larry Finger
b448b0cc13 staging: rtl8192e: Cleanup checkpatch -f errors - Part X
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtl_dm.c will need refactoring. In addition,
some of the variables will need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:12 -07:00
Larry Finger
cffa5bd956 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IX
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:12 -07:00
Larry Finger
1344ee2591 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:12 -07:00
Larry Finger
b6da7313e0 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:11 -07:00
Larry Finger
f88ec6cbc1 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VI
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:11 -07:00
Larry Finger
831cb9db38 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part V
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:10 -07:00
Larry Finger
547d0c34b7 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IV
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:10 -07:00
Larry Finger
11632a0eed staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part III
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:10 -07:00
Larry Finger
526294770c staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part II
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:10 -07:00
Larry Finger
55dc4eb35f staging: rtl8192e: Remove extraneous log message
The driver logs all DHCP transactions and thus spams the logs.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:09 -07:00
Larry Finger
0dd565069b staging: rtl8192e: Modify time handling
In several places, the driver keeps times (in jiffies) in two 32-bit
quantities. In the rtl8192_hw_to_sleep(), there is an error in the
calculation of the difference between two 64-bit quantities. Rather
than fix that error, I have converted to a single 64-bit number. That
makes the code be much cleaner and clearer.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:09 -07:00
Larry Finger
ac513a88a0 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part I
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:08 -07:00
Jean-Christophe PLAGNIOL-VILLARD
c96fbdd0ab USB: ftdi_sio: add Calao reference board support
Calao use on there dev kits a FT2232 where the port 0 is used for the JTAG and
port 1 for the UART

They use the same VID and PID as FTDI Chip but they program the manufacturer
name in the eeprom

So use this information to detect it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Gregory Hermant <gregory.hermant@calao-systems.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 09:44:50 -07:00
Larry Finger
8bd890a41f staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVIII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:31 -05:00
Larry Finger
c73901c9fd staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:31 -05:00
Larry Finger
94fa3e89b4 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVI
This patch removes all the errors and most of the warnings generated by
checkpatch -f for rtllib_softmac_tx.c..

    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:30 -05:00
Larry Finger
755f3a84cf staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XV
This patch removes all the errors and warnings generated by
checkpatch -f for rtllib_softmac_wx.c..

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:30 -05:00
Larry Finger
3927ee3600 staging: rtl8192e: Cleanup checkpatch -f errors - Part XIV
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtllib_softmac.c will need refactoring. In addition,
some of the variables may need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:29 -05:00
Larry Finger
87d30617c6 staging: rtl8192e: Cleanup checkpatch -f errors - Part XIII
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtl_dm.c will need refactoring. In addition,
some of the variables will need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:28 -05:00
Larry Finger
d57429f05e staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XII
This patch removes all the errors and most of the warnings generated by
checkpatch -f.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:28 -05:00
Larry Finger
fbf7653873 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XI
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:27 -05:00
Larry Finger
b2a3fff4bf staging: rtl8192e: Cleanup checkpatch -f errors - Part X
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtl_dm.c will need refactoring. In addition,
some of the variables will need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:26 -05:00
Larry Finger
88a9fd04fa staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IX
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:26 -05:00
Larry Finger
54586533ef staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:25 -05:00
Jiri Slaby
0b058353ab TTY: use tty_wait_until_sent_from_close in other drivers
Let's use the newly added helper to avoid stalls in drivers which are
not yet ported to tty_port helpers.

Those which are broken (call tty_wait_until_sent with irqs disabled)
are left untouched. They are in a deeper trouble than we are trying to
solve here. This includes amiserial, 68328serial, 68360serial and
crisv10.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 09:00:42 -07:00
Jiri Slaby
424cc03912 TTY: use tty_wait_until_sent_from_close in tty_port_close_start
Let's use the newly added helper to avoid stalls in drivers which are
already ported to tty_port helpers.

We have to ensure here, that there is no user of tty_port_close_start
and tty_port_close which holds port->mutex (or other) lock over them.
And sure, there is none.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 09:00:41 -07:00
Jiri Slaby
a57a7bf3fc TTY: define tty_wait_until_sent_from_close
We need this helper to fix system stalls. The issue is that the rest
of the system TTYs wait for us to finish waiting. This wasn't an issue
with BKL. BKL used to unlock implicitly.

This is based on the Arnd suggestion.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 09:00:40 -07:00
Jiri Slaby
bafb0bd24d TTY: serial, move locking in uart_close
So now, when we handle CLOSING flag, there is no point to hold
port->mutex over the start of uart_close.

Yes, there are still several things to reason about:
* port->count etc is and always was protected by a spinlock
* ->stop_rx is protected by a spinlock. Otherwise it would
  race with interrupts.
* uart_wait_until_sent -- that one is already called without
  port->mutex from set_termios and tty_set_ldisc. Should anything
  be protected there, it would be tx_empty. And by a spinlock.
  8250 does this internally...

This step is needed to fix system stalls. To not create an AB-BA lock
dependency (see next patches).

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 09:00:39 -07:00
Jiri Slaby
426929f8d3 TTY: serial, use ASYNCB_CLOSING in uart_close
We need to move port->mutex locking after wait_until_sent in
uart_close (for rationale see next patches). But if we did it now, we
would introduce a race between close and open. This is exactly why
port->mutex is locked at the top of uart_close.

To avoid the race, we add ASYNCB_CLOSING to uart_close. Like every
other sane TTY driver. Thanks to tty_port_block_til_ready used in
uart_open we will have this for free. Then we can move the port->mutex
lock.

Also note that this will make the conversion to tty_port helpers
easier. They are currently handling ASYNC_CLOSING flag correctly.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 09:00:39 -07:00
Joe Perches
75bf74b90f staging: brcmfmac: Consolidate debugging macros
Convert multiple BRCMF_<debug_level> macros to a single
brcmf_dbg(level, fmt, ...) macro.

Remove the now unnecessary double parentheses in the uses
of the old macros when converting to brcmf_dbg.

Delete all uses of "%s: [fmt]", __func__, args... and move
the "%s: ", __func__ to the macro for consistency.

Coalesce long formats.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 08:45:45 -07:00
Stephen Rothwell
09ebd6f23b staging: rtl8192e: using vmalloc/vfree requires including vmalloc.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 08:45:44 -07:00
Wolfram Sang
42b565df85 staging/olpc_dcon: Remove obsolete cleanup for clientdata
A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit or error. This is obsolete meanwhile, the core will do it.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Andres Salomon <dilinger@queued.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Marek Belisko <marek.belisko@open-nandra.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 08:30:23 -07:00
Christoph Hellwig
242d621964 xfs: deprecate the nodelaylog mount option
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
2011-08-25 10:30:05 -05:00
Greg Kroah-Hartman
1c2de3e742 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E into staging-next
* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (166 commits)
  staging: rtl8192e: Remove files that are not used
  staging: rtl8192e: Convert typedefs that can be replaced with #define
  staging: rtl8192e: Convert typedef HT_AGGRE_SIZE_E to enum ht_aggre_size
  staging: rtl8192e: Convert typedef RATR_TABLE_MODE_8192S to enum ratr_table_mode_8192s
  staging: rtl8192e: Convert typedef FW_CMD_IO_TYPE to enum fw_cmd_io_type
  staging: rtl8192e: Convert typedef SCAN_OPERATION_BACKUP_OPT to enum scan_op_backup_opt
  staging: rtl8192e: Convert typedef country_code_type_t to enum country_code_type
  staging: rtl8192e: Convert typedef WOLPATTERN_TYPE to enum wol_pattern_type
  staging: rtl8192e: Convert typedef RT_RF_POWER_STATE to enum rt_rf_power_state
  staging: rtl8192e: Convert typedef RT_JOIN_ACTION to enum rt_join_action
  staging: rtl8192e: Convert typedef IPS_CALLBACK_FUNCION to enum ips_callback_function
  staging: rtl8192e: Convert typedef RT_PS_MODE to enum rt_ps_mode
  staging: rtl8192e: Convert typedef Fsync_State to enum fsync_state
  staging: rtl8192e: Convert typedef erp_t to enum erp_t
  staging: rtl8192e: Convert typedef WIRELESS_NETWORK_TYPE to enum wireless_network_type
  staging: rtl8192e: Convert typedef WIRELESS_MODE to enum wireless_mode
  staging: rtl8192e: Convert typedef RT_RF_TYPE_DEF to enum rt_rf_type_def
  staging: rtl8192e: Convert typedef LED_CTL_MODE to enum led_ctl_mode
  staging: rtl8192e: Convert typedef InitialGainOpType to enum init_gain_op_type
  staging: rtl8192e: Convert typedef BA_ACTION to enum ba_action
  ...
2011-08-25 08:27:45 -07:00
Bryan Wu
9fc2071a65 ARM: mach-footbridge: add missing header file <video/vga.h>
This patch fixes following building error:
--
arch/arm/mach-footbridge/dc21285.c: In function 'dc21285_preinit':
arch/arm/mach-footbridge/dc21285.c:299:2: error: 'vga_base' undeclared (first use in this function)
arch/arm/mach-footbridge/dc21285.c:299:2: note: each undeclared identifier is reported only once for each function it appears in
make[1]: *** [arch/arm/mach-footbridge/dc21285.o] Error 1
--

Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
2011-08-25 09:08:19 -05:00
Bryan Wu
158c0c623a ARM: mach-orion5x: add missing header file <linux/vga.h>
This patch fixed following building error:
--
arch/arm/mach-orion5x/pci.c: In function 'orion5x_pci_sys_setup':
arch/arm/mach-orion5x/pci.c:563:2: error: 'vga_base' undeclared (first use in this function)
arch/arm/mach-orion5x/pci.c:563:2: note: each undeclared identifier is reported only once for each function it appears in
make[1]: *** [arch/arm/mach-orion5x/pci.o] Error 1
make[1]: *** Waiting for unfinished jobs....
--

Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
2011-08-25 09:08:18 -05:00
Paul Gortmaker
5166793feb arm: fix compile failure in orion5x/dns323-setup.c
Upstream commit d5341942d7 "PCI: Make the
struct pci_dev * argument of pci_fixup_irqs const." leaked an extra
"const" into an actual call site (vs a proto/decl) which causes this:

arch/arm/mach-orion5x/dns323-setup.c: In function 'dns323_pci_map_irq':
arch/arm/mach-orion5x/dns323-setup.c:80: error: expected expression before 'const'
arch/arm/mach-orion5x/dns323-setup.c:80: error: too few arguments to function 'orion5x_pci_map_irq'
make[3]: *** [arch/arm/mach-orion5x/dns323-setup.o] Error 1

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
2011-08-25 09:07:31 -05:00
Viresh Kumar
57001a606f dmaengine/amba-pl08x: Call pl08x_free_txd() instead of calling kfree() directly
pl08x_prep_channel_resources() is calling kfree() directly for txd(). To
maintain consistency in code call pl08x_free_txd() instead.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2011-08-25 19:35:07 +05:30
Viresh Kumar
0a2356572b dmaengine/amba-pl08x: Pass flow controller information with slave channel data
At least, on SPEAr platforms there is one peripheral, JPEG, which can be flow
controller for DMA transfer. Currently DMA controller driver didn't support
peripheral flow controller configurations.

This patch adds device_fc field in struct pl08x_channel_data, which will be used
only for slave transfers and is not used in case of mem2mem transfers.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2011-08-25 19:33:39 +05:30
Viresh Kumar
036f05fd6d dmaengine/amba-pl08x: Choose peripheral bus as master bus
When we have DMA transfers between peripheral and memory, then we shouldn't
reduce width of peripheral at all, as that may be a strict requirement. But we
can always reduce width of memory access, with some compromise in performance.
Thus, we must select peripheral as master and not memory.

Also this rearranges code to make it shorter.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2011-08-25 19:33:39 +05:30
Viresh Kumar
e071916580 dmaengine/amba-pl08x: Align lli_len to max(src.width, dst.width)
Currently lli_len is aligned to min of two widths, which looks to be incorrect.
Instead it should be aligned to max of both widths.

Lets say, total_size = 441 bytes

MIN: lets check if min() suits or not:

CASE 1: srcwidth = 1, dstwidth = 4
min(src, dst) = 1

i.e. We program transfer size in control reg to 441.
Now, till 440 bytes everything is fine, but on the last byte DMAC can't transfer
1 byte to dst, as its width is 4.

CASE 2: srcwidth = 4, dstwidth = 1
min(src, dst) = 1

i.e. we program transfer size in control reg to 110 (data transferred = 110 * srcwidth).
So, here too 1 byte is left, but on the source side.

MAX: Lets check if max() suits or not:

CASE 3: srcwidth = 1, dstwidth = 4
max(src, dst) = 4

Aligned size is 440

i.e. We program transfer size in control reg to 440.
Now, all 440 bytes will be transferred without any issues.

CASE 4: srcwidth = 4, dstwidth = 1
max(src, dst) = 4

Aligned size is 440

i.e. We program transfer size in control reg to 110 (data transferred = 110 * srcwidth).
Now, also all 440 bytes will be transferred without any issues.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2011-08-25 19:33:39 +05:30
Viresh Kumar
03af500f74 dmaengine/amba-pl08x: Add prep_single_byte_llis() routine
Code for creating single byte llis is present at several places. Create a
routine to avoid code redundancy.

Also, we don't need one lli per single byte transfer, we can have single lli to
do all single byte transfer.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2011-08-25 19:33:39 +05:30
Viresh Kumar
fa6a940bf1 dmaengine/amba-pl08x: max_bytes_per_lli is TRANSFER_SIZE * src_width (not MIN(width))
max_bytes_per_lli = bd.srcbus.buswidth * PL080_CONTROL_TRANSFER_SIZE_MASK;
This is confirmed by ARM support guys.

Below is summary of mail exchange with them:

[Viresh] What is the total data to be transferred in case source and destination
bus widths are different. Suppose, source bus width is 2 bytes and destination
is 4 bytes. Now in order to transfer 80 bytes, what should be value of
TransferSize field in control reg: 40? or 20?.

[David from ARM] The value that is programmed into the TransferSize field should
be the number of <SourceWidth> transfers needed to achieve the required data
transfer.

So, to transfer 80 bytes, with a Source Width of 2, the TransferSize field =
should be programmed with:

        Total transfer size
        ------------------- = 40
          <source width>

[Viresh] Will this change if source is 4 bytes and dest is 2?

[David] Yes - the calculation then becomes:

        Total transfer size
        ------------------- =20
          <source width>

Also, max_bytes_per_lli must be calculated after fixing src and dest widths not
before that. So move this code to the correct place.

This patch also removes max_bytes_per_lli from earlier print message, as till
that point max_bytes_per_lli is unknown.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2011-08-25 19:33:39 +05:30