Skip to contentSkip to conversation

nvme: fix for big endian systems

PATCH In review David Lamparter 2 participants 6 messages May 6, 2021 – Jun 23, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: fix for big endian systems

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.

---
 drivers/nvme/nvme.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/nvme/nvme.c +4 -4
index c61dab20c5f0..d554ec54cbe0 100644
@@ -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);
 }
Signature · 1 line
2.26.3
#1 lore raw

PATCH 1/1 nvme: fix for big endian systems

Hi all,

Quoted 4 lines · David Lamparter

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

Quoted 40 lines
drivers/nvme/nvme.c +4 -4
index c61dab20c5f0..d554ec54cbe0 100644
@@ -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 lore raw
Quoted 9 lines · David Lamparter
Quoted 4 lines · David Lamparter

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

Quoted 40 lines
Quoted 40 lines
drivers/nvme/nvme.c +4 -4
index c61dab20c5f0..d554ec54cbe0 100644
@@ -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);
 }
#3 lore raw
Quoted 6 lines · David Lamparter
Quoted 4 lines · David Lamparter
Quoted 3 lines · David Lamparter

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

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

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

#5 lore raw
Quoted 8 lines · Bin Meng
Quoted 6 lines · David Lamparter

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.

Quoted 7 lines
Quoted 5 lines
---
 drivers/nvme/nvme.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

applied to u-boot-x86, thanks!