From: Grant Likely <grant.likely@secretlab.ca>
To: Mingkai Hu <Mingkai.hu@freescale.com>
Cc: linuxppc-dev@ozlabs.org, kumar.gala@freescale.com,
spi-devel-general@lists.sourceforge.net
Subject: Re: [PATCH 2/2] eSPI: fix wrong setting of the address in the command buffer
Date: Fri, 24 Dec 2010 01:55:18 -0700 [thread overview]
Message-ID: <20101224085518.GG5544@angua.secretlab.ca> (raw)
In-Reply-To: <1292894822-7983-1-git-send-email-Mingkai.hu@freescale.com>
On Tue, Dec 21, 2010 at 09:27:02AM +0800, Mingkai Hu wrote:
> Or else we cann't operate on the right address when the trans length
> is greater than 65535.
>
> Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
Applied to merge branch for 2.6.27, thanks.
g.
> ---
> drivers/spi/spi_fsl_espi.c | 16 +++++++++-------
> 1 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/spi/spi_fsl_espi.c b/drivers/spi/spi_fsl_espi.c
> index ae78926..a99e233 100644
> --- a/drivers/spi/spi_fsl_espi.c
> +++ b/drivers/spi/spi_fsl_espi.c
> @@ -258,18 +258,18 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t)
> return mpc8xxx_spi->count;
> }
>
> -static void fsl_espi_addr2cmd(unsigned int addr, u8 *cmd)
> +static inline void fsl_espi_addr2cmd(unsigned int addr, u8 *cmd)
> {
> - if (cmd[1] && cmd[2] && cmd[3]) {
> + if (cmd) {
> cmd[1] = (u8)(addr >> 16);
> cmd[2] = (u8)(addr >> 8);
> cmd[3] = (u8)(addr >> 0);
> }
> }
>
> -static unsigned int fsl_espi_cmd2addr(u8 *cmd)
> +static inline unsigned int fsl_espi_cmd2addr(u8 *cmd)
> {
> - if (cmd[1] && cmd[2] && cmd[3])
> + if (cmd)
> return cmd[1] << 16 | cmd[2] << 8 | cmd[3] << 0;
>
> return 0;
> @@ -395,9 +395,11 @@ static void fsl_espi_rw_trans(struct spi_message *m,
> }
> }
>
> - addr = fsl_espi_cmd2addr(local_buf);
> - addr += pos;
> - fsl_espi_addr2cmd(addr, local_buf);
> + if (pos > 0) {
> + addr = fsl_espi_cmd2addr(local_buf);
> + addr += pos;
> + fsl_espi_addr2cmd(addr, local_buf);
> + }
>
> espi_trans->n_tx = n_tx;
> espi_trans->n_rx = trans_len;
> --
> 1.6.4
>
>
prev parent reply other threads:[~2010-12-24 8:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-21 1:27 [PATCH 2/2] eSPI: fix wrong setting of the address in the command buffer Mingkai Hu
2010-12-24 8:55 ` Grant Likely [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101224085518.GG5544@angua.secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=Mingkai.hu@freescale.com \
--cc=kumar.gala@freescale.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=spi-devel-general@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).