[PATCH v1 0/4]
Subsystems (2)
cover [PATCH v1 0/4]
usb: xhci: Prepare xHCI driver for MIPS Octeon big-endian support
These patches fix a few issues, found while porting the xHCI to the MIPS Octeon platforms. The basic issues here are:
- Endianess issues: missing cpu_to_leXX() & leXX_to_cpu() conversions
- Use physical (DMA) address for the xHCI DMA controller
These patches are the groundwork for the upcoming xHCI Octeon support that will follow soon.
Thanks,
Stefan
Stefan Roese (4):
usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
usb: xhci: xhci_mem_init: Use cpu_to_le64() and not xhci_writeq()
usb: usb-uclass.c: Drop le16_to_cpu() as values are already swapped
usb: xhci: Add virt_to_phys() to support mapped platforms
drivers/usb/host/usb-uclass.c | 8 ++++---- drivers/usb/host/xhci-mem.c | 30 +++++++++++++++--------------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 4 files changed, 24 insertions(+), 25 deletions(-)
Signature · 1 line
2.27.0
PATCH 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
---
drivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-mem.c +5 -4
@@ -110,7 +110,7 @@ static void xhci_scratchpad_free(struct xhci_ctrl *ctrl) ctrl->dcbaa->dev_context_ptrs[0 ] =0 ; -free ((void *)(uintptr_t )ctrl->scratchpad->sp_array[0 ]); +free ((void *)le64_to_cpu (ctrl->scratchpad->sp_array[0 ]));free (ctrl->scratchpad->sp_array);free (ctrl->scratchpad); ctrl->scratchpad =NULL ;
@@ -225,7 +225,8 @@ static void xhci_link_segments(struct xhci_segment *prev, prev->next = next;if (link_trbs) { val_64 = (uintptr_t )next->trbs; - prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = val_64; + prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = +cpu_to_le64 (val_64);/* * Set the last TRB in the segment to
@@ -486,7 +487,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id) byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ - ctrl->dcbaa->dev_context_ptrs[slot_id] = byte_64; + ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);xhci_flush_cache ((uintptr_t )&ctrl->dcbaa->dev_context_ptrs[slot_id],sizeof (__le64));
@@ -768,7 +769,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,debug ("route string %x\n" , route);#endif - slot_ctx->dev_info |= route; + slot_ctx->dev_info |=cpu_to_le32 (route);switch (speed) {case USB_SPEED_SUPER :
Signature · 1 line
2.27.0
PATCH 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
Hi Bin,
Quoted 4 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Did you find the time to review this patchset with endianess corrections and support for physical vs virtual addresses? Its in preparation for the Octeon (MIPS big endian) xHCI support.
I would like to have this common xhci parts integrated in mainline early in this release (if there are no issues of course), so that these changes can get a broad testing on multiple platforms.
Thanks,
Stefan
Quoted 42 lines
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/usb/host/xhci-mem.c +4
-3@@ -110,7 +110,7 @@ static void xhci_scratchpad_free(struct xhci_ctrl *ctrl) ctrl->dcbaa->dev_context_ptrs[0 ] =0 ; -free ((void *)(uintptr_t )ctrl->scratchpad->sp_array[0 ]); +free ((void *)le64_to_cpu (ctrl->scratchpad->sp_array[0 ]));free (ctrl->scratchpad->sp_array);free (ctrl->scratchpad); ctrl->scratchpad =NULL ;@@ -225,7 +225,8 @@ static void xhci_link_segments(struct xhci_segment *prev, prev->next = next;if (link_trbs) { val_64 = (uintptr_t )next->trbs; - prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = val_64; + prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = +cpu_to_le64 (val_64);/* * Set the last TRB in the segment to @@ -486,7 +487,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id) byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ - ctrl->dcbaa->dev_context_ptrs[slot_id] = byte_64; + ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);xhci_flush_cache ((uintptr_t )&ctrl->dcbaa->dev_context_ptrs[slot_id],sizeof (__le64));
drivers/usb/host/xhci-mem.c void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl, · line 775
Quoted 8 lines
drivers/usb/host/xhci-mem.c +1
-1@@ -768,7 +769,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,debug ("route string %x\n" , route);#endif - slot_ctx->dev_info |= route; + slot_ctx->dev_info |=cpu_to_le32 (route);switch (speed) {case USB_SPEED_SUPER :
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
Hi Stefan,
Quoted 4 lines · Stefan Roese
Hi Bin,
On 02.07.20 10:47, Stefan Roese wrote:
Quoted 8 lines
Quoted 4 lines
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Did you find the time to review this patchset with endianess corrections and support for physical vs virtual addresses? Its in preparation for the Octeon (MIPS big endian) xHCI support.
Sorry I missed this series. I will take a look.
Quoted 4 lines
I would like to have this common xhci parts integrated in mainline early in this release (if there are no issues of course), so that these changes can get a broad testing on multiple platforms.
Regards,
Bin
PATCH 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
In reply to Stefan RoeseQuoted 6 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Quoted 8 lines
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
Good catch! It's hard to detect these problems if we only validate xHCI on ARM/x86 which are little-endian. Apparently there is no xHCI on PPC, so MIPS becomes the first big endian platform using xHCI.
PATCH 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
Quoted 12 lines · Bin Meng
Quoted 11 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
Quoted 7 lines
Quoted 3 lines
drivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)Good catch! It's hard to detect these problems if we only validate xHCI on ARM/x86 which are little-endian. Apparently there is no xHCI on PPC, so MIPS becomes the first big endian platform using xHCI.
Yes, I was also astonished that the xHCI driver has only been used by little-endian platforms so far. I did expect that at least some PPC platforms supported this code. Apparently this is not the case.
Quoted 1 line
Reviewed-by Bin Meng <[email protected]>
Thanks,
Stefan
PATCH 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
In reply to Stefan RoeseHi Stefan,
Quoted 19 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/usb/host/xhci-mem.c +0
-0
drivers/usb/host/xhci-mem.c static void xhci_scratchpad_free(struct xhci_ctrl *ctrl) · line 113
Quoted 5 lines
drivers/usb/host/xhci-mem.c +1
-1@@ -110,7 +110,7 @@ static void xhci_scratchpad_free(struct xhci_ctrl *ctrl) ctrl->dcbaa->dev_context_ptrs[0 ] =0 ; -free ((void *)(uintptr_t )ctrl->scratchpad->sp_array[0 ]); +free ((void *)le64_to_cpu (ctrl->scratchpad->sp_array[0 ]));
There is a build warning for this:
drivers/usb/host/xhci-mem.c: In function 'xhci_scratchpad_free':drivers/usb/host/xhci-mem.c:113:7: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
free((void *)le64_to_cpu(ctrl->scratchpad->sp_array[0]));
^Quoted 23 lines
drivers/usb/host/xhci-mem.c +3
-2free (ctrl->scratchpad->sp_array);free (ctrl->scratchpad); ctrl->scratchpad =NULL ;@@ -225,7 +225,8 @@ static void xhci_link_segments(struct xhci_segment *prev, prev->next = next;if (link_trbs) { val_64 = (uintptr_t )next->trbs; - prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = val_64; + prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = +cpu_to_le64 (val_64);/* * Set the last TRB in the segment to @@ -486,7 +487,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id) byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ - ctrl->dcbaa->dev_context_ptrs[slot_id] = byte_64; + ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);xhci_flush_cache ((uintptr_t )&ctrl->dcbaa->dev_context_ptrs[slot_id],sizeof (__le64));
drivers/usb/host/xhci-mem.c void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,
Quoted 9 lines
drivers/usb/host/xhci-mem.c +1
-2@@ -768,7 +769,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,debug ("route string %x\n" , route);#endif - slot_ctx->dev_info |= route; + slot_ctx->dev_info |=cpu_to_le32 (route);switch (speed) {case USB_SPEED_SUPER : --
Test results on Minnowmax which has one USB 2.0 port and one 3.0 port:
USB 2.0 flash drive inserted to USB 2.0 port: recognized, read/write OK USB 2.0 flash drive inserted to USB 3.0 port: recognized, read/write OK
USB 3.0 flash drive inserted to USB 2.0 port: recognized, read/write OK USB 3.0 flash drive inserted to USB 3.0 port: recognized, read/write OK
USB 2.0 flash drive connected to a USB 3.0 HUB inserted to USB 2.0
port: recognized, read/write OK
USB 2.0 flash drive connected to a USB 3.0 HUB inserted to USB 3.0
port: recognized, read/write OK
USB 3.0 flash drive connected to a USB 3.0 HUB inserted to USB 2.0
port: recognized, read/write OK
USB 3.0 flash drive connected to a USB 3.0 HUB inserted to USB 3.0
port: recognized, read/write OK
Regards,
Bin
PATCH 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
Hi Bin,
Quoted 30 lines · Bin Meng
Hi Stefan,
Quoted 19 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/usb/host/xhci-mem.c +0
-0drivers/usb/host/xhci-mem.c static void xhci_scratchpad_free(struct xhci_ctrl *ctrl) · line 113
Quoted 5 lines
drivers/usb/host/xhci-mem.c +1
-1@@ -110,7 +110,7 @@ static void xhci_scratchpad_free(struct xhci_ctrl *ctrl) ctrl->dcbaa->dev_context_ptrs[0 ] =0 ; -free ((void *)(uintptr_t )ctrl->scratchpad->sp_array[0 ]); +free ((void *)le64_to_cpu (ctrl->scratchpad->sp_array[0 ]));There is a build warning for this:
Quoted 5 lines
drivers/usb/host/xhci-mem.c: In function 'xhci_scratchpad_free':drivers/usb/host/xhci-mem.c:113:7: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]free((void *)le64_to_cpu(ctrl->scratchpad->sp_array[0])); ^
So we need the (uintptr_t) here as well?
free((void *)(uintptr_t)le64_to_cpu(ctrl->scratchpad->sp_array[0]));
Should I send v2 for this patch?
Quoted 46 lines
Quoted 23 lines
drivers/usb/host/xhci-mem.c +3
-2free (ctrl->scratchpad->sp_array);free (ctrl->scratchpad); ctrl->scratchpad =NULL ;@@ -225,7 +225,8 @@ static void xhci_link_segments(struct xhci_segment *prev, prev->next = next;if (link_trbs) { val_64 = (uintptr_t )next->trbs; - prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = val_64; + prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = +cpu_to_le64 (val_64);/* * Set the last TRB in the segment to @@ -486,7 +487,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id) byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ - ctrl->dcbaa->dev_context_ptrs[slot_id] = byte_64; + ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);xhci_flush_cache ((uintptr_t )&ctrl->dcbaa->dev_context_ptrs[slot_id],sizeof (__le64));drivers/usb/host/xhci-mem.c void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,
Quoted 9 lines
drivers/usb/host/xhci-mem.c +1
-2@@ -768,7 +769,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,debug ("route string %x\n" , route);#endif - slot_ctx->dev_info |= route; + slot_ctx->dev_info |=cpu_to_le32 (route);switch (speed) {case USB_SPEED_SUPER : --Test results on Minnowmax which has one USB 2.0 port and one 3.0 port:
USB 2.0 flash drive inserted to USB 2.0 port: recognized, read/write OK USB 2.0 flash drive inserted to USB 3.0 port: recognized, read/write OK
USB 3.0 flash drive inserted to USB 2.0 port: recognized, read/write OK USB 3.0 flash drive inserted to USB 3.0 port: recognized, read/write OK
USB 2.0 flash drive connected to a USB 3.0 HUB inserted to USB 2.0
port: recognized, read/write OK
USB 2.0 flash drive connected to a USB 3.0 HUB inserted to USB 3.0
port: recognized, read/write OK
Quoted 6 lines
USB 3.0 flash drive connected to a USB 3.0 HUB inserted to USB 2.0
port: recognized, read/write OK
USB 3.0 flash drive connected to a USB 3.0 HUB inserted to USB 3.0
port: recognized, read/write OKTested-by Bin Meng <[email protected]>
Very good. :)
Thanks,
Stefan
PATCH 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
Hi Stefan,
Quoted 40 lines · Stefan Roese
Hi Bin,
Quoted 30 lines · Bin Meng
Hi Stefan,
Quoted 19 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/usb/host/xhci-mem.c +0
-0drivers/usb/host/xhci-mem.c static void xhci_scratchpad_free(struct xhci_ctrl *ctrl) · line 113
Quoted 5 lines
drivers/usb/host/xhci-mem.c +1
-1@@ -110,7 +110,7 @@ static void xhci_scratchpad_free(struct xhci_ctrl *ctrl) ctrl->dcbaa->dev_context_ptrs[0 ] =0 ; -free ((void *)(uintptr_t )ctrl->scratchpad->sp_array[0 ]); +free ((void *)le64_to_cpu (ctrl->scratchpad->sp_array[0 ]));There is a build warning for this:
Quoted 5 lines
drivers/usb/host/xhci-mem.c: In function 'xhci_scratchpad_free':drivers/usb/host/xhci-mem.c:113:7: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]free((void *)le64_to_cpu(ctrl->scratchpad->sp_array[0])); ^
Quoted 3 lines
So we need the (
uintptr_t) here as well?free((void *)(uintptr_t)le64_to_cpu(ctrl->scratchpad->sp_array[0]));
I think so.
Quoted 2 lines
Should I send v2 for this patch?
Yes, please.
Quoted 47 lines
Quoted 47 lines
Quoted 24 lines
drivers/usb/host/xhci-mem.c +3
-2free (ctrl->scratchpad->sp_array);free (ctrl->scratchpad); ctrl->scratchpad =NULL ;@@ -225,7 +225,8 @@ static void xhci_link_segments(struct xhci_segment *prev, prev->next = next;if (link_trbs) { val_64 = (uintptr_t )next->trbs; - prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = val_64; + prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = +cpu_to_le64 (val_64);/* * Set the last TRB in the segment to @@ -486,7 +487,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id) byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ - ctrl->dcbaa->dev_context_ptrs[slot_id] = byte_64; + ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);xhci_flush_cache ((uintptr_t )&ctrl->dcbaa->dev_context_ptrs[slot_id],sizeof (__le64));drivers/usb/host/xhci-mem.c void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,
Quoted 9 lines
drivers/usb/host/xhci-mem.c +1
-2@@ -768,7 +769,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,debug ("route string %x\n" , route);#endif - slot_ctx->dev_info |= route; + slot_ctx->dev_info |=cpu_to_le32 (route);switch (speed) {case USB_SPEED_SUPER : --Test results on Minnowmax which has one USB 2.0 port and one 3.0 port:
USB 2.0 flash drive inserted to USB 2.0 port: recognized, read/write OK USB 2.0 flash drive inserted to USB 3.0 port: recognized, read/write OK
USB 3.0 flash drive inserted to USB 2.0 port: recognized, read/write OK USB 3.0 flash drive inserted to USB 3.0 port: recognized, read/write OK
USB 2.0 flash drive connected to a USB 3.0 HUB inserted to USB 2.0
port: recognized, read/write OK
USB 2.0 flash drive connected to a USB 3.0 HUB inserted to USB 3.0
port: recognized, read/write OK
Quoted 8 lines
Quoted 6 lines
USB 3.0 flash drive connected to a USB 3.0 HUB inserted to USB 2.0
port: recognized, read/write OK
USB 3.0 flash drive connected to a USB 3.0 HUB inserted to USB 3.0
port: recognized, read/write OKTested-by Bin Meng <[email protected]>Very good. :)
Regards,
Bin
PATCH v2 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
---
v2:
- Add missing (uintptr_t) cast to remove compile time warning
drivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-mem.c +5 -4
@@ -110,7 +110,7 @@ static void xhci_scratchpad_free(struct xhci_ctrl *ctrl) ctrl->dcbaa->dev_context_ptrs[0 ] =0 ; -free ((void *)(uintptr_t )ctrl->scratchpad->sp_array[0 ]); +free ((void *)(uintptr_t )le64_to_cpu (ctrl->scratchpad->sp_array[0 ]));free (ctrl->scratchpad->sp_array);free (ctrl->scratchpad); ctrl->scratchpad =NULL ;
@@ -225,7 +225,8 @@ static void xhci_link_segments(struct xhci_segment *prev, prev->next = next;if (link_trbs) { val_64 = (uintptr_t )next->trbs; - prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = val_64; + prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr = +cpu_to_le64 (val_64);/* * Set the last TRB in the segment to
@@ -486,7 +487,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id) byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ - ctrl->dcbaa->dev_context_ptrs[slot_id] = byte_64; + ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);xhci_flush_cache ((uintptr_t )&ctrl->dcbaa->dev_context_ptrs[slot_id],sizeof (__le64));
@@ -768,7 +769,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,debug ("route string %x\n" , route);#endif - slot_ctx->dev_info |= route; + slot_ctx->dev_info |=cpu_to_le32 (route);switch (speed) {case USB_SPEED_SUPER :
Signature · 1 line
2.27.0
PATCH v2 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
Hi Stefan,
Quoted 10 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Signed-off-by Stefan Roese <[email protected]>Reviewed-by Bin Meng <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>
Quoted 6 lines
---
v2:
- Add missing (uintptr_t) cast to remove compile time warningdrivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
Only this patch is sent as v2?
Regards,
Bin
PATCH v2 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
Hi Bin,
Quoted 17 lines · Bin Meng
Hi Stefan,
Quoted 14 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Signed-off-by Stefan Roese <[email protected]>Reviewed-by Bin Meng <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
v2:
- Add missing (uintptr_t) cast to remove compile time warning
Quoted 6 lines
Quoted 2 lines
drivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)Tested-by Bin Meng <[email protected]>Only this patch is sent as v2?
Yes. I didn't want to pollute the list with unneeded patches. If you prefer a complete patchset in the new version, then I can of course do as as well.
Thanks,
Stefan
PATCH v2 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
Hi Stefan,
Quoted 24 lines · Stefan Roese
Hi Bin,
Quoted 20 lines · Bin Meng
Hi Stefan,
Quoted 16 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Signed-off-by Stefan Roese <[email protected]>Reviewed-by Bin Meng <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
v2:
- Add missing (uintptr_t) cast to remove compile time warningdrivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
Quoted 7 lines
Quoted 3 lines
Tested-by Bin Meng <[email protected]>Only this patch is sent as v2?
Yes. I didn't want to pollute the list with unneeded patches. If you prefer a complete patchset in the new version, then I can of course do as as well.
IMHO it would be good for maintainers to apply this whole series from patchwork in a batch if we send the complete series.
Regards,
Bin
PATCH v2 1/4 usb: xhci: Add missing endian conversions (cpu_to_leXX / leXX_to_cpu)
Hi Bin,
Quoted 29 lines · Bin Meng
Hi Stefan,
Quoted 26 lines · Stefan Roese
Hi Bin,
Quoted 22 lines · Bin Meng
Hi Stefan,
Quoted 10 lines · Stefan Roese
While trying to use the U-Boot xHCI driver on the MIPS Octeon platform, which is big endian, I noticed that the driver is missing a few endian conversion calls. This patch adds these missing endian conversion calls.
Signed-off-by Stefan Roese <[email protected]>Reviewed-by Bin Meng <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>Quoted 6 lines
---
v2:
- Add missing (uintptr_t) cast to remove compile time warningdrivers/usb/host/xhci-mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)Tested-by Bin Meng <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Only this patch is sent as v2?
Yes. I didn't want to pollute the list with unneeded patches. If you prefer a complete patchset in the new version, then I can of course do as as well.
IMHO it would be good for maintainers to apply this whole series from patchwork in a batch if we send the complete series.
No problem. v2 series will be out shortly.
Thanks,
Stefan
PATCH 2/4 usb: xhci: xhci_mem_init: Use cpu_to_le64() and not xhci_writeq()
In reply to Stefan Roesexhci_writeq() makes the CPU->LE swapping only when addressing registers in the xHCI controller address range and not in the local memory (RAM). We need to use cpu_to_le64() here to ensure that the conversion is done correctly.
---
drivers/usb/host/xhci-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-mem.c +1 -1
@@ -562,7 +562,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, trb_64 =0 ; trb_64 = (uintptr_t )seg->trbs;struct xhci_erst_entry *entry = &ctrl->erst.entries[val]; -xhci_writeq (&entry->seg_addr, trb_64); + entry->seg_addr =cpu_to_le64 (trb_64); entry->seg_size =cpu_to_le32 (TRBS_PER_SEGMENT ); entry->rsvd =0 ; seg = seg->next;
Signature · 1 line
2.27.0
PATCH 2/4 usb: xhci: xhci_mem_init: Use cpu_to_le64() and not xhci_writeq()
Hi Stefan,
Quoted 3 lines · Stefan Roese
xhci_writeq()makes theCPU->LEswapping only when addressing registers in the xHCI controller address range and not in the local memory (RAM).
Is the above behavior exposed by the MIPS platform's writel()?
Quoted 16 lines
We need to use
cpu_to_le64()here to ensure that the conversion is done correctly.Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/host/xhci-mem.c +0
-0
drivers/usb/host/xhci-mem.c int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, · line 568
Quoted 8 lines
drivers/usb/host/xhci-mem.c +1
-1@@ -562,7 +562,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, trb_64 =0 ; trb_64 = (uintptr_t )seg->trbs;struct xhci_erst_entry *entry = &ctrl->erst.entries[val]; -xhci_writeq (&entry->seg_addr, trb_64); + entry->seg_addr =cpu_to_le64 (trb_64); entry->seg_size =cpu_to_le32 (TRBS_PER_SEGMENT ); entry->rsvd =0 ; seg = seg->next;
Regards,
Bin
PATCH 2/4 usb: xhci: xhci_mem_init: Use cpu_to_le64() and not xhci_writeq()
Quoted 8 lines · Bin Meng
Hi Stefan,
Quoted 3 lines · Stefan Roese
xhci_writeq()makes theCPU->LEswapping only when addressing registers in the xHCI controller address range and not in the local memory (RAM).Is the above behavior exposed by the MIPS platform's
writel()?
Not sure what you mean with this. Without this patch, xhci_writeq() will not swap on Octeon MIPS, as the destination address is located in local memory (DDR). Using the xhci_read/write accessor functions should be restricted to accessing the controller registers.
BTW: The Octeon MIPS writel will swap to little-endian, when the location is in the xHCI controller address space (and PCI etc). This support for selective swapping is not pushed into mainline yet. I will send it in some follow up patches.
Thanks,
Stefan
Quoted 27 lines
Quoted 16 lines
We need to use
cpu_to_le64()here to ensure that the conversion is done correctly.Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/host/xhci-mem.c +0
-0drivers/usb/host/xhci-mem.c int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, · line 568
Quoted 8 lines
drivers/usb/host/xhci-mem.c +1
-1@@ -562,7 +562,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, trb_64 =0 ; trb_64 = (uintptr_t )seg->trbs;struct xhci_erst_entry *entry = &ctrl->erst.entries[val]; -xhci_writeq (&entry->seg_addr, trb_64); + entry->seg_addr =cpu_to_le64 (trb_64); entry->seg_size =cpu_to_le32 (TRBS_PER_SEGMENT ); entry->rsvd =0 ; seg = seg->next;Reviewed-by Bin Meng <[email protected]>
Quoted 3 lines
Regards,
Bin
Thanks,
Stefan
PATCH 2/4 usb: xhci: xhci_mem_init: Use cpu_to_le64() and not xhci_writeq()
Hi Stefan,
Quoted 6 lines · Stefan Roese
Quoted 4 lines · Bin Meng
Hi Stefan,
Quoted 1 line · Stefan Roese
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
xhci_writeq()makes theCPU->LEswapping only when addressing registers in the xHCI controller address range and not in the local memory (RAM).Is the above behavior exposed by the MIPS platform's
writel()?Not sure what you mean with this. Without this patch,
xhci_writeq()will not swap on Octeon MIPS, as the destination address is located in local memory (DDR).
I wonder why xhci_writeq() does not swap? Is this due to the writel() implementation on Octeon MIPS?
Quoted 2 lines
Using the xhci_read/write accessor functions should be restricted to accessing the controller registers.
Yes, this is the supposed usage that xhci_read/write should be called to operate on xHCI registers. However my question was why xhci_read/write does not swap even it is called on memory space, hence the writel() question.
Quoted 6 lines
BTW: The Octeon MIPS writel will swap to little-endian, when the location is in the xHCI controller address space (and PCI etc). This support for selective swapping is not pushed into mainline yet. I will send it in some follow up patches.
Regards,
Bin
PATCH 2/4 usb: xhci: xhci_mem_init: Use cpu_to_le64() and not xhci_writeq()
Hi Bin,
Quoted 12 lines · Bin Meng
Hi Stefan,
Quoted 9 lines · Stefan Roese
Quoted 7 lines · Bin Meng
Hi Stefan,
Quoted 3 lines · Stefan Roese
xhci_writeq()makes theCPU->LEswapping only when addressing registers in the xHCI controller address range and not in the local memory (RAM).
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Is the above behavior exposed by the MIPS platform's
writel()?Not sure what you mean with this. Without this patch,
xhci_writeq()will not swap on Octeon MIPS, as the destination address is located in local memory (DDR).I wonder why
xhci_writeq()does not swap? Is this due to thewritel()implementation on Octeon MIPS?
Ah, okay. Please see my comment below for this. Here again:
BTW: The Octeon MIPS writel will swap to little-endian, when the location is in the xHCI controller address space (and PCI etc). This support for selective swapping is not pushed into mainline yet. I will send it in some follow up patches.
So to answer your question: writel will not swap when addressing local memory.
Quoted 9 lines
Quoted 2 lines
Using the xhci_read/write accessor functions should be restricted to accessing the controller registers.
Yes, this is the supposed usage that xhci_read/write should be called to operate on xHCI registers. However my question was why xhci_read/write does not swap even it is called on memory space, hence the
writel()question.Quoted 1 line
Quoted 9 lines
Quoted 5 lines
BTW: The Octeon MIPS writel will swap to little-endian, when the location is in the xHCI controller address space (and PCI etc). This support for selective swapping is not pushed into mainline yet. I will send it in some follow up patches.
Regards,
Bin
Thanks,
Stefan
PATCH 2/4 usb: xhci: xhci_mem_init: Use cpu_to_le64() and not xhci_writeq()
Hi Stefan,
Quoted 27 lines · Stefan Roese
Hi Bin,
Quoted 12 lines · Bin Meng
Hi Stefan,
Quoted 9 lines · Stefan Roese
Quoted 7 lines · Bin Meng
Hi Stefan,
Quoted 3 lines · Stefan Roese
xhci_writeq()makes theCPU->LEswapping only when addressing registers in the xHCI controller address range and not in the local memory (RAM).Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Is the above behavior exposed by the MIPS platform's
writel()?Not sure what you mean with this. Without this patch,
xhci_writeq()will not swap on Octeon MIPS, as the destination address is located in local memory (DDR).I wonder why
xhci_writeq()does not swap? Is this due to thewritel()implementation on Octeon MIPS?Ah, okay. Please see my comment below for this. Here again:
Quoted 7 lines
BTW: The Octeon MIPS writel will swap to little-endian, when the location is in the xHCI controller address space (and PCI etc). This support for selective swapping is not pushed into mainline yet. I will send it in some follow up patches.
So to answer your question: writel will not swap when addressing local memory.
Thanks. That explains.
Quoted 9 lines
Quoted 9 lines
Quoted 3 lines
Using the xhci_read/write accessor functions should be restricted to accessing the controller registers.
Yes, this is the supposed usage that xhci_read/write should be called to operate on xHCI registers. However my question was why xhci_read/write does not swap even it is called on memory space, hence the
writel()question.
Regards,
Bin
PATCH 2/4 usb: xhci: xhci_mem_init: Use cpu_to_le64() and not xhci_writeq()
In reply to Stefan RoeseQuoted 6 lines · Stefan Roese
xhci_writeq()makes theCPU->LEswapping only when addressing registers in the xHCI controller address range and not in the local memory (RAM). We need to usecpu_to_le64()here to ensure that the conversion is done correctly.
Quoted 8 lines
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 3/4 usb: usb-uclass.c: Drop le16_to_cpu() as values are already swapped
In reply to Stefan RoeseThese values are already swapped to CPU endianess, so swapping them again is a bug. Let's remove the swap here instead.
---
drivers/usb/host/usb-uclass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/host/usb-uclass.c +4 -4
@@ -416,21 +416,21 @@ static int usb_match_device(const struct usb_device_descriptor *desc, const struct usb_device_id *id) {if ((id->match_flags &USB_DEVICE_ID_MATCH_VENDOR ) && - id->idVendor !=le16_to_cpu (desc->idVendor)) + id->idVendor != desc->idVendor)return 0 ;if ((id->match_flags &USB_DEVICE_ID_MATCH_PRODUCT ) && - id->idProduct !=le16_to_cpu (desc->idProduct)) + id->idProduct != desc->idProduct)return 0 ;/* No need to test id->bcdDevice_lo != 0, since 0 is never greater than any unsigned number. */ if ((id->match_flags &USB_DEVICE_ID_MATCH_DEV_LO ) && - (id->bcdDevice_lo >le16_to_cpu (desc->bcdDevice))) + (id->bcdDevice_lo > desc->bcdDevice))return 0 ;if ((id->match_flags &USB_DEVICE_ID_MATCH_DEV_HI ) && - (id->bcdDevice_hi <le16_to_cpu (desc->bcdDevice))) + (id->bcdDevice_hi < desc->bcdDevice))return 0 ; if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_CLASS) &&
Signature · 1 line
2.27.0
PATCH 3/4 usb: usb-uclass.c: Drop le16_to_cpu() as values are already swapped
Hi Stefan,
Quoted 2 lines · Stefan Roese
These values are already swapped to CPU endianess, so swapping them
Can you please add more details as to when these values are swapped? I assume this is inside usb_select_config() which is called before this function is called?
But I wonder how this code ever worked on ARM/x86?
Quoted 30 lines
again is a bug. Let's remove the swap here instead.
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/usb-uclass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/usb/host/usb-uclass.c +2
-2@@ -416,21 +416,21 @@ static int usb_match_device(const struct usb_device_descriptor *desc, const struct usb_device_id *id) {if ((id->match_flags &USB_DEVICE_ID_MATCH_VENDOR ) && - id->idVendor !=le16_to_cpu (desc->idVendor)) + id->idVendor != desc->idVendor)return 0 ;if ((id->match_flags &USB_DEVICE_ID_MATCH_PRODUCT ) && - id->idProduct !=le16_to_cpu (desc->idProduct)) + id->idProduct != desc->idProduct)return 0 ;/* No need to test id->bcdDevice_lo != 0, since 0 is never greater than any unsigned number. */ if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_LO) &&
drivers/usb/host/usb-uclass.c static int usb_match_device(const struct usb_device_descriptor *desc, · line 436
Quoted 10 lines
drivers/usb/host/usb-uclass.c +2
-2- (id->bcdDevice_lo > le16_to_cpu(desc->bcdDevice))) + (id->bcdDevice_lo > desc->bcdDevice))return 0 ;if ((id->match_flags &USB_DEVICE_ID_MATCH_DEV_HI ) && - (id->bcdDevice_hi <le16_to_cpu (desc->bcdDevice))) + (id->bcdDevice_hi < desc->bcdDevice))return 0 ; if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_CLASS) &&
Regards,
Bin
PATCH 3/4 usb: usb-uclass.c: Drop le16_to_cpu() as values are already swapped
Quoted 9 lines · Bin Meng
Hi Stefan,
Quoted 2 lines · Stefan Roese
These values are already swapped to CPU endianess, so swapping them
Can you please add more details as to when these values are swapped? I assume this is inside
usb_select_config()which is called before this function is called?
Yes. Its swapped exactly here:
int usb_select_config(struct usb_device *dev)
{
unsigned char *tmpbuf = NULL;
int err;
err = get_descriptor_len(dev, USB_DT_DEVICE_SIZE, USB_DT_DEVICE_SIZE);
if (err)
return err;
/* correct le values */
le16_to_cpus(&dev->descriptor.bcdUSB);
le16_to_cpus(&dev->descriptor.idVendor);
le16_to_cpus(&dev->descriptor.idProduct);
le16_to_cpus(&dev->descriptor.bcdDevice);Quoted 1 line
But I wonder how this code ever worked on ARM/x86?
On ARM/x86, the little-endian swapping is a no-op. So it doesn't matter if you swap once or twice or... ;)
Quoted 39 lines
Quoted 39 lines
again is a bug. Let's remove the swap here instead.
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/usb-uclass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/usb/host/usb-uclass.c +4
-4@@ -416,21 +416,21 @@ static int usb_match_device(const struct usb_device_descriptor *desc, const struct usb_device_id *id) {if ((id->match_flags &USB_DEVICE_ID_MATCH_VENDOR ) && - id->idVendor !=le16_to_cpu (desc->idVendor)) + id->idVendor != desc->idVendor)return 0 ;if ((id->match_flags &USB_DEVICE_ID_MATCH_PRODUCT ) && - id->idProduct !=le16_to_cpu (desc->idProduct)) + id->idProduct != desc->idProduct)return 0 ;/* No need to test id->bcdDevice_lo != 0, since 0 is never greater than any unsigned number. */ if ((id->match_flags &USB_DEVICE_ID_MATCH_DEV_LO ) && - (id->bcdDevice_lo >le16_to_cpu (desc->bcdDevice))) + (id->bcdDevice_lo > desc->bcdDevice))return 0 ;if ((id->match_flags &USB_DEVICE_ID_MATCH_DEV_HI ) && - (id->bcdDevice_hi <le16_to_cpu (desc->bcdDevice))) + (id->bcdDevice_hi < desc->bcdDevice))return 0 ;
Quoted 6 lines
drivers/usb/host/usb-uclass.c static int usb_match_device(const struct usb_device_descriptor *desc, · line 436
Quoted 1 line
drivers/usb/host/usb-uclass.c +0
-0if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_CLASS) &&Reviewed-by Bin Meng <[email protected]>Regards,
Bin
Thanks,
Stefan
PATCH 3/4 usb: usb-uclass.c: Drop le16_to_cpu() as values are already swapped
Hi Stefan,
Quoted 29 lines · Stefan Roese
Quoted 9 lines · Bin Meng
Hi Stefan,
Quoted 2 lines · Stefan Roese
These values are already swapped to CPU endianess, so swapping them
Can you please add more details as to when these values are swapped? I assume this is inside
usb_select_config()which is called before this function is called?Yes. Its swapped exactly here:
int
usb_select_config(struct usb_device *dev){ unsigned char *tmpbuf = NULL; int err; err = get_descriptor_len(dev, USB_DT_DEVICE_SIZE, USB_DT_DEVICE_SIZE); if (err) return err; /* correct le values */ le16_to_cpus(&dev->descriptor.bcdUSB); le16_to_cpus(&dev->descriptor.idVendor); le16_to_cpus(&dev->descriptor.idProduct); le16_to_cpus(&dev->descriptor.bcdDevice);
Quoted 5 lines
Quoted 1 line
But I wonder how this code ever worked on ARM/x86?
On ARM/x86, the little-endian swapping is a no-op. So it doesn't matter if you swap once or twice or... ;)
Ah, yes! I misread this as an unconditional swap ...
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
again is a bug. Let's remove the swap here instead.
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/usb-uclass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Regards,
Bin
PATCH 3/4 usb: usb-uclass.c: Drop le16_to_cpu() as values are already swapped
In reply to Stefan RoeseQuoted 4 lines · Stefan Roese
These values are already swapped to CPU endianess, so swapping them again is a bug. Let's remove the swap here instead.
Quoted 8 lines
Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/usb-uclass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
PATCH 4/4 usb: xhci: Add virt_to_phys() to support mapped platforms
In reply to Stefan RoeseSome platforms, like MIPS Octeon, use mapped addresses (virtual address != physical address). On these platforms we need to make sure, that the local virtual addresses are converted to physical (DMA) addresses for the xHCI controller. This patch adds the missing virt_to_phys() calls, so that the correct addresses are used.
---
drivers/usb/host/xhci-mem.c | 19 +++++++++---------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 3 files changed, 14 insertions(+), 16 deletions(-)
drivers/usb/host/xhci-mem.c +9 -10
@@ -224,7 +224,7 @@ static void xhci_link_segments(struct xhci_segment *prev,return ; prev->next = next;if (link_trbs) { - val_64 = (uintptr_t )next->trbs; + val_64 =virt_to_phys (next->trbs); prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr =cpu_to_le64 (val_64);
@@ -484,7 +484,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id)/* Allocate endpoint 0 ring */ virt_dev->eps[0 ].ring =xhci_ring_alloc (1 , true); - byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes); + byte_64 =virt_to_phys (virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);
@@ -509,7 +509,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,uint64_t val_64;uint64_t trb_64;uint32_t val; -unsigned long deq; +uint64_t deq;int i;struct xhci_segment *seg;
@@ -521,7 +521,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,return -ENOMEM ; } - val_64 = (uintptr_t )ctrl->dcbaa; + val_64 =virt_to_phys (ctrl->dcbaa);/* Set the pointer in DCBAA register */ xhci_writeq (&hcor->or_dcbaap, val_64);
@@ -529,7 +529,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, ctrl->cmd_ring =xhci_ring_alloc (1 , true);/* Set the address in the Command Ring Control register */ - trb_64 = (uintptr_t )ctrl->cmd_ring->first_seg->trbs; + trb_64 =virt_to_phys (ctrl->cmd_ring->first_seg->trbs); val_64 =xhci_readq (&hcor->or_crcr); val_64 = (val_64 & (u64 )CMD_RING_RSVD_BITS ) | (trb_64 & (u64) ~CMD_RING_RSVD_BITS) |
@@ -559,8 +559,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,for (val =0 , seg = ctrl->event_ring->first_seg; val <ERST_NUM_SEGS ; val++) { - trb_64 =0 ; - trb_64 = (uintptr_t )seg->trbs; + trb_64 =virt_to_phys (seg->trbs);struct xhci_erst_entry *entry = &ctrl->erst.entries[val]; entry->seg_addr =cpu_to_le64 (trb_64); entry->seg_size =cpu_to_le32 (TRBS_PER_SEGMENT );
@@ -570,7 +569,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,xhci_flush_cache ((uintptr_t )ctrl->erst.entries,ERST_NUM_SEGS *sizeof (struct xhci_erst_entry )); - deq = (unsigned long )ctrl->event_ring->dequeue; + deq =virt_to_phys (ctrl->event_ring->dequeue);/* Update HC event ring dequeue pointer */ xhci_writeq(&ctrl->ir_set->erst_dequeue,
@@ -585,7 +584,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,/* this is the event ring segment table pointer */ val_64 =xhci_readq (&ctrl->ir_set->erst_base); val_64 &=ERST_PTR_MASK ; - val_64 |= ((uintptr_t )(ctrl->erst.entries) & ~ERST_PTR_MASK ); + val_64 |=virt_to_phys (ctrl->erst.entries) & ~ERST_PTR_MASK ;xhci_writeq (&ctrl->ir_set->erst_base, val_64);
@@ -853,7 +852,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,cpu_to_le32 (((0 &MAX_BURST_MASK ) <<MAX_BURST_SHIFT ) | ((3 &ERROR_COUNT_MASK ) <<ERROR_COUNT_SHIFT )); - trb_64 = (uintptr_t )virt_dev->eps[0 ].ring->first_seg->trbs; + trb_64 =virt_to_phys (virt_dev->eps[0 ].ring->first_seg->trbs); ep0_ctx->deq =cpu_to_le64 (trb_64 | virt_dev->eps[0 ].ring->cycle_state);/*
drivers/usb/host/xhci-ring.c +4 -4
@@ -275,7 +275,7 @@ void xhci_queue_command(struct xhci_ctrl *ctrl, u8 *ptr, u32 slot_id, u32 ep_index, trb_type cmd) {u32 fields[4 ]; -u64 val_64 = (uintptr_t )ptr; +u64 val_64 =virt_to_phys (ptr);BUG_ON (prepare_ring (ctrl, ctrl->cmd_ring,EP_STATE_RUNNING ));
@@ -399,7 +399,7 @@ void xhci_acknowledge_event(struct xhci_ctrl *ctrl)/* Inform the hardware */ xhci_writeq (&ctrl->ir_set->erst_dequeue, - (uintptr_t )ctrl->event_ring->dequeue |ERST_EHB ); +virt_to_phys (ctrl->event_ring->dequeue) |ERST_EHB ); }/**
@@ -577,7 +577,7 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,u64 addr;int ret;u32 trb_fields[4 ]; -u64 val_64 = (uintptr_t )buffer; +u64 val_64 =virt_to_phys (buffer);debug ("dev=%p, pipe=%lx, buffer=%p, length=%d\n" , udev, pipe, buffer, length);
@@ -876,7 +876,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe,if (length >0 ) {if (req->requesttype &USB_DIR_IN ) field |=TRB_DIR_IN ; - buf_64 = (uintptr_t )buffer; + buf_64 =virt_to_phys (buffer); trb_fields[0 ] =lower_32_bits (buf_64); trb_fields[1 ] =upper_32_bits (buf_64);
drivers/usb/host/xhci.c +1 -2
@@ -600,8 +600,7 @@ static int xhci_set_configuration(struct usb_device *udev)cpu_to_le32 (MAX_BURST (max_burst) |ERROR_COUNT (err_count)); - trb_64 = (uintptr_t ) - virt_dev->eps[ep_index].ring->enqueue; + trb_64 =virt_to_phys (virt_dev->eps[ep_index].ring->enqueue); ep_ctx[ep_index]->deq =cpu_to_le64 (trb_64 | virt_dev->eps[ep_index].ring->cycle_state);
Signature · 1 line
2.27.0
PATCH 4/4 usb: xhci: Add virt_to_phys() to support mapped platforms
Hi Stefan,
Quoted 41 lines · Stefan Roese
Some platforms, like MIPS Octeon, use mapped addresses (virtual address != physical address). On these platforms we need to make sure, that the local virtual addresses are converted to physical (DMA) addresses for the xHCI controller. This patch adds the missing
virt_to_phys()calls, so that the correct addresses are used.Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 19 +++++++++---------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 3 files changed, 14 insertions(+), 16 deletions(-)drivers/usb/host/xhci-mem.c +2
-2@@ -224,7 +224,7 @@ static void xhci_link_segments(struct xhci_segment *prev,return ; prev->next = next;if (link_trbs) { - val_64 = (uintptr_t )next->trbs; + val_64 =virt_to_phys (next->trbs); prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr =cpu_to_le64 (val_64);@@ -484,7 +484,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id)/* Allocate endpoint 0 ring */ virt_dev->eps[0 ].ring =xhci_ring_alloc (1 , true); - byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes); + byte_64 =virt_to_phys (virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);
drivers/usb/host/xhci-mem.c int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, · line 512
Quoted 5 lines
drivers/usb/host/xhci-mem.c +1
-1@@ -509,7 +509,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,uint64_t val_64;uint64_t trb_64;uint32_t val; -unsigned long deq; +uint64_t deq;
This change seems unnecessary?
Quoted 103 lines
drivers/usb/host/xhci-mem.c +6
-7int i;struct xhci_segment *seg;@@ -521,7 +521,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,return -ENOMEM ; } - val_64 = (uintptr_t )ctrl->dcbaa; + val_64 =virt_to_phys (ctrl->dcbaa);/* Set the pointer in DCBAA register */ xhci_writeq (&hcor->or_dcbaap, val_64);@@ -529,7 +529,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, ctrl->cmd_ring =xhci_ring_alloc (1 , true);/* Set the address in the Command Ring Control register */ - trb_64 = (uintptr_t )ctrl->cmd_ring->first_seg->trbs; + trb_64 =virt_to_phys (ctrl->cmd_ring->first_seg->trbs); val_64 =xhci_readq (&hcor->or_crcr); val_64 = (val_64 & (u64 )CMD_RING_RSVD_BITS ) | (trb_64 & (u64) ~CMD_RING_RSVD_BITS) |@@ -559,8 +559,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,for (val =0 , seg = ctrl->event_ring->first_seg; val <ERST_NUM_SEGS ; val++) { - trb_64 =0 ; - trb_64 = (uintptr_t )seg->trbs; + trb_64 =virt_to_phys (seg->trbs);struct xhci_erst_entry *entry = &ctrl->erst.entries[val]; entry->seg_addr =cpu_to_le64 (trb_64); entry->seg_size =cpu_to_le32 (TRBS_PER_SEGMENT );@@ -570,7 +569,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,xhci_flush_cache ((uintptr_t )ctrl->erst.entries,ERST_NUM_SEGS *sizeof (struct xhci_erst_entry )); - deq = (unsigned long )ctrl->event_ring->dequeue; + deq =virt_to_phys (ctrl->event_ring->dequeue);/* Update HC event ring dequeue pointer */ xhci_writeq(&ctrl->ir_set->erst_dequeue,@@ -585,7 +584,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,/* this is the event ring segment table pointer */ val_64 =xhci_readq (&ctrl->ir_set->erst_base); val_64 &=ERST_PTR_MASK ; - val_64 |= ((uintptr_t )(ctrl->erst.entries) & ~ERST_PTR_MASK ); + val_64 |=virt_to_phys (ctrl->erst.entries) & ~ERST_PTR_MASK ;xhci_writeq (&ctrl->ir_set->erst_base, val_64);@@ -853,7 +852,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,cpu_to_le32 (((0 &MAX_BURST_MASK ) <<MAX_BURST_SHIFT ) | ((3 &ERROR_COUNT_MASK ) <<ERROR_COUNT_SHIFT )); - trb_64 = (uintptr_t )virt_dev->eps[0 ].ring->first_seg->trbs; + trb_64 =virt_to_phys (virt_dev->eps[0 ].ring->first_seg->trbs); ep0_ctx->deq =cpu_to_le64 (trb_64 | virt_dev->eps[0 ].ring->cycle_state);/* drivers/usb/host/xhci-ring.c +4
-4@@ -275,7 +275,7 @@ void xhci_queue_command(struct xhci_ctrl *ctrl, u8 *ptr, u32 slot_id, u32 ep_index, trb_type cmd) {u32 fields[4 ]; -u64 val_64 = (uintptr_t )ptr; +u64 val_64 =virt_to_phys (ptr);BUG_ON (prepare_ring (ctrl, ctrl->cmd_ring,EP_STATE_RUNNING ));@@ -399,7 +399,7 @@ void xhci_acknowledge_event(struct xhci_ctrl *ctrl)/* Inform the hardware */ xhci_writeq (&ctrl->ir_set->erst_dequeue, - (uintptr_t )ctrl->event_ring->dequeue |ERST_EHB ); +virt_to_phys (ctrl->event_ring->dequeue) |ERST_EHB ); }/** @@ -577,7 +577,7 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,u64 addr;int ret;u32 trb_fields[4 ]; -u64 val_64 = (uintptr_t )buffer; +u64 val_64 =virt_to_phys (buffer);debug ("dev=%p, pipe=%lx, buffer=%p, length=%d\n" , udev, pipe, buffer, length);@@ -876,7 +876,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe,if (length >0 ) {if (req->requesttype &USB_DIR_IN ) field |=TRB_DIR_IN ; - buf_64 = (uintptr_t )buffer; + buf_64 =virt_to_phys (buffer); trb_fields[0 ] =lower_32_bits (buf_64); trb_fields[1 ] =upper_32_bits (buf_64);drivers/usb/host/xhci.c +0
-0
drivers/usb/host/xhci.c static int xhci_set_configuration(struct usb_device *udev)
Quoted 10 lines
drivers/usb/host/xhci.c +1
-3@@ -600,8 +600,7 @@ static int xhci_set_configuration(struct usb_device *udev)cpu_to_le32 (MAX_BURST (max_burst) |ERROR_COUNT (err_count)); - trb_64 = (uintptr_t ) - virt_dev->eps[ep_index].ring->enqueue; + trb_64 =virt_to_phys (virt_dev->eps[ep_index].ring->enqueue); ep_ctx[ep_index]->deq =cpu_to_le64 (trb_64 | virt_dev->eps[ep_index].ring->cycle_state); --
Other than above,
Regards,
Bin
PATCH 4/4 usb: xhci: Add virt_to_phys() to support mapped platforms
Hi Bin,
Quoted 41 lines · Bin Meng
Hi Stefan,
Quoted 38 lines · Stefan Roese
Some platforms, like MIPS Octeon, use mapped addresses (virtual address != physical address). On these platforms we need to make sure, that the local virtual addresses are converted to physical (DMA) addresses for the xHCI controller. This patch adds the missing
virt_to_phys()calls, so that the correct addresses are used.Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 19 +++++++++---------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 3 files changed, 14 insertions(+), 16 deletions(-)drivers/usb/host/xhci-mem.c +2
-2@@ -224,7 +224,7 @@ static void xhci_link_segments(struct xhci_segment *prev,return ; prev->next = next;if (link_trbs) { - val_64 = (uintptr_t )next->trbs; + val_64 =virt_to_phys (next->trbs); prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr =cpu_to_le64 (val_64);@@ -484,7 +484,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id)/* Allocate endpoint 0 ring */ virt_dev->eps[0 ].ring =xhci_ring_alloc (1 , true); - byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes); + byte_64 =virt_to_phys (virt_dev->out_ctx->bytes);
Quoted 10 lines
drivers/usb/host/xhci-mem.c int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, · line 512
Quoted 8 lines
drivers/usb/host/xhci-mem.c +1
-1/* Point to output device context in dcbaa. */ ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);@@ -509,7 +509,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,uint64_t val_64;uint64_t trb_64;uint32_t val; -unsigned long deq; +uint64_t deq;This change seems unnecessary?
In most (all other?) places, the variable containing these 64 bit addresses has the type uint64_t in this driver. So I wanted to make the code more consistant here. Or do you see a problem with this change?
Quoted 112 lines
Quoted 112 lines
drivers/usb/host/xhci-mem.c +6
-7int i;struct xhci_segment *seg;@@ -521,7 +521,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,return -ENOMEM ; } - val_64 = (uintptr_t )ctrl->dcbaa; + val_64 =virt_to_phys (ctrl->dcbaa);/* Set the pointer in DCBAA register */ xhci_writeq (&hcor->or_dcbaap, val_64);@@ -529,7 +529,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, ctrl->cmd_ring =xhci_ring_alloc (1 , true);/* Set the address in the Command Ring Control register */ - trb_64 = (uintptr_t )ctrl->cmd_ring->first_seg->trbs; + trb_64 =virt_to_phys (ctrl->cmd_ring->first_seg->trbs); val_64 =xhci_readq (&hcor->or_crcr); val_64 = (val_64 & (u64 )CMD_RING_RSVD_BITS ) | (trb_64 & (u64) ~CMD_RING_RSVD_BITS) |@@ -559,8 +559,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,for (val =0 , seg = ctrl->event_ring->first_seg; val <ERST_NUM_SEGS ; val++) { - trb_64 =0 ; - trb_64 = (uintptr_t )seg->trbs; + trb_64 =virt_to_phys (seg->trbs);struct xhci_erst_entry *entry = &ctrl->erst.entries[val]; entry->seg_addr =cpu_to_le64 (trb_64); entry->seg_size =cpu_to_le32 (TRBS_PER_SEGMENT );@@ -570,7 +569,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,xhci_flush_cache ((uintptr_t )ctrl->erst.entries,ERST_NUM_SEGS *sizeof (struct xhci_erst_entry )); - deq = (unsigned long )ctrl->event_ring->dequeue; + deq =virt_to_phys (ctrl->event_ring->dequeue);/* Update HC event ring dequeue pointer */ xhci_writeq(&ctrl->ir_set->erst_dequeue,@@ -585,7 +584,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,/* this is the event ring segment table pointer */ val_64 =xhci_readq (&ctrl->ir_set->erst_base); val_64 &=ERST_PTR_MASK ; - val_64 |= ((uintptr_t )(ctrl->erst.entries) & ~ERST_PTR_MASK ); + val_64 |=virt_to_phys (ctrl->erst.entries) & ~ERST_PTR_MASK ;xhci_writeq (&ctrl->ir_set->erst_base, val_64);@@ -853,7 +852,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl,cpu_to_le32 (((0 &MAX_BURST_MASK ) <<MAX_BURST_SHIFT ) | ((3 &ERROR_COUNT_MASK ) <<ERROR_COUNT_SHIFT )); - trb_64 = (uintptr_t )virt_dev->eps[0 ].ring->first_seg->trbs; + trb_64 =virt_to_phys (virt_dev->eps[0 ].ring->first_seg->trbs); ep0_ctx->deq =cpu_to_le64 (trb_64 | virt_dev->eps[0 ].ring->cycle_state);/* drivers/usb/host/xhci-ring.c +4
-4@@ -275,7 +275,7 @@ void xhci_queue_command(struct xhci_ctrl *ctrl, u8 *ptr, u32 slot_id, u32 ep_index, trb_type cmd) {u32 fields[4 ]; -u64 val_64 = (uintptr_t )ptr; +u64 val_64 =virt_to_phys (ptr);BUG_ON (prepare_ring (ctrl, ctrl->cmd_ring,EP_STATE_RUNNING ));@@ -399,7 +399,7 @@ void xhci_acknowledge_event(struct xhci_ctrl *ctrl)/* Inform the hardware */ xhci_writeq (&ctrl->ir_set->erst_dequeue, - (uintptr_t )ctrl->event_ring->dequeue |ERST_EHB ); +virt_to_phys (ctrl->event_ring->dequeue) |ERST_EHB ); }/** @@ -577,7 +577,7 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,u64 addr;int ret;u32 trb_fields[4 ]; -u64 val_64 = (uintptr_t )buffer; +u64 val_64 =virt_to_phys (buffer);debug ("dev=%p, pipe=%lx, buffer=%p, length=%d\n" , udev, pipe, buffer, length);@@ -876,7 +876,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe,if (length >0 ) {if (req->requesttype &USB_DIR_IN ) field |=TRB_DIR_IN ; - buf_64 = (uintptr_t )buffer; + buf_64 =virt_to_phys (buffer); trb_fields[0 ] =lower_32_bits (buf_64); trb_fields[1 ] =upper_32_bits (buf_64);drivers/usb/host/xhci.c +1
-2@@ -600,8 +600,7 @@ static int xhci_set_configuration(struct usb_device *udev)cpu_to_le32 (MAX_BURST (max_burst) |ERROR_COUNT (err_count)); - trb_64 = (uintptr_t ) - virt_dev->eps[ep_index].ring->enqueue; + trb_64 =virt_to_phys (virt_dev->eps[ep_index].ring->enqueue); ep_ctx[ep_index]->deq =cpu_to_le64 (trb_64 | virt_dev->eps[ep_index].ring->cycle_state);
Quoted 8 lines
Quoted 1 line
--
Other than above,
Reviewed-by Bin Meng <[email protected]>Regards,
Bin
Thanks,
Stefan
PATCH 4/4 usb: xhci: Add virt_to_phys() to support mapped platforms
Hi Stefan,
Quoted 56 lines · Stefan Roese
Hi Bin,
Quoted 41 lines · Bin Meng
Hi Stefan,
Quoted 38 lines · Stefan Roese
Some platforms, like MIPS Octeon, use mapped addresses (virtual address != physical address). On these platforms we need to make sure, that the local virtual addresses are converted to physical (DMA) addresses for the xHCI controller. This patch adds the missing
virt_to_phys()calls, so that the correct addresses are used.Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 19 +++++++++---------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 3 files changed, 14 insertions(+), 16 deletions(-)drivers/usb/host/xhci-mem.c +2
-2@@ -224,7 +224,7 @@ static void xhci_link_segments(struct xhci_segment *prev,return ; prev->next = next;if (link_trbs) { - val_64 = (uintptr_t )next->trbs; + val_64 =virt_to_phys (next->trbs); prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr =cpu_to_le64 (val_64);@@ -484,7 +484,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id)/* Allocate endpoint 0 ring */ virt_dev->eps[0 ].ring =xhci_ring_alloc (1 , true); - byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes); + byte_64 =virt_to_phys (virt_dev->out_ctx->bytes);Quoted 10 lines
drivers/usb/host/xhci-mem.c int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, · line 512
Quoted 8 lines
drivers/usb/host/xhci-mem.c +1
-1/* Point to output device context in dcbaa. */ ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);@@ -509,7 +509,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,uint64_t val_64;uint64_t trb_64;uint32_t val; -unsigned long deq; +uint64_t deq;This change seems unnecessary?
Quoted 3 lines
In most (all other?) places, the variable containing these 64 bit addresses has the type
uint64_tin this driver. So I wanted to make the code more consistant here. Or do you see a problem with this change?
No, just wondering if you see something is wrong with (unsigned long) on a 32-bit platform.
Regards,
Bin
PATCH 4/4 usb: xhci: Add virt_to_phys() to support mapped platforms
Hi Bin,
Quoted 59 lines · Bin Meng
Hi Stefan,
Quoted 56 lines · Stefan Roese
Hi Bin,
Quoted 51 lines · Bin Meng
Hi Stefan,
Quoted 41 lines · Stefan Roese
Some platforms, like MIPS Octeon, use mapped addresses (virtual address != physical address). On these platforms we need to make sure, that the local virtual addresses are converted to physical (DMA) addresses for the xHCI controller. This patch adds the missing
virt_to_phys()calls, so that the correct addresses are used.Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 19 +++++++++---------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 3 files changed, 14 insertions(+), 16 deletions(-)drivers/usb/host/xhci-mem.c +2
-2@@ -224,7 +224,7 @@ static void xhci_link_segments(struct xhci_segment *prev,return ; prev->next = next;if (link_trbs) { - val_64 = (uintptr_t )next->trbs; + val_64 =virt_to_phys (next->trbs); prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr =cpu_to_le64 (val_64);@@ -484,7 +484,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id)/* Allocate endpoint 0 ring */ virt_dev->eps[0 ].ring =xhci_ring_alloc (1 , true); - byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes); + byte_64 =virt_to_phys (virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);drivers/usb/host/xhci-mem.c int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, · line 512
Quoted 5 lines
drivers/usb/host/xhci-mem.c +1
-1@@ -509,7 +509,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,uint64_t val_64;uint64_t trb_64;uint32_t val; -unsigned long deq; +uint64_t deq;This change seems unnecessary?
Quoted 6 lines
Quoted 3 lines
In most (all other?) places, the variable containing these 64 bit addresses has the type
uint64_tin this driver. So I wanted to make the code more consistant here. Or do you see a problem with this change?No, just wondering if you see something is wrong with (unsigned long) on a 32-bit platform.
I see. Thanks for checking.
Do you have a (little-endian) platform that you could use to test this patchset on? I currently do not have such a board on my desk and would very much like to see it tested on little-endian systems before being applied.
Thanks,
Stefan
PATCH 4/4 usb: xhci: Add virt_to_phys() to support mapped platforms
Hi Stefan,
Quoted 70 lines · Stefan Roese
Hi Bin,
Quoted 59 lines · Bin Meng
Hi Stefan,
Quoted 56 lines · Stefan Roese
Hi Bin,
Quoted 51 lines · Bin Meng
Hi Stefan,
Quoted 41 lines · Stefan Roese
Some platforms, like MIPS Octeon, use mapped addresses (virtual address != physical address). On these platforms we need to make sure, that the local virtual addresses are converted to physical (DMA) addresses for the xHCI controller. This patch adds the missing
virt_to_phys()calls, so that the correct addresses are used.Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 19 +++++++++---------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 3 files changed, 14 insertions(+), 16 deletions(-)drivers/usb/host/xhci-mem.c +2
-2@@ -224,7 +224,7 @@ static void xhci_link_segments(struct xhci_segment *prev,return ; prev->next = next;if (link_trbs) { - val_64 = (uintptr_t )next->trbs; + val_64 =virt_to_phys (next->trbs); prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr =cpu_to_le64 (val_64);@@ -484,7 +484,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id)/* Allocate endpoint 0 ring */ virt_dev->eps[0 ].ring =xhci_ring_alloc (1 , true); - byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes); + byte_64 =virt_to_phys (virt_dev->out_ctx->bytes);/* Point to output device context in dcbaa. */ ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);drivers/usb/host/xhci-mem.c int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, · line 512
Quoted 5 lines
drivers/usb/host/xhci-mem.c +1
-1@@ -509,7 +509,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,uint64_t val_64;uint64_t trb_64;uint32_t val; -unsigned long deq; +uint64_t deq;This change seems unnecessary?
Quoted 6 lines
Quoted 3 lines
In most (all other?) places, the variable containing these 64 bit addresses has the type
uint64_tin this driver. So I wanted to make the code more consistant here. Or do you see a problem with this change?No, just wondering if you see something is wrong with (unsigned long) on a 32-bit platform.
Quoted 6 lines
I see. Thanks for checking.
Do you have a (little-endian) platform that you could use to test this patchset on? I currently do not have such a board on my desk and would very much like to see it tested on little-endian systems before being applied.
Yes, I can test this series on x86 Minnowmax. Will send results then.
Regards,
Bin
PATCH 4/4 usb: xhci: Add virt_to_phys() to support mapped platforms
Hi Bin,
Quoted 73 lines · Bin Meng
Hi Stefan,
Quoted 70 lines · Stefan Roese
Hi Bin,
Quoted 65 lines · Bin Meng
Hi Stefan,
Quoted 56 lines · Stefan Roese
Hi Bin,
Quoted 41 lines · Bin Meng
Hi Stefan,
Quoted 38 lines · Stefan Roese
Some platforms, like MIPS Octeon, use mapped addresses (virtual address != physical address). On these platforms we need to make sure, that the local virtual addresses are converted to physical (DMA) addresses for the xHCI controller. This patch adds the missing
virt_to_phys()calls, so that the correct addresses are used.Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>---
drivers/usb/host/xhci-mem.c | 19 +++++++++---------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 3 files changed, 14 insertions(+), 16 deletions(-)drivers/usb/host/xhci-mem.c +2
-2@@ -224,7 +224,7 @@ static void xhci_link_segments(struct xhci_segment *prev,return ; prev->next = next;if (link_trbs) { - val_64 = (uintptr_t )next->trbs; + val_64 =virt_to_phys (next->trbs); prev->trbs[TRBS_PER_SEGMENT -1 ].link.segment_ptr =cpu_to_le64 (val_64);@@ -484,7 +484,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id)/* Allocate endpoint 0 ring */ virt_dev->eps[0 ].ring =xhci_ring_alloc (1 , true); - byte_64 = (uintptr_t )(virt_dev->out_ctx->bytes); + byte_64 =virt_to_phys (virt_dev->out_ctx->bytes);Quoted 10 lines
drivers/usb/host/xhci-mem.c int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr, · line 512
Quoted 8 lines
drivers/usb/host/xhci-mem.c +1
-1/* Point to output device context in dcbaa. */ ctrl->dcbaa->dev_context_ptrs[slot_id] =cpu_to_le64 (byte_64);@@ -509,7 +509,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,uint64_t val_64;uint64_t trb_64;uint32_t val; -unsigned long deq; +uint64_t deq;This change seems unnecessary?
Quoted 3 lines
In most (all other?) places, the variable containing these 64 bit addresses has the type
uint64_tin this driver. So I wanted to make the code more consistant here. Or do you see a problem with this change?No, just wondering if you see something is wrong with (unsigned long) on a 32-bit platform.
Quoted 8 lines
Quoted 6 lines
I see. Thanks for checking.
Do you have a (little-endian) platform that you could use to test this patchset on? I currently do not have such a board on my desk and would very much like to see it tested on little-endian systems before being applied.
Yes, I can test this series on x86 Minnowmax. Will send results then.
Thanks a lot.
Thanks,
Stefan
PATCH 4/4 usb: xhci: Add virt_to_phys() to support mapped platforms
In reply to Stefan RoeseQuoted 11 lines · Stefan Roese
Some platforms, like MIPS Octeon, use mapped addresses (virtual address != physical address). On these platforms we need to make sure, that the local virtual addresses are converted to physical (DMA) addresses for the xHCI controller. This patch adds the missing
virt_to_phys()calls, so that the correct addresses are used.Signed-off-by Stefan Roese <[email protected]>Cc Bin Meng <[email protected]>Cc Marek Vasut <[email protected]>
Quoted 7 lines
---
drivers/usb/host/xhci-mem.c | 19 +++++++++---------- drivers/usb/host/xhci-ring.c | 8 ++++---- drivers/usb/host/xhci.c | 3 +-- 3 files changed, 14 insertions(+), 16 deletions(-)