mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 02:24:58 -06:00
target-arm queue:
* versal: Support XRAMs and XRAM controller * smmu: Various minor bug fixes * SVE emulation: fix bugs handling odd vector lengths * allwinner-sun8i-emac: traverse transmit queue using TX_CUR_DESC register value * tests/acceptance: fix orangepi-pc acceptance tests * hw/timer/sse-timer: Propagate eventual error in sse_timer_realize() * hw/arm/virt: KVM: The IPA lower bound is 32 * npcm7xx: support MFT module * pl110, pxa2xx_lcd: tidy up template headers -----BEGIN PGP SIGNATURE----- iQJNBAABCAA3FiEE4aXFk81BneKOgxXPPCUl7RQ2DN4FAmBODPcZHHBldGVyLm1h eWRlbGxAbGluYXJvLm9yZwAKCRA8JSXtFDYM3oxdD/9Tbgsd3yZ/zQMKECEbEczB F0wgRz5FLFOx5O+Wfz35ByjCySSms5yaikDaBxqZdvfI9CXbvhwBtt+kEj4xcmUc 0KHYxaAnv//yMqEtpN0gyaVPs0+/BBjEH6kvlOLMngDs4x1Yp7fUh+gqpVxw+V0b v1fAZlfWj4SlAeiarTY9HJ9IZ5REFY7AxA0WdZl0cVT/keKf1Np9EGzBGBQIyn40 zFFLTktJSCmAkN7uUYEmmvcNUAJ1J7YlM1Sm3v4qmAHhRhB3a76qNk9/fDXqEs+Y OimIcsnHf/EyHQd8auwl2yLZ36tyDcUILUwRafFoQ12Krz7eSFon8xNnnSBFlgoM qmsGHN+AQXpXDaT7PPqx2ckR4vIZcp5dWp4B+rD8XFLhHU9p4FsZwtVfiwWH1K+y WOoGPqIo6o7IMOhTf7+NfVMj9COKDbyr9KzteoIOnrKVzc1JQaZVMFD/MufrtH39 hq7DdAl7MX+pKHKqaNPw8WFA9b8Th6ZCbmN1kyQpIFlj7/MoivJ7EQBtBIj6kBbS oy7Z/tI0rzaw6D44OO6yqnJVi2vMKEPzMZptoKYIK8OXNZyIAWOvyvT5tFPg8YCT f4QeF2J794NAIFF9SGK9hnFEE/vajzQm248IZVKFHVfhOJ3ev+FjNSdRySInAFY/ yoZlbfk1u9zula3I1Z0z3Q== =7lkG -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210314' into staging target-arm queue: * versal: Support XRAMs and XRAM controller * smmu: Various minor bug fixes * SVE emulation: fix bugs handling odd vector lengths * allwinner-sun8i-emac: traverse transmit queue using TX_CUR_DESC register value * tests/acceptance: fix orangepi-pc acceptance tests * hw/timer/sse-timer: Propagate eventual error in sse_timer_realize() * hw/arm/virt: KVM: The IPA lower bound is 32 * npcm7xx: support MFT module * pl110, pxa2xx_lcd: tidy up template headers # gpg: Signature made Sun 14 Mar 2021 13:17:43 GMT # gpg: using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE # gpg: issuer "peter.maydell@linaro.org" # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate] # gpg: aka "Peter Maydell <pmaydell@gmail.com>" [ultimate] # gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate] # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE * remotes/pmaydell/tags/pull-target-arm-20210314: (39 commits) hw/display/pxa2xx: Inline template header hw/display/pxa2xx: Apply whitespace-only coding style fixes to template header hw/display/pxa2xx: Apply brace-related coding style fixes to template header hw/display/pxa2xx: Remove use of BITS in pxa2xx_template.h hw/display/pxa2xx_lcd: Remove dest_width state field hw/display/pxa2xx_lcd: Remove dead code for non-32-bpp surfaces hw/display/pl110: Remove use of BITS from pl110_template.h hw/display/pl110: Pull included-once parts of template header into pl110.c hw/display/pl110: Remove dead code for non-32-bpp surfaces tests/qtest: Test PWM fan RPM using MFT in PWM test hw/arm: Connect PWM fans in NPCM7XX boards hw/arm: Add MFT device to NPCM7xx Soc hw/misc: Add NPCM7XX MFT Module hw/misc: Add GPIOs for duty in NPCM7xx PWM hw/arm/virt: KVM: The IPA lower bound is 32 accel: kvm: Fix kvm_type invocation hw/timer/sse-timer: Propagate eventual error in sse_timer_realize() tests/acceptance: drop ARMBIAN_ARTIFACTS_CACHED condition for orangepi-pc, cubieboard tests tests/acceptance: update sunxi kernel from armbian to 5.10.16 tests/acceptance/boot_linux_console: change URL for test_arm_orangepi_bionic_20_08 ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
6f8a81fc29
39 changed files with 2235 additions and 937 deletions
|
|
@ -507,20 +507,18 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||
self.wait_for_console_pattern('Boot successful.')
|
||||
# TODO user command, for now the uart is stuck
|
||||
|
||||
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
||||
'Test artifacts fetched from unreliable apt.armbian.com')
|
||||
def test_arm_cubieboard_initrd(self):
|
||||
"""
|
||||
:avocado: tags=arch:arm
|
||||
:avocado: tags=machine:cubieboard
|
||||
"""
|
||||
deb_url = ('https://apt.armbian.com/pool/main/l/'
|
||||
'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb')
|
||||
deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315'
|
||||
'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')
|
||||
deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'
|
||||
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
|
||||
kernel_path = self.extract_from_deb(deb_path,
|
||||
'/boot/vmlinuz-4.20.7-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.dtb'
|
||||
'/boot/vmlinuz-5.10.16-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubieboard.dtb'
|
||||
dtb_path = self.extract_from_deb(deb_path, dtb_path)
|
||||
initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
|
||||
'2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'
|
||||
|
|
@ -549,20 +547,18 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||
'system-control@1c00000')
|
||||
# cubieboard's reboot is not functioning; omit reboot test.
|
||||
|
||||
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
||||
'Test artifacts fetched from unreliable apt.armbian.com')
|
||||
def test_arm_cubieboard_sata(self):
|
||||
"""
|
||||
:avocado: tags=arch:arm
|
||||
:avocado: tags=machine:cubieboard
|
||||
"""
|
||||
deb_url = ('https://apt.armbian.com/pool/main/l/'
|
||||
'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb')
|
||||
deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315'
|
||||
'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')
|
||||
deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'
|
||||
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
|
||||
kernel_path = self.extract_from_deb(deb_path,
|
||||
'/boot/vmlinuz-4.20.7-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.dtb'
|
||||
'/boot/vmlinuz-5.10.16-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubieboard.dtb'
|
||||
dtb_path = self.extract_from_deb(deb_path, dtb_path)
|
||||
rootfs_url = ('https://github.com/groeck/linux-build-test/raw/'
|
||||
'2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'
|
||||
|
|
@ -678,20 +674,18 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||
self.wait_for_console_pattern(
|
||||
'Give root password for system maintenance')
|
||||
|
||||
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
||||
'Test artifacts fetched from unreliable apt.armbian.com')
|
||||
def test_arm_orangepi(self):
|
||||
"""
|
||||
:avocado: tags=arch:arm
|
||||
:avocado: tags=machine:orangepi-pc
|
||||
"""
|
||||
deb_url = ('https://apt.armbian.com/pool/main/l/'
|
||||
'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb')
|
||||
deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315'
|
||||
'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')
|
||||
deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'
|
||||
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
|
||||
kernel_path = self.extract_from_deb(deb_path,
|
||||
'/boot/vmlinuz-4.20.7-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.dtb'
|
||||
'/boot/vmlinuz-5.10.16-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi-pc.dtb'
|
||||
dtb_path = self.extract_from_deb(deb_path, dtb_path)
|
||||
|
||||
self.vm.set_console()
|
||||
|
|
@ -705,20 +699,18 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||
console_pattern = 'Kernel command line: %s' % kernel_command_line
|
||||
self.wait_for_console_pattern(console_pattern)
|
||||
|
||||
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
||||
'Test artifacts fetched from unreliable apt.armbian.com')
|
||||
def test_arm_orangepi_initrd(self):
|
||||
"""
|
||||
:avocado: tags=arch:arm
|
||||
:avocado: tags=machine:orangepi-pc
|
||||
"""
|
||||
deb_url = ('https://apt.armbian.com/pool/main/l/'
|
||||
'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb')
|
||||
deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315'
|
||||
'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')
|
||||
deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'
|
||||
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
|
||||
kernel_path = self.extract_from_deb(deb_path,
|
||||
'/boot/vmlinuz-4.20.7-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.dtb'
|
||||
'/boot/vmlinuz-5.10.16-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi-pc.dtb'
|
||||
dtb_path = self.extract_from_deb(deb_path, dtb_path)
|
||||
initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
|
||||
'2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'
|
||||
|
|
@ -749,8 +741,6 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||
# Wait for VM to shut down gracefully
|
||||
self.vm.wait()
|
||||
|
||||
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
||||
'Test artifacts fetched from unreliable apt.armbian.com')
|
||||
def test_arm_orangepi_sd(self):
|
||||
"""
|
||||
:avocado: tags=arch:arm
|
||||
|
|
@ -758,12 +748,12 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||
:avocado: tags=device:sd
|
||||
"""
|
||||
deb_url = ('https://apt.armbian.com/pool/main/l/'
|
||||
'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb')
|
||||
deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315'
|
||||
'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')
|
||||
deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'
|
||||
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
|
||||
kernel_path = self.extract_from_deb(deb_path,
|
||||
'/boot/vmlinuz-4.20.7-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.dtb'
|
||||
'/boot/vmlinuz-5.10.16-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi-pc.dtb'
|
||||
dtb_path = self.extract_from_deb(deb_path, dtb_path)
|
||||
rootfs_url = ('http://storage.kernelci.org/images/rootfs/buildroot/'
|
||||
'kci-2019.02/armel/base/rootfs.ext2.xz')
|
||||
|
|
@ -802,7 +792,27 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||
# Wait for VM to shut down gracefully
|
||||
self.vm.wait()
|
||||
|
||||
def do_test_arm_orangepi_uboot_armbian(self, image_path):
|
||||
@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
|
||||
def test_arm_orangepi_bionic_20_08(self):
|
||||
"""
|
||||
:avocado: tags=arch:arm
|
||||
:avocado: tags=machine:orangepi-pc
|
||||
:avocado: tags=device:sd
|
||||
"""
|
||||
|
||||
# This test download a 275 MiB compressed image and expand it
|
||||
# to 1036 MiB, but the underlying filesystem is 1552 MiB...
|
||||
# As we expand it to 2 GiB we are safe.
|
||||
|
||||
image_url = ('https://archive.armbian.com/orangepipc/archive/'
|
||||
'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.xz')
|
||||
image_hash = ('b4d6775f5673486329e45a0586bf06b6'
|
||||
'dbe792199fd182ac6b9c7bb6c7d3e6dd')
|
||||
image_path_xz = self.fetch_asset(image_url, asset_hash=image_hash,
|
||||
algorithm='sha256')
|
||||
image_path = archive.extract(image_path_xz, self.workdir)
|
||||
image_pow2ceil_expand(image_path)
|
||||
|
||||
self.vm.set_console()
|
||||
self.vm.add_args('-drive', 'file=' + image_path + ',if=sd,format=raw',
|
||||
'-nic', 'user',
|
||||
|
|
@ -828,54 +838,6 @@ class BootLinuxConsole(LinuxKernelTest):
|
|||
'to <orangepipc>')
|
||||
self.wait_for_console_pattern('Starting Load Kernel Modules...')
|
||||
|
||||
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
||||
'Test artifacts fetched from unreliable apt.armbian.com')
|
||||
@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
|
||||
@skipUnless(P7ZIP_AVAILABLE, '7z not installed')
|
||||
def test_arm_orangepi_bionic_19_11(self):
|
||||
"""
|
||||
:avocado: tags=arch:arm
|
||||
:avocado: tags=machine:orangepi-pc
|
||||
:avocado: tags=device:sd
|
||||
"""
|
||||
|
||||
# This test download a 196MB compressed image and expand it to 1GB
|
||||
image_url = ('https://dl.armbian.com/orangepipc/archive/'
|
||||
'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z')
|
||||
image_hash = '196a8ffb72b0123d92cea4a070894813d305c71e'
|
||||
image_path_7z = self.fetch_asset(image_url, asset_hash=image_hash)
|
||||
image_name = 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.img'
|
||||
image_path = os.path.join(self.workdir, image_name)
|
||||
process.run("7z e -o%s %s" % (self.workdir, image_path_7z))
|
||||
image_pow2ceil_expand(image_path)
|
||||
|
||||
self.do_test_arm_orangepi_uboot_armbian(image_path)
|
||||
|
||||
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
||||
'Test artifacts fetched from unreliable apt.armbian.com')
|
||||
@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
|
||||
def test_arm_orangepi_bionic_20_08(self):
|
||||
"""
|
||||
:avocado: tags=arch:arm
|
||||
:avocado: tags=machine:orangepi-pc
|
||||
:avocado: tags=device:sd
|
||||
"""
|
||||
|
||||
# This test download a 275 MiB compressed image and expand it
|
||||
# to 1036 MiB, but the underlying filesystem is 1552 MiB...
|
||||
# As we expand it to 2 GiB we are safe.
|
||||
|
||||
image_url = ('https://dl.armbian.com/orangepipc/archive/'
|
||||
'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.xz')
|
||||
image_hash = ('b4d6775f5673486329e45a0586bf06b6'
|
||||
'dbe792199fd182ac6b9c7bb6c7d3e6dd')
|
||||
image_path_xz = self.fetch_asset(image_url, asset_hash=image_hash,
|
||||
algorithm='sha256')
|
||||
image_path = archive.extract(image_path_xz, self.workdir)
|
||||
image_pow2ceil_expand(image_path)
|
||||
|
||||
self.do_test_arm_orangepi_uboot_armbian(image_path)
|
||||
|
||||
@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
|
||||
def test_arm_orangepi_uboot_netbsd9(self):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -177,20 +177,18 @@ class ReplayKernelNormal(ReplayKernelBase):
|
|||
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=1)
|
||||
|
||||
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
|
||||
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
||||
'Test artifacts fetched from unreliable apt.armbian.com')
|
||||
def test_arm_cubieboard_initrd(self):
|
||||
"""
|
||||
:avocado: tags=arch:arm
|
||||
:avocado: tags=machine:cubieboard
|
||||
"""
|
||||
deb_url = ('https://apt.armbian.com/pool/main/l/'
|
||||
'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb')
|
||||
deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315'
|
||||
'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')
|
||||
deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'
|
||||
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
|
||||
kernel_path = self.extract_from_deb(deb_path,
|
||||
'/boot/vmlinuz-4.20.7-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.dtb'
|
||||
'/boot/vmlinuz-5.10.16-sunxi')
|
||||
dtb_path = '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubieboard.dtb'
|
||||
dtb_path = self.extract_from_deb(deb_path, dtb_path)
|
||||
initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
|
||||
'2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@
|
|||
#define PLL_FBDV(rv) extract32((rv), 16, 12)
|
||||
#define PLL_OTDV1(rv) extract32((rv), 8, 3)
|
||||
#define PLL_OTDV2(rv) extract32((rv), 13, 3)
|
||||
#define APB4CKDIV(rv) extract32((rv), 30, 2)
|
||||
#define APB3CKDIV(rv) extract32((rv), 28, 2)
|
||||
#define CLK2CKDIV(rv) extract32((rv), 0, 1)
|
||||
#define CLK4CKDIV(rv) extract32((rv), 26, 2)
|
||||
|
|
@ -52,6 +53,49 @@
|
|||
|
||||
#define MAX_DUTY 1000000
|
||||
|
||||
/* MFT (PWM fan) related */
|
||||
#define MFT_BA(n) (0xf0180000 + ((n) * 0x1000))
|
||||
#define MFT_IRQ(n) (96 + (n))
|
||||
#define MFT_CNT1 0x00
|
||||
#define MFT_CRA 0x02
|
||||
#define MFT_CRB 0x04
|
||||
#define MFT_CNT2 0x06
|
||||
#define MFT_PRSC 0x08
|
||||
#define MFT_CKC 0x0a
|
||||
#define MFT_MCTRL 0x0c
|
||||
#define MFT_ICTRL 0x0e
|
||||
#define MFT_ICLR 0x10
|
||||
#define MFT_IEN 0x12
|
||||
#define MFT_CPA 0x14
|
||||
#define MFT_CPB 0x16
|
||||
#define MFT_CPCFG 0x18
|
||||
#define MFT_INASEL 0x1a
|
||||
#define MFT_INBSEL 0x1c
|
||||
|
||||
#define MFT_MCTRL_ALL 0x64
|
||||
#define MFT_ICLR_ALL 0x3f
|
||||
#define MFT_IEN_ALL 0x3f
|
||||
#define MFT_CPCFG_EQ_MODE 0x44
|
||||
|
||||
#define MFT_CKC_C2CSEL BIT(3)
|
||||
#define MFT_CKC_C1CSEL BIT(0)
|
||||
|
||||
#define MFT_ICTRL_TFPND BIT(5)
|
||||
#define MFT_ICTRL_TEPND BIT(4)
|
||||
#define MFT_ICTRL_TDPND BIT(3)
|
||||
#define MFT_ICTRL_TCPND BIT(2)
|
||||
#define MFT_ICTRL_TBPND BIT(1)
|
||||
#define MFT_ICTRL_TAPND BIT(0)
|
||||
|
||||
#define MFT_MAX_CNT 0xffff
|
||||
#define MFT_TIMEOUT 0x5000
|
||||
|
||||
#define DEFAULT_RPM 19800
|
||||
#define DEFAULT_PRSC 255
|
||||
#define MFT_PULSE_PER_REVOLUTION 2
|
||||
|
||||
#define MAX_ERROR 1
|
||||
|
||||
typedef struct PWMModule {
|
||||
int irq;
|
||||
uint64_t base_addr;
|
||||
|
|
@ -210,19 +254,36 @@ static uint64_t pwm_get_duty(QTestState *qts, int module_index, int pwm_index)
|
|||
return pwm_qom_get(qts, path, name);
|
||||
}
|
||||
|
||||
static void mft_qom_set(QTestState *qts, int index, const char *name,
|
||||
uint32_t value)
|
||||
{
|
||||
QDict *response;
|
||||
char *path = g_strdup_printf("/machine/soc/mft[%d]", index);
|
||||
|
||||
g_test_message("Setting properties %s of mft[%d] with value %u",
|
||||
name, index, value);
|
||||
response = qtest_qmp(qts, "{ 'execute': 'qom-set',"
|
||||
" 'arguments': { 'path': %s, "
|
||||
" 'property': %s, 'value': %u}}",
|
||||
path, name, value);
|
||||
/* The qom set message returns successfully. */
|
||||
g_assert_true(qdict_haskey(response, "return"));
|
||||
}
|
||||
|
||||
static uint32_t get_pll(uint32_t con)
|
||||
{
|
||||
return REF_HZ * PLL_FBDV(con) / (PLL_INDV(con) * PLL_OTDV1(con)
|
||||
* PLL_OTDV2(con));
|
||||
}
|
||||
|
||||
static uint64_t read_pclk(QTestState *qts)
|
||||
static uint64_t read_pclk(QTestState *qts, bool mft)
|
||||
{
|
||||
uint64_t freq = REF_HZ;
|
||||
uint32_t clksel = qtest_readl(qts, CLK_BA + CLKSEL);
|
||||
uint32_t pllcon;
|
||||
uint32_t clkdiv1 = qtest_readl(qts, CLK_BA + CLKDIV1);
|
||||
uint32_t clkdiv2 = qtest_readl(qts, CLK_BA + CLKDIV2);
|
||||
uint32_t apbdiv = mft ? APB4CKDIV(clkdiv2) : APB3CKDIV(clkdiv2);
|
||||
|
||||
switch (CPUCKSEL(clksel)) {
|
||||
case 0:
|
||||
|
|
@ -241,7 +302,7 @@ static uint64_t read_pclk(QTestState *qts)
|
|||
g_assert_not_reached();
|
||||
}
|
||||
|
||||
freq >>= (CLK2CKDIV(clkdiv1) + CLK4CKDIV(clkdiv1) + APB3CKDIV(clkdiv2));
|
||||
freq >>= (CLK2CKDIV(clkdiv1) + CLK4CKDIV(clkdiv1) + apbdiv);
|
||||
|
||||
return freq;
|
||||
}
|
||||
|
|
@ -267,7 +328,7 @@ static uint32_t pwm_selector(uint32_t csr)
|
|||
static uint64_t pwm_compute_freq(QTestState *qts, uint32_t ppr, uint32_t csr,
|
||||
uint32_t cnr)
|
||||
{
|
||||
return read_pclk(qts) / ((ppr + 1) * pwm_selector(csr) * (cnr + 1));
|
||||
return read_pclk(qts, false) / ((ppr + 1) * pwm_selector(csr) * (cnr + 1));
|
||||
}
|
||||
|
||||
static uint64_t pwm_compute_duty(uint32_t cnr, uint32_t cmr, bool inverted)
|
||||
|
|
@ -301,6 +362,28 @@ static void pwm_write(QTestState *qts, const TestData *td, unsigned offset,
|
|||
qtest_writel(qts, td->module->base_addr + offset, value);
|
||||
}
|
||||
|
||||
static uint8_t mft_readb(QTestState *qts, int index, unsigned offset)
|
||||
{
|
||||
return qtest_readb(qts, MFT_BA(index) + offset);
|
||||
}
|
||||
|
||||
static uint16_t mft_readw(QTestState *qts, int index, unsigned offset)
|
||||
{
|
||||
return qtest_readw(qts, MFT_BA(index) + offset);
|
||||
}
|
||||
|
||||
static void mft_writeb(QTestState *qts, int index, unsigned offset,
|
||||
uint8_t value)
|
||||
{
|
||||
qtest_writeb(qts, MFT_BA(index) + offset, value);
|
||||
}
|
||||
|
||||
static void mft_writew(QTestState *qts, int index, unsigned offset,
|
||||
uint16_t value)
|
||||
{
|
||||
return qtest_writew(qts, MFT_BA(index) + offset, value);
|
||||
}
|
||||
|
||||
static uint32_t pwm_read_ppr(QTestState *qts, const TestData *td)
|
||||
{
|
||||
return extract32(pwm_read(qts, td, PPR), ppr_base[pwm_index(td->pwm)], 8);
|
||||
|
|
@ -351,11 +434,116 @@ static void pwm_write_cmr(QTestState *qts, const TestData *td, uint32_t value)
|
|||
pwm_write(qts, td, td->pwm->cmr_offset, value);
|
||||
}
|
||||
|
||||
static int mft_compute_index(const TestData *td)
|
||||
{
|
||||
int index = pwm_module_index(td->module) * ARRAY_SIZE(pwm_list) +
|
||||
pwm_index(td->pwm);
|
||||
|
||||
g_assert_cmpint(index, <,
|
||||
ARRAY_SIZE(pwm_module_list) * ARRAY_SIZE(pwm_list));
|
||||
|
||||
return index;
|
||||
}
|
||||
|
||||
static void mft_reset_counters(QTestState *qts, int index)
|
||||
{
|
||||
mft_writew(qts, index, MFT_CNT1, MFT_MAX_CNT);
|
||||
mft_writew(qts, index, MFT_CNT2, MFT_MAX_CNT);
|
||||
mft_writew(qts, index, MFT_CRA, MFT_MAX_CNT);
|
||||
mft_writew(qts, index, MFT_CRB, MFT_MAX_CNT);
|
||||
mft_writew(qts, index, MFT_CPA, MFT_MAX_CNT - MFT_TIMEOUT);
|
||||
mft_writew(qts, index, MFT_CPB, MFT_MAX_CNT - MFT_TIMEOUT);
|
||||
}
|
||||
|
||||
static void mft_init(QTestState *qts, const TestData *td)
|
||||
{
|
||||
int index = mft_compute_index(td);
|
||||
|
||||
/* Enable everything */
|
||||
mft_writeb(qts, index, MFT_CKC, 0);
|
||||
mft_writeb(qts, index, MFT_ICLR, MFT_ICLR_ALL);
|
||||
mft_writeb(qts, index, MFT_MCTRL, MFT_MCTRL_ALL);
|
||||
mft_writeb(qts, index, MFT_IEN, MFT_IEN_ALL);
|
||||
mft_writeb(qts, index, MFT_INASEL, 0);
|
||||
mft_writeb(qts, index, MFT_INBSEL, 0);
|
||||
|
||||
/* Set cpcfg to use EQ mode, same as kernel driver */
|
||||
mft_writeb(qts, index, MFT_CPCFG, MFT_CPCFG_EQ_MODE);
|
||||
|
||||
/* Write default counters, timeout and prescaler */
|
||||
mft_reset_counters(qts, index);
|
||||
mft_writeb(qts, index, MFT_PRSC, DEFAULT_PRSC);
|
||||
|
||||
/* Write default max rpm via QMP */
|
||||
mft_qom_set(qts, index, "max_rpm[0]", DEFAULT_RPM);
|
||||
mft_qom_set(qts, index, "max_rpm[1]", DEFAULT_RPM);
|
||||
}
|
||||
|
||||
static int32_t mft_compute_cnt(uint32_t rpm, uint64_t clk)
|
||||
{
|
||||
uint64_t cnt;
|
||||
|
||||
if (rpm == 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
cnt = clk * 60 / ((DEFAULT_PRSC + 1) * rpm * MFT_PULSE_PER_REVOLUTION);
|
||||
if (cnt >= MFT_TIMEOUT) {
|
||||
return -1;
|
||||
}
|
||||
return MFT_MAX_CNT - cnt;
|
||||
}
|
||||
|
||||
static void mft_verify_rpm(QTestState *qts, const TestData *td, uint64_t duty)
|
||||
{
|
||||
int index = mft_compute_index(td);
|
||||
uint16_t cnt, cr;
|
||||
uint32_t rpm = DEFAULT_RPM * duty / MAX_DUTY;
|
||||
uint64_t clk = read_pclk(qts, true);
|
||||
int32_t expected_cnt = mft_compute_cnt(rpm, clk);
|
||||
|
||||
qtest_irq_intercept_in(qts, "/machine/soc/a9mpcore/gic");
|
||||
g_test_message(
|
||||
"verifying rpm for mft[%d]: clk: %" PRIu64 ", duty: %" PRIu64 ", rpm: %u, cnt: %d",
|
||||
index, clk, duty, rpm, expected_cnt);
|
||||
|
||||
/* Verify rpm for fan A */
|
||||
/* Stop capture */
|
||||
mft_writeb(qts, index, MFT_CKC, 0);
|
||||
mft_writeb(qts, index, MFT_ICLR, MFT_ICLR_ALL);
|
||||
mft_reset_counters(qts, index);
|
||||
g_assert_cmphex(mft_readw(qts, index, MFT_CNT1), ==, MFT_MAX_CNT);
|
||||
g_assert_cmphex(mft_readw(qts, index, MFT_CRA), ==, MFT_MAX_CNT);
|
||||
g_assert_cmphex(mft_readw(qts, index, MFT_CPA), ==,
|
||||
MFT_MAX_CNT - MFT_TIMEOUT);
|
||||
/* Start capture */
|
||||
mft_writeb(qts, index, MFT_CKC, MFT_CKC_C1CSEL);
|
||||
g_assert_true(qtest_get_irq(qts, MFT_IRQ(index)));
|
||||
if (expected_cnt == -1) {
|
||||
g_assert_cmphex(mft_readb(qts, index, MFT_ICTRL), ==, MFT_ICTRL_TEPND);
|
||||
} else {
|
||||
g_assert_cmphex(mft_readb(qts, index, MFT_ICTRL), ==, MFT_ICTRL_TAPND);
|
||||
cnt = mft_readw(qts, index, MFT_CNT1);
|
||||
/*
|
||||
* Due to error in clock measurement and rounding, we might have a small
|
||||
* error in measuring RPM.
|
||||
*/
|
||||
g_assert_cmphex(cnt + MAX_ERROR, >=, expected_cnt);
|
||||
g_assert_cmphex(cnt, <=, expected_cnt + MAX_ERROR);
|
||||
cr = mft_readw(qts, index, MFT_CRA);
|
||||
g_assert_cmphex(cnt, ==, cr);
|
||||
}
|
||||
|
||||
/* Verify rpm for fan B */
|
||||
|
||||
qtest_irq_intercept_out(qts, "/machine/soc/a9mpcore/gic");
|
||||
}
|
||||
|
||||
/* Check pwm registers can be reset to default value */
|
||||
static void test_init(gconstpointer test_data)
|
||||
{
|
||||
const TestData *td = test_data;
|
||||
QTestState *qts = qtest_init("-machine quanta-gsj");
|
||||
QTestState *qts = qtest_init("-machine npcm750-evb");
|
||||
int module = pwm_module_index(td->module);
|
||||
int pwm = pwm_index(td->pwm);
|
||||
|
||||
|
|
@ -369,7 +557,7 @@ static void test_init(gconstpointer test_data)
|
|||
static void test_oneshot(gconstpointer test_data)
|
||||
{
|
||||
const TestData *td = test_data;
|
||||
QTestState *qts = qtest_init("-machine quanta-gsj");
|
||||
QTestState *qts = qtest_init("-machine npcm750-evb");
|
||||
int module = pwm_module_index(td->module);
|
||||
int pwm = pwm_index(td->pwm);
|
||||
uint32_t ppr, csr, pcr;
|
||||
|
|
@ -400,13 +588,15 @@ static void test_oneshot(gconstpointer test_data)
|
|||
static void test_toggle(gconstpointer test_data)
|
||||
{
|
||||
const TestData *td = test_data;
|
||||
QTestState *qts = qtest_init("-machine quanta-gsj");
|
||||
QTestState *qts = qtest_init("-machine npcm750-evb");
|
||||
int module = pwm_module_index(td->module);
|
||||
int pwm = pwm_index(td->pwm);
|
||||
uint32_t ppr, csr, pcr, cnr, cmr;
|
||||
int i, j, k, l;
|
||||
uint64_t expected_freq, expected_duty;
|
||||
|
||||
mft_init(qts, td);
|
||||
|
||||
pcr = CH_EN | CH_MOD;
|
||||
for (i = 0; i < ARRAY_SIZE(ppr_list); ++i) {
|
||||
ppr = ppr_list[i];
|
||||
|
|
@ -440,6 +630,9 @@ static void test_toggle(gconstpointer test_data)
|
|||
==, expected_freq);
|
||||
}
|
||||
|
||||
/* Test MFT's RPM is correct. */
|
||||
mft_verify_rpm(qts, td, expected_duty);
|
||||
|
||||
/* Test inverted mode */
|
||||
expected_duty = pwm_compute_duty(cnr, cmr, true);
|
||||
pwm_write_pcr(qts, td, pcr | CH_INV);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue