The following changes since commit ac9a78681b921877518763ba0e89202254349d1b:
Linux 6.4-rc1 (2023-05-07 13:34:35 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.5-mw1
for you to fetch changes up to 488833ccdcac118da16701f4ee0673b20ba47fe3:
Merge patch series "dt-bindings: riscv: cpus: switch to unevaluatedProperties: false" (2023-06-23 10:06:23 -0700)
----------------------------------------------------------------
RISC-V Patches for the 6.5 Merge Window, Part 1
* Support for ACPI.
* Various cleanups to the ISA string parsing, including making them
case-insensitive
* Support for the vector extension.
* Support for independent irq/softirq stacks.
* Our CPU DT binding now has "unevaluatedProperties: false"
----------------------------------------------------------------
I have a few all{yes,mod}config failures, but it looks like there's at least
fixes on the lists for all of them and most are in linux-next already.
I'm almost certainly going to have a part 2: at least for the DCE stuff (which
I just lost track of this week, sorry), but we've also got a handful of
fixes/cleanups staged and some more on the lists. This was a pretty big merge
window, but it looks like most of the stragglers are pretty small so hopefully
it's not too bad.
There's one merge coflict in MAINTAINERS
diff --cc MAINTAINERS
index 0d6ecb5a4107,e0976ae2a523..cfc2b67e9b4e
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -406,19 -406,6 +406,19 @@@ L: [email protected]
S: Maintained
F: drivers/acpi/arm64
- ACPI SERIAL MULTI INSTANTIATE DRIVER
- M: Hans de Goede <[email protected]>
- L: [email protected]
- S: Maintained
- F: drivers/platform/x86/serial-multi-instantiate.c
-
+ACPI FOR RISC-V (ACPI/riscv)
+M: Sunil V L <[email protected]>
+L: [email protected]
+L: [email protected]
+S: Maintained
+F: drivers/acpi/riscv/
+
++ACPI SERIAL MULTI INSTANTIATE DRIVER
++M: Hans de Goede <[email protected]>
++L: [email protected]
++S: Maintained
++F: drivers/platform/x86/serial-multi-instantiate.c
++
ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
M: Sudeep Holla <[email protected]>
L: [email protected]
----------------------------------------------------------------
Andy Chiu (11):
riscv: hwprobe: Add support for probing V in RISCV_HWPROBE_KEY_IMA_EXT_0
riscv: Allocate user's vector context in the first-use trap
riscv: signal: check fp-reserved words unconditionally
riscv: signal: validate altstack to reflect Vector
riscv: hwcap: change ELF_HWCAP to a function
riscv: Add prctl controls for userspace vector management
riscv: Add sysctl to set the default vector rule for new processes
riscv: detect assembler support for .option arch
riscv: Add documentation for Vector
selftests: Test RISC-V Vector prctl interface
selftests: add .gitignore file for RISC-V hwprobe
Ben Dooks (1):
riscv: say disabling zicbom if no or bad riscv,cbom-block-size found
Björn Töpel (1):
riscv: mm: Pre-allocate PGD entries for vmalloc/modules area
Conor Dooley (10):
dt-bindings: riscv: drop invalid comment about riscv,isa lower-case reasoning
RISC-V: simplify register width check in ISA string parsing
RISC-V: split early & late of_node to hartid mapping
RISC-V: validate riscv,isa at boot, not during ISA string parsing
RISC-V: rework comments in ISA string parser
RISC-V: remove decrement/increment dance in ISA string parser
dt-bindings: riscv: explicitly mention assumption of Zicntr & Zihpm support
RISC-V: always report presence of extensions formerly part of the base ISA
dt-bindings: riscv: cpus: add a ref the common cpu schema
dt-bindings: riscv: cpus: switch to unevaluatedProperties: false
Evan Green (3):
RISC-V: Add Zba, Zbs extension probing
RISC-V: Track ISA extensions per hart
RISC-V: hwprobe: Expose Zba, Zbb, and Zbs
Fangrui Song (1):
riscv: replace deprecated scall with ecall
Greentime Hu (9):
riscv: Add new csr defines related to vector extension
riscv: Clear vector regfile on bootup
riscv: Introduce Vector enable/disable helpers
riscv: Introduce riscv_v_vsize to record size of Vector context
riscv: Introduce struct/helpers to save/restore per-task Vector state
riscv: Add task switch support for vector
riscv: Add ptrace vector support
riscv: signal: Add sigcontext save/restore for vector
riscv: prevent stack corruption by reserving task_pt_regs(p) early
Guo Ren (7):
riscv: Rename __switch_to_aux() -> fpu
riscv: Extending cpufeature.c to detect V-extension
riscv: Disable Vector Instructions for kernel itself
riscv: Enable Vector code to be built
riscv: stack: Support HAVE_IRQ_EXIT_ON_IRQ_STACK
riscv: stack: Support HAVE_SOFTIRQ_ON_OWN_STACK
riscv: stack: Add config of thread stack size
Jisheng Zhang (3):
riscv: move sbi_init() earlier before jump_label_init()
riscv: mm: stub extable related functions/macros for !MMU
riscv: mm: try VMA lock-based page fault handling first
Krzysztof Kozlowski (1):
dt-bindings: riscv: cpus: drop unneeded quotes
Palmer Dabbelt (7):
Merge patch series "Add basic ACPI support for RISC-V"
Merge patch series "riscv: allow case-insensitive ISA string parsing"
Merge patch series "riscv: Add vector ISA support"
Merge patch series "RISC-V: Export Zba, Zbb to usermode via hwprobe"
Merge patch series "ISA string parser cleanups"
Merge patch series "riscv: Add independent irq/softirq stacks support"
Merge patch series "dt-bindings: riscv: cpus: switch to unevaluatedProperties: false"
Song Shuai (3):
riscv: hibernation: Replace jalr with jr before suspend_restore_regs
riscv: hibernation: Remove duplicate call of suspend_restore_csrs
riscv: hibernate: remove WARN_ON in save_processor_state
Sunil V L (22):
platform/surface: Disable for RISC-V
crypto: hisilicon/qm: Fix to enable build with RISC-V clang
ACPI: tables: Print RINTC information when MADT is parsed
ACPI: OSL: Make should_use_kmap() 0 for RISC-V
RISC-V: Add support to build the ACPI core
ACPI: processor_core: RISC-V: Enable mapping processor to the hartid
RISC-V: Add ACPI initialization in setup_arch()
RISC-V: ACPI: Cache and retrieve the RINTC structure
drivers/acpi: RISC-V: Add RHCT related code
RISC-V: smpboot: Create wrapper setup_smp()
RISC-V: smpboot: Add ACPI support in setup_smp()
RISC-V: only iterate over possible CPUs in ISA string parser
RISC-V: cpufeature: Add ACPI support in riscv_fill_hwcap()
RISC-V: cpu: Enable cpuinfo for ACPI systems
irqchip/riscv-intc: Add ACPI support
clocksource/timer-riscv: Refactor riscv_timer_init_dt()
clocksource/timer-riscv: Add ACPI support
RISC-V: time.c: Add ACPI support for time_init()
RISC-V: Enable ACPI in defconfig
MAINTAINERS: Add entry for drivers/acpi/riscv
RISC-V: ACPI : Fix for usage of pointers in different address space
RISC-V/perf: Use standard interface to get INTC domain
Tiezhu Yang (1):
riscv: uprobes: Restore thread.bad_cause
Viacheslav Mitrofanov (1):
perf: RISC-V: Limit the number of counters returned from SBI
Vincent Chen (3):
riscv: signal: Report signal frame size to userspace via auxv
riscv: kvm: Add V extension to KVM ISA
riscv: KVM: Add vector lazy save/restore support
Yangyu Chen (1):
riscv: allow case-insensitive ISA string parsing
Documentation/admin-guide/kernel-parameters.txt | 8 +-
Documentation/devicetree/bindings/riscv/cpus.yaml | 20 +-
Documentation/riscv/hwprobe.rst | 13 +
Documentation/riscv/index.rst | 1 +
Documentation/riscv/vector.rst | 132 ++++++++++
MAINTAINERS | 7 +
arch/riscv/Kconfig | 64 ++++-
arch/riscv/Makefile | 6 +-
arch/riscv/configs/defconfig | 1 +
arch/riscv/include/asm/acenv.h | 11 +
arch/riscv/include/asm/acpi.h | 84 +++++++
arch/riscv/include/asm/asm-extable.h | 6 +
arch/riscv/include/asm/cpu.h | 8 +
arch/riscv/include/asm/cpufeature.h | 10 +
arch/riscv/include/asm/csr.h | 18 +-
arch/riscv/include/asm/elf.h | 11 +-
arch/riscv/include/asm/extable.h | 4 +
arch/riscv/include/asm/hwcap.h | 9 +
arch/riscv/include/asm/insn.h | 29 +++
arch/riscv/include/asm/irq_stack.h | 30 +++
arch/riscv/include/asm/kvm_host.h | 2 +
arch/riscv/include/asm/kvm_vcpu_vector.h | 82 ++++++
arch/riscv/include/asm/processor.h | 14 ++
arch/riscv/include/asm/switch_to.h | 9 +-
arch/riscv/include/asm/thread_info.h | 17 +-
arch/riscv/include/asm/vector.h | 184 ++++++++++++++
arch/riscv/include/uapi/asm/auxvec.h | 1 +
arch/riscv/include/uapi/asm/hwcap.h | 1 +
arch/riscv/include/uapi/asm/hwprobe.h | 4 +
arch/riscv/include/uapi/asm/kvm.h | 8 +
arch/riscv/include/uapi/asm/ptrace.h | 39 +++
arch/riscv/include/uapi/asm/sigcontext.h | 16 +-
arch/riscv/kernel/Makefile | 2 +
arch/riscv/kernel/acpi.c | 251 +++++++++++++++++++
arch/riscv/kernel/cpu.c | 67 ++++-
arch/riscv/kernel/cpufeature.c | 222 +++++++++++++----
arch/riscv/kernel/entry.S | 8 +-
arch/riscv/kernel/head.S | 41 ++-
arch/riscv/kernel/hibernate-asm.S | 5 +-
arch/riscv/kernel/hibernate.c | 1 -
arch/riscv/kernel/irq.c | 68 +++++
arch/riscv/kernel/probes/uprobes.c | 2 +
arch/riscv/kernel/process.c | 20 ++
arch/riscv/kernel/ptrace.c | 70 ++++++
arch/riscv/kernel/setup.c | 14 +-
arch/riscv/kernel/signal.c | 220 +++++++++++++---
arch/riscv/kernel/smpboot.c | 86 ++++++-
arch/riscv/kernel/sys_riscv.c | 52 +++-
arch/riscv/kernel/time.c | 25 +-
arch/riscv/kernel/traps.c | 61 ++++-
arch/riscv/kernel/vdso/rt_sigreturn.S | 2 +-
arch/riscv/kernel/vector.c | 276 +++++++++++++++++++++
arch/riscv/kvm/Makefile | 1 +
arch/riscv/kvm/vcpu.c | 25 ++
arch/riscv/kvm/vcpu_vector.c | 186 ++++++++++++++
arch/riscv/mm/Makefile | 3 +-
arch/riscv/mm/fault.c | 49 ++--
arch/riscv/mm/init.c | 58 +++++
drivers/acpi/Makefile | 2 +
drivers/acpi/osl.c | 2 +-
drivers/acpi/processor_core.c | 29 +++
drivers/acpi/riscv/Makefile | 2 +
drivers/acpi/riscv/rhct.c | 83 +++++++
drivers/acpi/tables.c | 10 +
drivers/clocksource/timer-riscv.c | 92 ++++---
drivers/crypto/hisilicon/qm.c | 5 +
drivers/irqchip/irq-riscv-intc.c | 70 ++++--
drivers/perf/riscv_pmu_sbi.c | 23 +-
drivers/platform/surface/aggregator/Kconfig | 2 +-
include/uapi/linux/elf.h | 1 +
include/uapi/linux/prctl.h | 11 +
kernel/sys.c | 12 +
tools/testing/selftests/riscv/Makefile | 2 +-
tools/testing/selftests/riscv/hwprobe/.gitignore | 1 +
tools/testing/selftests/riscv/vector/.gitignore | 2 +
tools/testing/selftests/riscv/vector/Makefile | 15 ++
.../selftests/riscv/vector/vstate_exec_nolibc.c | 111 +++++++++
.../testing/selftests/riscv/vector/vstate_prctl.c | 189 ++++++++++++++
78 files changed, 3077 insertions(+), 251 deletions(-)
create mode 100644 Documentation/riscv/vector.rst
create mode 100644 arch/riscv/include/asm/acenv.h
create mode 100644 arch/riscv/include/asm/acpi.h
create mode 100644 arch/riscv/include/asm/cpu.h
create mode 100644 arch/riscv/include/asm/irq_stack.h
create mode 100644 arch/riscv/include/asm/kvm_vcpu_vector.h
create mode 100644 arch/riscv/include/asm/vector.h
create mode 100644 arch/riscv/kernel/acpi.c
create mode 100644 arch/riscv/kernel/vector.c
create mode 100644 arch/riscv/kvm/vcpu_vector.c
create mode 100644 drivers/acpi/riscv/Makefile
create mode 100644 drivers/acpi/riscv/rhct.c
create mode 100644 tools/testing/selftests/riscv/hwprobe/.gitignore
create mode 100644 tools/testing/selftests/riscv/vector/.gitignore
create mode 100644 tools/testing/selftests/riscv/vector/Makefile
create mode 100644 tools/testing/selftests/riscv/vector/vstate_exec_nolibc.c
create mode 100644 tools/testing/selftests/riscv/vector/vstate_prctl.c
On Fri, 30 Jun 2023 at 08:40, Palmer Dabbelt <[email protected]> wrote:
>
> There's one merge conflict in MAINTAINERS
Yes, but your suggested resolution is wrong. That "ACPI SERIAL ..."
entry was moved downwards to be in the right place alphabetically, so
the entry next to your new RISC-V entry actually needs to be removed.
You seem to just have kept it, so your resolution caused a dup.
The hint from git is the '++' at the beginning of the line:
> ++ACPI SERIAL MULTI INSTANTIATE DRIVER
> ++M: Hans de Goede <[email protected]>
> ++L: [email protected]
> ++S: Maintained
> ++F: drivers/platform/x86/serial-multi-instantiate.c
> ++
which means that git thinks that your merge added those lines from
thin air (ie they didn't exist in either parent).
NOTE! A '++' line is not a sign of a mis-merge in general. It is
*purely* a hint. It happens for perfectly fine merges when you either
end up moving lines around enough that git doesn't see where they came
from.
Or, perhaps more commonly, when the merge conflict was due to both
sides changing the same exact same code, and the merge resolution
comes from neither one directly, but is new code that has combinations
of both changes.
Anyway, don't worry about it, I appreciate the heads-up regardless and
I always do my own merge resolutions. I just decided to try to use
this as a "this is how git works" moment.
Basically, trivial merges where things were just added or removed next
to each other will normally not result in "++" or "--" lines, so it
can be a hint that something went wrong if you *thought* your merge
was trivial, but git gives that kind of output for the end result.
But don't think that "++" means "wrong". It really is just a sign that
maybe the merge resolution needed a lot of care. And sometimes it's
entirely a false positive - if git *really* understood merges 100%
correctly all the time, we'd never need any manual conflict resolution
at all ;)
Linus
The pull request you sent on Fri, 30 Jun 2023 08:40:50 -0700 (PDT):
> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.5-mw1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/533925cb760431cb496a8c965cfd765a1a21d37e
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
On Fri, 30 Jun 2023 09:46:39 PDT (-0700), Linus Torvalds wrote:
> On Fri, 30 Jun 2023 at 08:40, Palmer Dabbelt <[email protected]> wrote:
>>
>> There's one merge conflict in MAINTAINERS
>
> Yes, but your suggested resolution is wrong. That "ACPI SERIAL ..."
> entry was moved downwards to be in the right place alphabetically, so
> the entry next to your new RISC-V entry actually needs to be removed.
>
> You seem to just have kept it, so your resolution caused a dup.
Ah, sorry -- I didn't look all that closely because it was just a
MAINTAINERS update and I knew you just take these all as hints...
>
> The hint from git is the '++' at the beginning of the line:
>
>> ++ACPI SERIAL MULTI INSTANTIATE DRIVER
>> ++M: Hans de Goede <[email protected]>
>> ++L: [email protected]
>> ++S: Maintained
>> ++F: drivers/platform/x86/serial-multi-instantiate.c
>> ++
>
> which means that git thinks that your merge added those lines from
> thin air (ie they didn't exist in either parent).
>
> NOTE! A '++' line is not a sign of a mis-merge in general. It is
> *purely* a hint. It happens for perfectly fine merges when you either
> end up moving lines around enough that git doesn't see where they came
> from.
>
> Or, perhaps more commonly, when the merge conflict was due to both
> sides changing the same exact same code, and the merge resolution
> comes from neither one directly, but is new code that has combinations
> of both changes.
>
> Anyway, don't worry about it, I appreciate the heads-up regardless and
> I always do my own merge resolutions. I just decided to try to use
... and ya, I figured it was better to just send it anyway.
> this as a "this is how git works" moment.
Awesome, thanks. I poke around the git merge resolution stuff, but I'm
never 100% sure so I usually just look at the resulting output files and
then just paste in whatever git says as a heads up ;)
> Basically, trivial merges where things were just added or removed next
> to each other will normally not result in "++" or "--" lines, so it
> can be a hint that something went wrong if you *thought* your merge
> was trivial, but git gives that kind of output for the end result.
>
> But don't think that "++" means "wrong". It really is just a sign that
> maybe the merge resolution needed a lot of care. And sometimes it's
> entirely a false positive - if git *really* understood merges 100%
> correctly all the time, we'd never need any manual conflict resolution
> at all ;)
OK, I think that makes sense. Hopefully I can remember next time one
comes up.
>
> Linus
On Fri, 30 Jun 2023 at 11:47, Palmer Dabbelt <[email protected]> wrote:
>
> Awesome, thanks. I poke around the git merge resolution stuff, but I'm
> never 100% sure so I usually just look at the resulting output files and
> then just paste in whatever git says as a heads up ;)
Yup. It's one reason I really prefer to do merges myself - I just have
done *so* many of them over the years (and did them long before git
made them much easier) that I can usually do them in my sleep.
Which obviously doesn't mean I then necessarily always get them right,
but I tend to have a higher success rate just because I'm so used to
them.
Regardless, I like seeing the heads-up for merge conflicts in the pull
requests, if for no other reason than the fact that it sets my
expectations for what I'm going to see.
For example, sometimes it means that I decide I'll just go make a cup
of coffee before tackling the merge at all... Not for something this
trivial, but you get the idea.
Linus
On Fri, 30 Jun 2023 11:54:35 PDT (-0700), Linus Torvalds wrote:
> On Fri, 30 Jun 2023 at 11:47, Palmer Dabbelt <[email protected]> wrote:
>>
>> Awesome, thanks. I poke around the git merge resolution stuff, but I'm
>> never 100% sure so I usually just look at the resulting output files and
>> then just paste in whatever git says as a heads up ;)
>
> Yup. It's one reason I really prefer to do merges myself - I just have
> done *so* many of them over the years (and did them long before git
> made them much easier) that I can usually do them in my sleep.
>
> Which obviously doesn't mean I then necessarily always get them right,
> but I tend to have a higher success rate just because I'm so used to
> them.
That's great with me, I don't do a lot of merge resolving so it's always
a bit of a special thing.
> Regardless, I like seeing the heads-up for merge conflicts in the pull
> requests, if for no other reason than the fact that it sets my
> expectations for what I'm going to see.
>
> For example, sometimes it means that I decide I'll just go make a cup
> of coffee before tackling the merge at all... Not for something this
> trivial, but you get the idea.
OK, I'll just keep doing things this way and hopefully it stays fine ;)
>
> Linus
Hello:
This pull request was applied to riscv/linux.git (fixes)
by Linus Torvalds <[email protected]>:
On Fri, 30 Jun 2023 08:40:50 -0700 (PDT) you wrote:
> The following changes since commit ac9a78681b921877518763ba0e89202254349d1b:
>
> Linux 6.4-rc1 (2023-05-07 13:34:35 -0700)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.5-mw1
>
> [...]
Here is the summary with links:
- [GIT,PULL] RISC-V Patches for the 6.5 Merge Window, Part 1
https://git.kernel.org/riscv/c/533925cb7604
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html