All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] nvme: fix for big endian systems
@ 2021-05-06 18:24 David Lamparter
  2021-05-18 11:09 ` David Lamparter
  2021-06-19 14:15 ` Bin Meng
  0 siblings, 2 replies; 6+ messages in thread
From: David Lamparter @ 2021-05-06 18:24 UTC (permalink / raw)
  To: u-boot

writel() and co. already include the endian swap;  doing the swap twice
is, er, unhelpful.

Tested on a P4080DS, which boots perfectly fine off NVMe with this.

Signed-off-by: David Lamparter <equinox@diac24.net>
---
 drivers/nvme/nvme.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index c61dab20c5f0..d554ec54cbe0 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -157,7 +157,7 @@ static u16 nvme_read_completion_status(struct nvme_queue *nvmeq, u16 index)
 
 	invalidate_dcache_range(start, stop);
 
-	return le16_to_cpu(readw(&(nvmeq->cqes[index].status)));
+	return readw(&(nvmeq->cqes[index].status));
 }
 
 /**
@@ -221,7 +221,7 @@ static int nvme_submit_sync_cmd(struct nvme_queue *nvmeq,
 	}
 
 	if (result)
-		*result = le32_to_cpu(readl(&(nvmeq->cqes[head].result)));
+		*result = readl(&(nvmeq->cqes[head].result));
 
 	if (++head == nvmeq->q_depth) {
 		head = 0;
@@ -304,7 +304,7 @@ static int nvme_enable_ctrl(struct nvme_dev *dev)
 {
 	dev->ctrl_config &= ~NVME_CC_SHN_MASK;
 	dev->ctrl_config |= NVME_CC_ENABLE;
-	writel(cpu_to_le32(dev->ctrl_config), &dev->bar->cc);
+	writel(dev->ctrl_config, &dev->bar->cc);
 
 	return nvme_wait_ready(dev, true);
 }
@@ -313,7 +313,7 @@ static int nvme_disable_ctrl(struct nvme_dev *dev)
 {
 	dev->ctrl_config &= ~NVME_CC_SHN_MASK;
 	dev->ctrl_config &= ~NVME_CC_ENABLE;
-	writel(cpu_to_le32(dev->ctrl_config), &dev->bar->cc);
+	writel(dev->ctrl_config, &dev->bar->cc);
 
 	return nvme_wait_ready(dev, false);
 }
-- 
2.26.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] nvme: fix for big endian systems
  2021-05-06 18:24 [PATCH] nvme: fix for big endian systems David Lamparter
@ 2021-05-18 11:09 ` David Lamparter
  2021-06-19 14:10   ` David Lamparter
  2021-06-19 14:15 ` Bin Meng
  1 sibling, 1 reply; 6+ messages in thread
From: David Lamparter @ 2021-05-18 11:09 UTC (permalink / raw)
  To: u-boot

Hi all,


On Thu, May 06, 2021 at 08:24:30PM +0200, David Lamparter wrote:
> writel() and co. already include the endian swap;  doing the swap twice
> is, er, unhelpful.
> 
> Tested on a P4080DS, which boots perfectly fine off NVMe with this.

is there anything to be done on my end to get this merged?  The
MAINTAINERS file has no entry for drivers/nvme/ so I'm not quite sure
who to ping on this...

Cheers,


David


> diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
> index c61dab20c5f0..d554ec54cbe0 100644
> --- a/drivers/nvme/nvme.c
> +++ b/drivers/nvme/nvme.c
> @@ -157,7 +157,7 @@ static u16 nvme_read_completion_status(struct nvme_queue *nvmeq, u16 index)
>  
>  	invalidate_dcache_range(start, stop);
>  
> -	return le16_to_cpu(readw(&(nvmeq->cqes[index].status)));
> +	return readw(&(nvmeq->cqes[index].status));
>  }
>  
>  /**
> @@ -221,7 +221,7 @@ static int nvme_submit_sync_cmd(struct nvme_queue *nvmeq,
>  	}
>  
>  	if (result)
> -		*result = le32_to_cpu(readl(&(nvmeq->cqes[head].result)));
> +		*result = readl(&(nvmeq->cqes[head].result));
>  
>  	if (++head == nvmeq->q_depth) {
>  		head = 0;
> @@ -304,7 +304,7 @@ static int nvme_enable_ctrl(struct nvme_dev *dev)
>  {
>  	dev->ctrl_config &= ~NVME_CC_SHN_MASK;
>  	dev->ctrl_config |= NVME_CC_ENABLE;
> -	writel(cpu_to_le32(dev->ctrl_config), &dev->bar->cc);
> +	writel(dev->ctrl_config, &dev->bar->cc);
>  
>  	return nvme_wait_ready(dev, true);
>  }
> @@ -313,7 +313,7 @@ static int nvme_disable_ctrl(struct nvme_dev *dev)
>  {
>  	dev->ctrl_config &= ~NVME_CC_SHN_MASK;
>  	dev->ctrl_config &= ~NVME_CC_ENABLE;
> -	writel(cpu_to_le32(dev->ctrl_config), &dev->bar->cc);
> +	writel(dev->ctrl_config, &dev->bar->cc);
>  
>  	return nvme_wait_ready(dev, false);
>  }

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] nvme: fix for big endian systems
  2021-05-18 11:09 ` David Lamparter
@ 2021-06-19 14:10   ` David Lamparter
  2021-06-19 14:16     ` Bin Meng
  0 siblings, 1 reply; 6+ messages in thread
From: David Lamparter @ 2021-06-19 14:10 UTC (permalink / raw)
  To: u-boot

On Tue, May 18, 2021 at 01:09:17PM +0200, David Lamparter wrote:
> On Thu, May 06, 2021 at 08:24:30PM +0200, David Lamparter wrote:
> > writel() and co. already include the endian swap;  doing the swap twice
> > is, er, unhelpful.
> > 
> > Tested on a P4080DS, which boots perfectly fine off NVMe with this.
> 
> is there anything to be done on my end to get this merged?  The
> MAINTAINERS file has no entry for drivers/nvme/ so I'm not quite sure
> who to ping on this...

Ping - could someone review and/or merge this?

Cheers,


David


> > diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
> > index c61dab20c5f0..d554ec54cbe0 100644
> > --- a/drivers/nvme/nvme.c
> > +++ b/drivers/nvme/nvme.c
> > @@ -157,7 +157,7 @@ static u16 nvme_read_completion_status(struct nvme_queue *nvmeq, u16 index)
> >  
> >  	invalidate_dcache_range(start, stop);
> >  
> > -	return le16_to_cpu(readw(&(nvmeq->cqes[index].status)));
> > +	return readw(&(nvmeq->cqes[index].status));
> >  }
> >  
> >  /**
> > @@ -221,7 +221,7 @@ static int nvme_submit_sync_cmd(struct nvme_queue *nvmeq,
> >  	}
> >  
> >  	if (result)
> > -		*result = le32_to_cpu(readl(&(nvmeq->cqes[head].result)));
> > +		*result = readl(&(nvmeq->cqes[head].result));
> >  
> >  	if (++head == nvmeq->q_depth) {
> >  		head = 0;
> > @@ -304,7 +304,7 @@ static int nvme_enable_ctrl(struct nvme_dev *dev)
> >  {
> >  	dev->ctrl_config &= ~NVME_CC_SHN_MASK;
> >  	dev->ctrl_config |= NVME_CC_ENABLE;
> > -	writel(cpu_to_le32(dev->ctrl_config), &dev->bar->cc);
> > +	writel(dev->ctrl_config, &dev->bar->cc);
> >  
> >  	return nvme_wait_ready(dev, true);
> >  }
> > @@ -313,7 +313,7 @@ static int nvme_disable_ctrl(struct nvme_dev *dev)
> >  {
> >  	dev->ctrl_config &= ~NVME_CC_SHN_MASK;
> >  	dev->ctrl_config &= ~NVME_CC_ENABLE;
> > -	writel(cpu_to_le32(dev->ctrl_config), &dev->bar->cc);
> > +	writel(dev->ctrl_config, &dev->bar->cc);
> >  
> >  	return nvme_wait_ready(dev, false);
> >  }

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] nvme: fix for big endian systems
  2021-05-06 18:24 [PATCH] nvme: fix for big endian systems David Lamparter
  2021-05-18 11:09 ` David Lamparter
@ 2021-06-19 14:15 ` Bin Meng
  2021-06-23  7:22   ` Bin Meng
  1 sibling, 1 reply; 6+ messages in thread
From: Bin Meng @ 2021-06-19 14:15 UTC (permalink / raw)
  To: David Lamparter; +Cc: U-Boot Mailing List

On Sat, May 8, 2021 at 12:49 AM David Lamparter <equinox@diac24.net> wrote:
>
> writel() and co. already include the endian swap;  doing the swap twice
> is, er, unhelpful.
>
> Tested on a P4080DS, which boots perfectly fine off NVMe with this.
>
> Signed-off-by: David Lamparter <equinox@diac24.net>
> ---
>  drivers/nvme/nvme.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] nvme: fix for big endian systems
  2021-06-19 14:10   ` David Lamparter
@ 2021-06-19 14:16     ` Bin Meng
  0 siblings, 0 replies; 6+ messages in thread
From: Bin Meng @ 2021-06-19 14:16 UTC (permalink / raw)
  To: David Lamparter, Tom Rini; +Cc: U-Boot Mailing List

On Sat, Jun 19, 2021 at 10:10 PM David Lamparter <equinox@diac24.net> wrote:
>
> On Tue, May 18, 2021 at 01:09:17PM +0200, David Lamparter wrote:
> > On Thu, May 06, 2021 at 08:24:30PM +0200, David Lamparter wrote:
> > > writel() and co. already include the endian swap;  doing the swap twice
> > > is, er, unhelpful.
> > >
> > > Tested on a P4080DS, which boots perfectly fine off NVMe with this.
> >
> > is there anything to be done on my end to get this merged?  The
> > MAINTAINERS file has no entry for drivers/nvme/ so I'm not quite sure
> > who to ping on this...
>
> Ping - could someone review and/or merge this?
>

I guess you can use "git blame" to see who's contributed on a file and
get them cc'ed :)

Anyway, I have reviewed this patch, and Tom could pick this up soon.

Regards,
Bin

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] nvme: fix for big endian systems
  2021-06-19 14:15 ` Bin Meng
@ 2021-06-23  7:22   ` Bin Meng
  0 siblings, 0 replies; 6+ messages in thread
From: Bin Meng @ 2021-06-23  7:22 UTC (permalink / raw)
  To: David Lamparter; +Cc: U-Boot Mailing List

On Sat, Jun 19, 2021 at 10:15 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> On Sat, May 8, 2021 at 12:49 AM David Lamparter <equinox@diac24.net> wrote:
> >
> > writel() and co. already include the endian swap;  doing the swap twice
> > is, er, unhelpful.
> >
> > Tested on a P4080DS, which boots perfectly fine off NVMe with this.
> >
> > Signed-off-by: David Lamparter <equinox@diac24.net>
> > ---
> >  drivers/nvme/nvme.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

applied to u-boot-x86, thanks!

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-23  7:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-06 18:24 [PATCH] nvme: fix for big endian systems David Lamparter
2021-05-18 11:09 ` David Lamparter
2021-06-19 14:10   ` David Lamparter
2021-06-19 14:16     ` Bin Meng
2021-06-19 14:15 ` Bin Meng
2021-06-23  7:22   ` Bin Meng

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.