63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
|
From a71d1847aa780b3c4062e582ab400a7fea0413b3 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|||
|
|
Date: Tue, 21 Jul 2020 10:33:22 +0200
|
|||
|
|
Subject: [PATCH 01/11] xhci: fix valid.max_access_size to access address
|
|||
|
|
registers
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
QEMU XHCI advertises AC64 (64-bit addressing) but doesn't allow
|
|||
|
|
64-bit mode access in "runtime" and "operational" MemoryRegionOps.
|
|||
|
|
|
|||
|
|
Set the max_access_size based on sizeof(dma_addr_t) as AC64 is set.
|
|||
|
|
|
|||
|
|
XHCI specs:
|
|||
|
|
"If the xHC supports 64-bit addressing (AC64 = ‘1’), then software
|
|||
|
|
should write 64-bit registers using only Qword accesses. If a
|
|||
|
|
system is incapable of issuing Qword accesses, then writes to the
|
|||
|
|
64-bit address fields shall be performed using 2 Dword accesses;
|
|||
|
|
low Dword-first, high-Dword second. If the xHC supports 32-bit
|
|||
|
|
addressing (AC64 = ‘0’), then the high Dword of registers containing
|
|||
|
|
64-bit address fields are unused and software should write addresses
|
|||
|
|
using only Dword accesses"
|
|||
|
|
|
|||
|
|
The problem has been detected with SLOF, as linux kernel always accesses
|
|||
|
|
registers using 32-bit access even if AC64 is set and revealed by
|
|||
|
|
5d971f9e6725 ("memory: Revert "memory: accept mismatching sizes in memory_region_access_valid"")
|
|||
|
|
|
|||
|
|
Suggested-by: Alexey Kardashevskiy <aik@au1.ibm.com>
|
|||
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|||
|
|
Message-id: 20200721083322.90651-1-lvivier@redhat.com
|
|||
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|||
|
|
Signed-off-by: BiaoXiang Ye <yebiaoxiang@huawei.com>
|
|||
|
|
---
|
|||
|
|
hw/usb/hcd-xhci.c | 4 ++--
|
|||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|||
|
|
|
|||
|
|
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
|
|||
|
|
index a21485fe..24565de1 100644
|
|||
|
|
--- a/hw/usb/hcd-xhci.c
|
|||
|
|
+++ b/hw/usb/hcd-xhci.c
|
|||
|
|
@@ -3171,7 +3171,7 @@ static const MemoryRegionOps xhci_oper_ops = {
|
|||
|
|
.read = xhci_oper_read,
|
|||
|
|
.write = xhci_oper_write,
|
|||
|
|
.valid.min_access_size = 4,
|
|||
|
|
- .valid.max_access_size = 4,
|
|||
|
|
+ .valid.max_access_size = sizeof(dma_addr_t),
|
|||
|
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
@@ -3187,7 +3187,7 @@ static const MemoryRegionOps xhci_runtime_ops = {
|
|||
|
|
.read = xhci_runtime_read,
|
|||
|
|
.write = xhci_runtime_write,
|
|||
|
|
.valid.min_access_size = 4,
|
|||
|
|
- .valid.max_access_size = 4,
|
|||
|
|
+ .valid.max_access_size = sizeof(dma_addr_t),
|
|||
|
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
|||
|
|
};
|
|||
|
|
|
|||
|
|
--
|
|||
|
|
2.27.0.dirty
|
|||
|
|
|