Skip to content

Commit d6b8cc7

Browse files
committed
Merge tag 'pull-aspeed-20250401' of https://github.com/legoater/qemu into staging
aspeed queue: * Fixed SCU access size on AST2500 and AST2600 SoCs # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmfr2DsACgkQUaNDx8/7 # 7KHlHg/8D5/maW8yAfQjUBfvy2+tzpV1SvBTKxSvv5n9tP3CFDSgNjFXfDnt06qK # xNE4YzK5I7wWQ20OKXB1LfqHqaJJXT7G1Qc44ZbmfHdiISMuaZaWDjQyzXO/TDSH # e8Svb3iV4IA2J2B6dsbPOym6XMFL9awhXurhYTxfnl9oFhkvgaP1H6Ur0/m8peOq # HELkY18nyWbpeZyIArEagXtBb1n1ucn51dwaDLq9F+D5vXAe6NN8Am5RG/gEED6X # P/o6/VphxR/EmijbIrixHUWmORnuXV4KI13xdLb3hyjIOtgjFPENQuUJTczwkK/8 # mpdTOj+m8ovGMuFGmvnGy6uyYRmXQarBOSSR19XPlMF1qlO7rUUzYPTl7M8M45C5 # UuU9Q60KNSiCHdQqimdZwy/IoI8nuEHMT6g2/Vd82OUJ6K/uR3V0dVel7LVEOvVj # 1xXtNOL8Xy5W0Z84nPLOjpD1WU8Khl8m6OZR81RWR9jTj61dX9AfggkJXSzU6G0Z # Yhv6shqYRn+LpAN/cjqUP6hR1C0iBCi+lBNG6wKq3DVCDXPCg8yEW9D+NUwVj64z # 6BMF335RP3phkmpFMniJ83Ad4yxOmKubQcIIXjLvEiAdppxvDCjQBgYkKHRXkJV0 # wVYnfDwB2quDA1oS3tLibvRf366NjhPfJhMx+yiL4RgFUQ/BvfI= # =VRwA # -----END PGP SIGNATURE----- # gpg: Signature made Tue 01 Apr 2025 08:12:43 EDT # gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1 # gpg: Good signature from "Cédric Le Goater <[email protected]>" [full] # gpg: aka "Cédric Le Goater <[email protected]>" [full] # Primary key fingerprint: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1 * tag 'pull-aspeed-20250401' of https://github.com/legoater/qemu: hw/misc/aspeed_scu: Correct minimum access size for AST2500 / AST2600 hw/misc/aspeed_scu: Set MemoryRegionOps::impl::access_size to 32-bit Signed-off-by: Stefan Hajnoczi <[email protected]>
2 parents fe9d41a + 20ab88a commit d6b8cc7

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

hw/misc/aspeed_scu.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,10 @@ static const MemoryRegionOps aspeed_ast2400_scu_ops = {
427427
.read = aspeed_scu_read,
428428
.write = aspeed_ast2400_scu_write,
429429
.endianness = DEVICE_LITTLE_ENDIAN,
430+
.impl = {
431+
.min_access_size = 4,
432+
.max_access_size = 4,
433+
},
430434
.valid = {
431435
.min_access_size = 1,
432436
.max_access_size = 4,
@@ -437,7 +441,9 @@ static const MemoryRegionOps aspeed_ast2500_scu_ops = {
437441
.read = aspeed_scu_read,
438442
.write = aspeed_ast2500_scu_write,
439443
.endianness = DEVICE_LITTLE_ENDIAN,
440-
.valid.min_access_size = 4,
444+
.impl.min_access_size = 4,
445+
.impl.max_access_size = 4,
446+
.valid.min_access_size = 1,
441447
.valid.max_access_size = 4,
442448
.valid.unaligned = false,
443449
};
@@ -779,7 +785,9 @@ static const MemoryRegionOps aspeed_ast2600_scu_ops = {
779785
.read = aspeed_ast2600_scu_read,
780786
.write = aspeed_ast2600_scu_write,
781787
.endianness = DEVICE_LITTLE_ENDIAN,
782-
.valid.min_access_size = 4,
788+
.impl.min_access_size = 4,
789+
.impl.max_access_size = 4,
790+
.valid.min_access_size = 1,
783791
.valid.max_access_size = 4,
784792
.valid.unaligned = false,
785793
};
@@ -906,6 +914,8 @@ static const MemoryRegionOps aspeed_ast2700_scu_ops = {
906914
.read = aspeed_ast2700_scu_read,
907915
.write = aspeed_ast2700_scu_write,
908916
.endianness = DEVICE_LITTLE_ENDIAN,
917+
.impl.min_access_size = 4,
918+
.impl.max_access_size = 4,
909919
.valid.min_access_size = 1,
910920
.valid.max_access_size = 8,
911921
.valid.unaligned = false,
@@ -1028,6 +1038,8 @@ static const MemoryRegionOps aspeed_ast2700_scuio_ops = {
10281038
.read = aspeed_ast2700_scuio_read,
10291039
.write = aspeed_ast2700_scuio_write,
10301040
.endianness = DEVICE_LITTLE_ENDIAN,
1041+
.impl.min_access_size = 4,
1042+
.impl.max_access_size = 4,
10311043
.valid.min_access_size = 1,
10321044
.valid.max_access_size = 8,
10331045
.valid.unaligned = false,

0 commit comments

Comments
 (0)