Skip to content

riscv: support for Svpbmt and D1 memory types

Heiko Stuebner linux-riscv lkml 6 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v10 Latest12 patches 24 repliesIn review
  2. v912 patches 16 repliesSuperseded
  3. v814 patches 17 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v713 patches8 repliesSuperseded
v614 patches25 repliesSuperseded
v514 patches6 repliesSuperseded

Changes in v10 from the cover letter

- add received review-tags
- put early patching behind a kconfig symbol
- adapt compiler flags of sources in use by early patching similar to other riscv arch-parts.
This fixes the medlow cmodel issue on rv32 and also issues with Kasan.

Patches in v10 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/12riscv: integrate alternatives better into the main architecturearch/riscv/Kconfig arch/riscv/Kconfig.erratas arch/riscv/Kconfig.socs +8 more+26 -202 replies
2/12riscv: allow different stages with alternativesarch/riscv/errata/sifive/errata.c arch/riscv/include/asm/alternative.h arch/riscv/kernel/alternative.c+23 -112 replies
3/12riscv: implement module alternativesarch/riscv/errata/sifive/errata.c arch/riscv/include/asm/alternative.h arch/riscv/kernel/alternative.c +1 more+55 -92 replies
4/12riscv: implement ALTERNATIVE_2 macroarch/riscv/include/asm/alternative-macros.h+58 -202 replies
5/12riscv: extend concatenated alternatives-lines to the same lengtharch/riscv/include/asm/alternative-macros.h+10 -102 replies
6/12riscv: prevent compressed instructions in alternativesarch/riscv/include/asm/alternative-macros.h+24 -02 replies
7/12riscv: move boot alternatives to after fill_hwcaparch/riscv/kernel/setup.c arch/riscv/kernel/smpboot.c+2 -20 replies
8/12riscv: Fix accessing pfn bits in PTEs for non-32bit variantsarch/riscv/include/asm/pgtable-32.h arch/riscv/include/asm/pgtable-64.h arch/riscv/include/asm/pgtable-bits.h +1 more+24 -125 replies
9/12riscv: add RISC-V Svpbmt extension supportarch/riscv/Kconfig arch/riscv/include/asm/alternative.h arch/riscv/include/asm/errata_list.h +8 more+189 -103 replies
10/12riscv: remove FIXMAP_PAGE_IO and fall back to its default valuearch/riscv/include/asm/fixmap.h+0 -20 replies
11/12riscv: don't use global static vars to store alternative dataarch/riscv/kernel/alternative.c+24 -271 reply
12/12riscv: add memory-type errata for T-Headarch/riscv/Kconfig arch/riscv/Kconfig.erratas arch/riscv/errata/Makefile +12 more+260 -91 reply

Reviews trailers per patch

All 12 patches have a Reviewed-by or Acked-by.

PatchPhilipp TomsichChristoph HellwigGuo RenSamuel Holland
1/12R-b R-b R-b
2/12R-b R-b R-b
3/12R-b R-b R-b
4/12R-b R-b R-b
5/12R-b R-b R-b
6/12R-b R-b R-b R-b
7/12R-b R-b R-b
8/12R-b R-b R-b
9/12R-b R-b
10/12R-b R-b R-b
11/12R-b R-b R-b
12/12R-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v10 thread

Cover letter [PATCH v10 00/12] riscv: support for Svpbmt and D1 memory types

Svpbmt is an extension defining "Supervisor-mode: page-based memory types" for things like non-cacheable pages or I/O memory pages.

So this is my 2nd try at implementing Svpbmt (and the diverging D1 memory types) using the alternatives framework.

This includes a number of changes to the alternatives mechanism itself. The biggest one being the move to a more central location, as I expect in the future, nearly every chip needing some sort of patching, be it either for erratas or for optional features (svpbmt or others).

Detection of the svpbmt functionality is done via Atish's isa extension handling series [0] and thus does not need any dt-parsing of its own anymore.

The series also introduces support for the memory types of the D1 which are implemented differently to svpbmt. But when patching anyway it's pretty clean to add the D1 variant via ALTERNATIVE_2 to the same location.

The only slightly bigger difference is that the "normal" type is not 0 as with svpbmt, so kernel patches for this PMA type need to be applied even before the MMU is brought up, so the series introduces a separate stage for that.

In theory this series is 2 parts:
- alternatives improvements
- svpbmt+d1

I picked the recipient list from the previous versions, hopefully I didn't forget anybody.

I tested the series on:
- qemu-rv32 + buildroot rootfs
- qemu-rv64 + debian roots
- Allwinner D1-Nezha
- BeagleV - it at least reached the same point as without the series

I also ran Palmers CI environment on 5.18-rc6 + this series and it passed with all testcases now.

changes in v10:
- add received review-tags
- put early patching behind a kconfig symbol
- adapt compiler flags of sources in use by early patching similar to other riscv arch-parts.
This fixes the medlow cmodel issue on rv32 and also issues with Kasan.

changes in v9:
- rebase onto 5.18-rc1
- drop the sbi null-ptr patch
While I still think this to be non-ideal as is, it isn't really necessary for svpbmt support anymore
- merge cpufeature + svpbmt patch, as otherwise some empty shells cause build warnings when a bisection stops between these two patches
- address review comments from Christoph Hellwig:
- keep alternatives optional, they now get selected by its users (erratas and also the newly introduced svpbmt kconfig)
- wrap long lines and keep things below 80 characters
- restyle svpbmt + thead errata assembly
- introduce a helper for the repeated calls to

    (val & _PAGE_PFN_MASK) >> _PAGE_PFN_SHIFT

changes in v8:
- rebase onto 5.17-final + isa extension series We're halfway through the merge-window, so this series should be merge after that
- adapt to fix limiting alternatives to non-xip-kernels
- add .norelax option for alternatives
- fix unused cpu_apply_errata in thead errata
- don't use static globals to store cpu-manufacturer data as it makes machines hang if done too early

changes in v7:
- fix typo in patch1 (Atish)
- moved to Atish's isa-extension framework
- and therefore move regular boot-alternatives directly behind fill_hwcaps
- change T-Head errata Kconfig text (Atish)

changes in v6:
- rebase onto 5.17-rc1
- handle sbi null-ptr differently
- improve commit messages
- use riscv,mmu as property name

changes in v5:
- move to use alternatives for runtime-patching
- add D1 variant

[0] https://lore.kernel.org/r/[email protected]

Heiko Stuebner (12):
riscv: integrate alternatives better into the main architecture
riscv: allow different stages with alternatives
riscv: implement module alternatives
riscv: implement ALTERNATIVE_2 macro
riscv: extend concatenated alternatives-lines to the same length
riscv: prevent compressed instructions in alternatives
riscv: move boot alternatives to after fill_hwcap
riscv: Fix accessing pfn bits in PTEs for non-32bit variants
riscv: add RISC-V Svpbmt extension support
riscv: remove FIXMAP_PAGE_IO and fall back to its default value
riscv: don't use global static vars to store alternative data
riscv: add memory-type errata for T-Head

 arch/riscv/Kconfig                          |  28 +++++
 arch/riscv/Kconfig.erratas                  |  34 ++++--
 arch/riscv/Kconfig.socs                     |   1 -
 arch/riscv/Makefile                         |   2 +-
 arch/riscv/errata/Makefile                  |   2 +-
 arch/riscv/errata/alternative.c             |  75 ------------
 arch/riscv/errata/sifive/errata.c           |  20 ++-
 arch/riscv/errata/thead/Makefile            |  11 ++
 arch/riscv/errata/thead/errata.c            |  82 +++++++++++++
 arch/riscv/include/asm/alternative-macros.h | 129 +++++++++++++++-----
 arch/riscv/include/asm/alternative.h        |  25 +++-
 arch/riscv/include/asm/errata_list.h        |  59 +++++++++
 arch/riscv/include/asm/fixmap.h             |   2 -
 arch/riscv/include/asm/hwcap.h              |   1 +
 arch/riscv/include/asm/pgtable-32.h         |  17 +++
 arch/riscv/include/asm/pgtable-64.h         |  79 +++++++++++-
 arch/riscv/include/asm/pgtable-bits.h       |  10 --
 arch/riscv/include/asm/pgtable.h            |  55 +++++++--
 arch/riscv/include/asm/vendorid_list.h      |   1 +
 arch/riscv/kernel/Makefile                  |  15 +++
 arch/riscv/kernel/alternative.c             | 118 ++++++++++++++++++
 arch/riscv/kernel/cpu.c                     |   1 +
 arch/riscv/kernel/cpufeature.c              |  80 +++++++++++-
 arch/riscv/kernel/module.c                  |  29 +++++
 arch/riscv/kernel/setup.c                   |   2 +
 arch/riscv/kernel/smpboot.c                 |   4 -
 arch/riscv/kernel/traps.c                   |   2 +-
 arch/riscv/mm/init.c                        |   1 +
 28 files changed, 724 insertions(+), 161 deletions(-)
 delete mode 100644 arch/riscv/errata/alternative.c
 create mode 100644 arch/riscv/errata/thead/Makefile
 create mode 100644 arch/riscv/errata/thead/errata.c
 create mode 100644 arch/riscv/kernel/alternative.c
Signature · 7 lines
2.35.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv