October 2020 - Linux-stable-mirror

Re: Backport 44623b2818f4a442726639572f44fd9b6d0ef68c to kernel 5.4

by Nick Desaulniers

On Fri, Oct 30, 2020 at 12:24 PM Jian Cai <jiancai(a)google.com> wrote: > > Hi Nathan, > > Thanks for all the tips! I have fixed the issues mentioned in your comments and used git send-email to resend the patch as recommended. FYI I used the Message ID of this thread but it created a new thread anyway. No, I'll bet you're using gmail which has issues showing threads when the subject is changed or is not `Re: <old subject>`. If you look at lore, it's correct: https://lore.kernel.org/stable/20201030014930.GB2519055@ubuntu-m3-large-x86… Just that you forgot to cc stable. :^P Don't worry about it; I forget to do that still myself. -- Thanks, ~Nick Desaulniers

4 years, 2 months

1
0
0 0

[PATCH v2 1/2] mm/compaction: count pages and stop correctly during page isolation.

by Zi Yan

From: Zi Yan <ziy(a)nvidia.com> In isolate_migratepages_block, when cc->alloc_contig is true, we are able to isolate compound pages, nr_migratepages and nr_isolated did not count compound pages correctly, causing us to isolate more pages than we thought. Use thp_nr_pages to count pages. Otherwise, we might be trapped in too_many_isolated while loop, since the actual isolated pages can go up to COMPACT_CLUSTER_MAX*512=16384, where COMPACT_CLUSTER_MAX is 32, since we stop isolation after cc->nr_migratepages reaches to COMPACT_CLUSTER_MAX. In addition, after we fix the issue above, cc->nr_migratepages could never be equal to COMPACT_CLUSTER_MAX if compound pages are isolated, thus page isolation could not stop as we intended. Change the isolation stop condition to >=. The issue can be triggered as follows: In a system with 16GB memory and an 8GB CMA region reserved by hugetlb_cma, if we first allocate 10GB THPs and mlock them (so some THPs are allocated in the CMA region and mlocked), reserving 6 1GB hugetlb pages via /sys/kernel/mm/hugepages/hugepages-1048576kB/nr_hugepages will get stuck (looping in too_many_isolated function) until we kill either task. With the patch applied, oom will kill the application with 10GB THPs and let hugetlb page reservation finish. Fixes: 1da2f328fa64 (“mm,thp,compaction,cma: allow THP migration for CMA allocations”) Signed-off-by: Zi Yan <ziy(a)nvidia.com> Reviewed-by: Yang Shi <shy828301(a)gmail.com> Cc: <stable(a)vger.kernel.org> --- mm/compaction.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index ee1f8439369e..3e834ac402f1 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1012,8 +1012,8 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, isolate_success: list_add(&page->lru, &cc->migratepages); - cc->nr_migratepages++; - nr_isolated++; + cc->nr_migratepages += compound_nr(page); + nr_isolated += compound_nr(page); /* * Avoid isolating too much unless this block is being @@ -1021,7 +1021,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, * or a lock is contended. For contention, isolate quickly to * potentially remove one source of contention. */ - if (cc->nr_migratepages == COMPACT_CLUSTER_MAX && + if (cc->nr_migratepages >= COMPACT_CLUSTER_MAX && !cc->rescan && !cc->contended) { ++low_pfn; break; @@ -1132,7 +1132,7 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn, if (!pfn) break; - if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) + if (cc->nr_migratepages >= COMPACT_CLUSTER_MAX) break; } -- 2.28.0

4 years, 2 months

3
3
0 0

[PATCH 5/6] mtd: spinand: Fix OOB read

by Miquel Raynal

So far OOB have never been used in SPI-NAND, add the missing memcpy to make it work properly. Fixes: 7529df465248 ("mtd: nand: Add core infrastructure to support SPI NANDs") Cc: stable(a)vger.kernel.org Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- drivers/mtd/nand/spi/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 4a4c86d8eeb6..bec8c2a57f24 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -382,6 +382,10 @@ static int spinand_read_from_cache_op(struct spinand_device *spinand, memcpy(req->databuf.in, spinand->databuf + req->dataoffs, req->datalen); + if (req->ooblen) + memcpy(req->oobbuf.in, spinand->oobbuf + req->ooboffs, + req->ooblen); + return 0; } -- 2.20.1

4 years, 2 months

1
1
0 0

[PATCH] mtd: rawnand: qcom: Fix DMA sync on FLASH_STATUS register read

by Praveenkumar I

After each codeword NAND_FLASH_STATUS is read for possible operational failures. But there is no DMA sync for CPU operation before reading it and this leads to incorrect or older copy of DMA buffer in reg_read_buf. This patch adds the DMA sync on reg_read_buf for CPU before reading it. Fixes: 5bc36b2bf6e2 ("mtd: rawnand: qcom: check for operation errors in case of raw read") Signed-off-by: Praveenkumar I <ipkumar(a)codeaurora.org> --- drivers/mtd/nand/raw/qcom_nandc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c index bd7a7251429b..5bb85f1ba84c 100644 --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c @@ -1570,6 +1570,8 @@ static int check_flash_errors(struct qcom_nand_host *host, int cw_cnt) struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); int i; + nandc_read_buffer_sync(nandc, true); + for (i = 0; i < cw_cnt; i++) { u32 flash = le32_to_cpu(nandc->reg_read_buf[i]); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

4 years, 2 months

2
2
0 0

[PATCH] mtd: meson: fix meson_nfc_dma_buffer_release() arguments

by Sergei Antonov

Arguments 'infolen' and 'datalen' to meson_nfc_dma_buffer_release() were mixed up. Fixes: 8fae856c53500 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") Cc: stable(a)vger.kernel.org Signed-off-by: Sergei Antonov <saproj(a)gmail.com> --- drivers/mtd/nand/raw/meson_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 48e6dac96be6..a76afea6ea77 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -510,7 +510,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf, } static void meson_nfc_dma_buffer_release(struct nand_chip *nand, - int infolen, int datalen, + int datalen, int infolen, enum dma_data_direction dir) { struct meson_nfc *nfc = nand_get_controller_data(nand); -- 2.17.1

4 years, 2 months

3
3
0 0

stable-rc/queue/5.4 baseline: 194 runs, 3 regressions (v5.4.73-9-g98c61b1447e0)

by kernelci.org bot

stable-rc/queue/5.4 baseline: 194 runs, 3 regressions (v5.4.73-9-g98c61b1447e0) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions ----------------------+-------+--------------+----------+--------------------+------------ at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 1 bcm2837-rpi-3-b | arm64 | lab-baylibre | gcc-8 | defconfig | 1 stm32mp157c-dk2 | arm | lab-baylibre | gcc-8 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F5.4/kernel/v5.4.73-9… Test: baseline Tree: stable-rc Branch: queue/5.4 Describe: v5.4.73-9-g98c61b1447e0 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 98c61b1447e049c4cf3a1fab3fad294b1e8dbd63 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions ----------------------+-------+--------------+----------+--------------------+------------ at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 1 Details: https://kernelci.org/test/plan/id/5f9c1410624fd4a63e381021 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: sama5_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.73-9-g98c61b1447e0/a… HTML log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.73-9-g98c61b1447e0/a… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5f9c1410624fd4a63e381022 failing since 1 day (last pass: v5.4.72-409-gbbe9df5e07cf, first fail: v5.4.72-409-ga6e47f533653) platform | arch | lab | compiler | defconfig | regressions ----------------------+-------+--------------+----------+--------------------+------------ bcm2837-rpi-3-b | arm64 | lab-baylibre | gcc-8 | defconfig | 1 Details: https://kernelci.org/test/plan/id/5f9c11b7037a5ace5a381032 Results: 4 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (aarch64-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.73-9-g98c61b1447e0/a… HTML log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.73-9-g98c61b1447e0/a… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.dmesg.crit: https://kernelci.org/test/case/id/5f9c11b7037a5ace5a381037 failing since 0 day (last pass: v5.4.73-9-ga9c55e5daa9c, first fail: v5.4.73-9-g812d5e88da7e) 2 lines 2020-10-30 13:12:26.007000+00:00 Connected to bcm2837-rpi-3-b console [channel connected] (~$quit to exit) 2020-10-30 13:12:26.007000+00:00 (user:khilman) is already connected 2020-10-30 13:12:40.996000+00:00 2020-10-30 13:12:40.996000+00:00 2020-10-30 13:12:41.012000+00:00 U-Boot 2018.11 (Dec 04 2018 - 10:54:32 -0800) 2020-10-30 13:12:41.012000+00:00 2020-10-30 13:12:41.013000+00:00 DRAM: 948 MiB 2020-10-30 13:12:41.028000+00:00 RPI 3 Model B (0xa02082) 2020-10-30 13:12:41.119000+00:00 MMC: mmc@7e202000: 0, sdhci@7e300000: 1 2020-10-30 13:12:41.151000+00:00 Loading Environment from FAT... *** Warning - bad CRC, using default environment ... (381 line(s) more) platform | arch | lab | compiler | defconfig | regressions ----------------------+-------+--------------+----------+--------------------+------------ stm32mp157c-dk2 | arm | lab-baylibre | gcc-8 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/5f9c1505ed6719092538102a Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.73-9-g98c61b1447e0/a… HTML log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.73-9-g98c61b1447e0/a… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5f9c1505ed6719092538102b failing since 4 days (last pass: v5.4.72-54-gc97bc0eb3ef2, first fail: v5.4.72-402-g22eb6f319bc6)

4 years, 2 months

1
0
0 0

stable-rc/linux-4.19.y baseline: 174 runs, 4 regressions (v4.19.154)

by kernelci.org bot

stable-rc/linux-4.19.y baseline: 174 runs, 4 regressions (v4.19.154) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions ----------------------+-------+---------------+----------+---------------------+------------ at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 1 bcm2837-rpi-3-b | arm64 | lab-baylibre | gcc-8 | defconfig | 1 beagle-xm | arm | lab-baylibre | gcc-8 | multi_v7_defconfig | 1 panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/linux-4.19.y/kernel/v4.19.15… Test: baseline Tree: stable-rc Branch: linux-4.19.y Describe: v4.19.154 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: f5d8eef067acee3fda37137f4a08c0d3f6427a8e Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions ----------------------+-------+---------------+----------+---------------------+------------ at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 1 Details: https://kernelci.org/test/plan/id/5f9c0f47a208d1a96638101c Results: 0 PASS, 1 FAIL, 0 SKIP Full config: sama5_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.154/arm/sama5_de… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.154/arm/sama5_de… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5f9c0f47a208d1a96638101d failing since 136 days (last pass: v4.19.126-55-gf6c346f2d42d, first fail: v4.19.126-113-gd694d4388e88) platform | arch | lab | compiler | defconfig | regressions ----------------------+-------+---------------+----------+---------------------+------------ bcm2837-rpi-3-b | arm64 | lab-baylibre | gcc-8 | defconfig | 1 Details: https://kernelci.org/test/plan/id/5f9c0fc3f86ea8a6163810ef Results: 4 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (aarch64-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.154/arm64/defcon… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.154/arm64/defcon… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.dmesg.crit: https://kernelci.org/test/case/id/5f9c0fc3f86ea8a6163810f4 new failure (last pass: v4.19.153) 1 lines 2020-10-30 13:04:12.375000+00:00 Connected to bcm2837-rpi-3-b console [channel connected] (~$quit to exit) 2020-10-30 13:04:12.375000+00:00 (user:khilman) is already connected 2020-10-30 13:04:27.747000+00:00 2020-10-30 13:04:27.748000+00:00 2020-10-30 13:04:27.748000+00:00 U-Boot 2018.11 (Dec 04 2018 - 10:54:32 -0800) 2020-10-30 13:04:27.763000+00:00 2020-10-30 13:04:27.764000+00:00 DRAM: 948 MiB 2020-10-30 13:04:27.779000+00:00 RPI 3 Model B (0xa02082) 2020-10-30 13:04:27.867000+00:00 MMC: mmc@7e202000: 0, sdhci@7e300000: 1 2020-10-30 13:04:27.900000+00:00 Loading Environment from FAT... *** Warning - bad CRC, using default environment ... (371 line(s) more) platform | arch | lab | compiler | defconfig | regressions ----------------------+-------+---------------+----------+---------------------+------------ beagle-xm | arm | lab-baylibre | gcc-8 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/5f9c1448a032870d85381012 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.154/arm/multi_v7… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.154/arm/multi_v7… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.login: https://kernelci.org/test/case/id/5f9c1448a032870d85381013 new failure (last pass: v4.19.153) platform | arch | lab | compiler | defconfig | regressions ----------------------+-------+---------------+----------+---------------------+------------ panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 1 Details: https://kernelci.org/test/plan/id/5f9c11f2eac96582b4381030 Results: 4 PASS, 1 FAIL, 0 SKIP Full config: omap2plus_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.154/arm/omap2plu… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.154/arm/omap2plu… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5f9c11f2eac96582b4381037 new failure (last pass: v4.19.153) 2 lines

4 years, 2 months

1
0
0 0

stable-rc/queue/4.14 baseline: 156 runs, 1 regressions (v4.14.203-3-gad7f808825a3)

by kernelci.org bot

stable-rc/queue/4.14 baseline: 156 runs, 1 regressions (v4.14.203-3-gad7f808825a3) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions ---------+------+---------------+----------+---------------------+------------ panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F4.14/kernel/v4.14.20… Test: baseline Tree: stable-rc Branch: queue/4.14 Describe: v4.14.203-3-gad7f808825a3 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: ad7f808825a31630e8cf2bdb7f2a0c4db0676285 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions ---------+------+---------------+----------+---------------------+------------ panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 1 Details: https://kernelci.org/test/plan/id/5f9c0f8129558a47c5381062 Results: 3 PASS, 1 FAIL, 1 SKIP Full config: omap2plus_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/queue-4.14/v4.14.203-3-gad7f808825a… HTML log: https://storage.kernelci.org//stable-rc/queue-4.14/v4.14.203-3-gad7f808825a… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2020.05-4-g97706c5d… * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5f9c0f8129558a47c5381069 new failure (last pass: v4.14.203-3-gd24321bfc541) 2 lines 2020-10-30 13:05:01.403000+00:00 kern :emerg : lock: emif_lock+0x0/0xffffed34 [emif], .magic: dead4ead, .owner: <none>/-1, .owner_cpu: -1

4 years, 2 months

1
0
0 0

[PATCH 08/12] KVM: arm64: Force PTE mapping on fault resulting in a device mapping

by Marc Zyngier

From: Santosh Shukla <sashukla(a)nvidia.com> VFIO allows a device driver to resolve a fault by mapping a MMIO range. This can be subsequently result in user_mem_abort() to try and compute a huge mapping based on the MMIO pfn, which is a sure recipe for things to go wrong. Instead, force a PTE mapping when the pfn faulted in has a device mapping. Fixes: 6d674e28f642 ("KVM: arm/arm64: Properly handle faulting of device mappings") Suggested-by: Marc Zyngier <maz(a)kernel.org> Signed-off-by: Santosh Shukla <sashukla(a)nvidia.com> [maz: rewritten commit message] Signed-off-by: Marc Zyngier <maz(a)kernel.org> Reviewed-by: Gavin Shan <gshan(a)redhat.com> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/1603711447-11998-2-git-send-email-sashukla@nvidia… --- arch/arm64/kvm/mmu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index e431d2d8e368..c7c6df6309d5 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -851,6 +851,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, if (kvm_is_device_pfn(pfn)) { device = true; + force_pte = true; } else if (logging_active && !write_fault) { /* * Only actually map the page as writable if this was a write -- 2.28.0

4 years, 2 months

1
0
0 0

[PATCH 05/12] KVM: arm64: Fix AArch32 handling of DBGD{CCINT, SCRext} and DBGVCR

by Marc Zyngier

The DBGD{CCINT,SCRext} and DBGVCR register entries in the cp14 array are missing their target register, resulting in all accesses being targetted at the guard sysreg (indexed by __INVALID_SYSREG__). Point the emulation code at the actual register entries. Fixes: bdfb4b389c8d ("arm64: KVM: add trap handlers for AArch32 debug registers") Signed-off-by: Marc Zyngier <maz(a)kernel.org> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20201029172409.2768336-1-maz@kernel.org --- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/sys_regs.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 0aecbab6a7fb..781d029b8aa8 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -239,6 +239,7 @@ enum vcpu_sysreg { #define cp14_DBGWCR0 (DBGWCR0_EL1 * 2) #define cp14_DBGWVR0 (DBGWVR0_EL1 * 2) #define cp14_DBGDCCINT (MDCCINT_EL1 * 2) +#define cp14_DBGVCR (DBGVCR32_EL2 * 2) #define NR_COPRO_REGS (NR_SYS_REGS * 2) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 3c203cb8c103..983994f01a63 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1881,9 +1881,9 @@ static const struct sys_reg_desc cp14_regs[] = { { Op1( 0), CRn( 0), CRm( 1), Op2( 0), trap_raz_wi }, DBG_BCR_BVR_WCR_WVR(1), /* DBGDCCINT */ - { Op1( 0), CRn( 0), CRm( 2), Op2( 0), trap_debug32 }, + { Op1( 0), CRn( 0), CRm( 2), Op2( 0), trap_debug32, NULL, cp14_DBGDCCINT }, /* DBGDSCRext */ - { Op1( 0), CRn( 0), CRm( 2), Op2( 2), trap_debug32 }, + { Op1( 0), CRn( 0), CRm( 2), Op2( 2), trap_debug32, NULL, cp14_DBGDSCRext }, DBG_BCR_BVR_WCR_WVR(2), /* DBGDTR[RT]Xint */ { Op1( 0), CRn( 0), CRm( 3), Op2( 0), trap_raz_wi }, @@ -1898,7 +1898,7 @@ static const struct sys_reg_desc cp14_regs[] = { { Op1( 0), CRn( 0), CRm( 6), Op2( 2), trap_raz_wi }, DBG_BCR_BVR_WCR_WVR(6), /* DBGVCR */ - { Op1( 0), CRn( 0), CRm( 7), Op2( 0), trap_debug32 }, + { Op1( 0), CRn( 0), CRm( 7), Op2( 0), trap_debug32, NULL, cp14_DBGVCR }, DBG_BCR_BVR_WCR_WVR(7), DBG_BCR_BVR_WCR_WVR(8), DBG_BCR_BVR_WCR_WVR(9), -- 2.28.0

4 years, 2 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2020