Skip to content

Commit 5804c19

Browse files
bonzinibonzini
committed
Merge tag 'kvm-riscv-fixes-6.6-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv fixes for 6.6, take #1 - Fix KVM_GET_REG_LIST API for ISA_EXT registers - Fix reading ISA_EXT register of a missing extension - Fix ISA_EXT register handling in get-reg-list test - Fix filtering of AIA registers in get-reg-list test
2 parents 916e3e5 + 071ef07 commit 5804c19

File tree

350 files changed

+2321
-1241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+2321
-1241
lines changed

‎Documentation/filesystems/btrfs.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ For more information please refer to the documentation site or wiki
3737

3838
https://btrfs.readthedocs.io
3939

40-
https://btrfs.wiki.kernel.org
4140

4241
that maintains information about administration tasks, frequently asked
4342
questions, use cases, mount options, comprehensible changelogs, features,

‎Documentation/process/embargoed-hardware-issues.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ an involved disclosed party. The current ambassadors list:
251251
IBM Z Christian Borntraeger <borntraeger@de.ibm.com>
252252
Intel Tony Luck <tony.luck@intel.com>
253253
Qualcomm Trilok Soni <tsoni@codeaurora.org>
254+
RISC-V Palmer Dabbelt <palmer@dabbelt.com>
254255
Samsung Javier González <javier.gonz@samsung.com>
255256

256257
Microsoft James Morris <jamorris@linux.microsoft.com>

‎MAINTAINERS

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1855,7 +1855,7 @@ F: Documentation/devicetree/bindings/phy/amlogic*
18551855
F: arch/arm/boot/dts/amlogic/
18561856
F: arch/arm/mach-meson/
18571857
F: arch/arm64/boot/dts/amlogic/
1858-
F: drivers/genpd/amlogic/
1858+
F: drivers/pmdomain/amlogic/
18591859
F: drivers/mmc/host/meson*
18601860
F: drivers/phy/amlogic/
18611861
F: drivers/pinctrl/meson/
@@ -1918,7 +1918,7 @@ F: drivers/bluetooth/hci_bcm4377.c
19181918
F: drivers/clk/clk-apple-nco.c
19191919
F: drivers/cpufreq/apple-soc-cpufreq.c
19201920
F: drivers/dma/apple-admac.c
1921-
F: drivers/genpd/apple/
1921+
F: drivers/pmdomain/apple/
19221922
F: drivers/i2c/busses/i2c-pasemi-core.c
19231923
F: drivers/i2c/busses/i2c-pasemi-platform.c
19241924
F: drivers/iommu/apple-dart.c
@@ -2435,7 +2435,7 @@ F: arch/arm/mach-ux500/
24352435
F: drivers/clk/clk-nomadik.c
24362436
F: drivers/clocksource/clksrc-dbx500-prcmu.c
24372437
F: drivers/dma/ste_dma40*
2438-
F: drivers/genpd/st/ste-ux500-pm-domain.c
2438+
F: drivers/pmdomain/st/ste-ux500-pm-domain.c
24392439
F: drivers/hwspinlock/u8500_hsem.c
24402440
F: drivers/i2c/busses/i2c-nomadik.c
24412441
F: drivers/iio/adc/ab8500-gpadc.c
@@ -2598,7 +2598,7 @@ F: arch/arm/include/debug/renesas-scif.S
25982598
F: arch/arm/mach-shmobile/
25992599
F: arch/arm64/boot/dts/renesas/
26002600
F: arch/riscv/boot/dts/renesas/
2601-
F: drivers/genpd/renesas/
2601+
F: drivers/pmdomain/renesas/
26022602
F: drivers/soc/renesas/
26032603
F: include/linux/soc/renesas/
26042604
K: \brenesas,
@@ -4026,7 +4026,7 @@ F: arch/mips/kernel/*bmips*
40264026
F: drivers/irqchip/irq-bcm63*
40274027
F: drivers/irqchip/irq-bcm7*
40284028
F: drivers/irqchip/irq-brcmstb*
4029-
F: drivers/genpd/bcm/bcm63xx-power.c
4029+
F: drivers/pmdomain/bcm/bcm63xx-power.c
40304030
F: include/linux/bcm963xx_nvram.h
40314031
F: include/linux/bcm963xx_tag.h
40324032

@@ -4248,7 +4248,7 @@ R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
42484248
L: linux-pm@vger.kernel.org
42494249
S: Maintained
42504250
T: git https://github.com/broadcom/stblinux.git
4251-
F: drivers/genpd/bcm/bcm-pmb.c
4251+
F: drivers/pmdomain/bcm/bcm-pmb.c
42524252
F: include/dt-bindings/soc/bcm-pmb.h
42534253

42544254
BROADCOM SPECIFIC AMBA DRIVER (BCMA)
@@ -4378,7 +4378,6 @@ M: David Sterba <dsterba@suse.com>
43784378
L: linux-btrfs@vger.kernel.org
43794379
S: Maintained
43804380
W: https://btrfs.readthedocs.io
4381-
W: https://btrfs.wiki.kernel.org/
43824381
Q: https://patchwork.kernel.org/project/linux-btrfs/list/
43834382
C: irc://irc.libera.chat/btrfs
43844383
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
@@ -8729,7 +8728,7 @@ M: Ulf Hansson <ulf.hansson@linaro.org>
87298728
L: linux-pm@vger.kernel.org
87308729
S: Supported
87318730
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
8732-
F: drivers/genpd/
8731+
F: drivers/pmdomain/
87338732

87348733
GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
87358734
M: Eugen Hristev <eugen.hristev@microchip.com>
@@ -17680,7 +17679,7 @@ L: linux-pm@vger.kernel.org
1768017679
L: linux-arm-msm@vger.kernel.org
1768117680
S: Maintained
1768217681
F: Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
17683-
F: drivers/genpd/qcom/cpr.c
17682+
F: drivers/pmdomain/qcom/cpr.c
1768417683

1768517684
QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
1768617685
M: Ilia Lin <ilia.lin@kernel.org>
@@ -20514,7 +20513,7 @@ STARFIVE JH71XX PMU CONTROLLER DRIVER
2051420513
M: Walker Chen <walker.chen@starfivetech.com>
2051520514
S: Supported
2051620515
F: Documentation/devicetree/bindings/power/starfive*
20517-
F: drivers/genpd/starfive/jh71xx-pmu.c
20516+
F: drivers/pmdomain/starfive/jh71xx-pmu.c
2051820517
F: include/dt-bindings/power/starfive,jh7110-pmu.h
2051920518

2052020519
STARFIVE SOC DRIVERS
@@ -21339,7 +21338,7 @@ F: drivers/irqchip/irq-ti-sci-inta.c
2133921338
F: drivers/irqchip/irq-ti-sci-intr.c
2134021339
F: drivers/reset/reset-ti-sci.c
2134121340
F: drivers/soc/ti/ti_sci_inta_msi.c
21342-
F: drivers/genpd/ti/ti_sci_pm_domains.c
21341+
F: drivers/pmdomain/ti/ti_sci_pm_domains.c
2134321342
F: include/dt-bindings/soc/ti,sci_pm_domain.h
2134421343
F: include/linux/soc/ti/ti_sci_inta_msi.h
2134521344
F: include/linux/soc/ti/ti_sci_protocol.h
@@ -21581,7 +21580,7 @@ L: linux-kernel@vger.kernel.org
2158121580
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2158221581
S: Maintained
2158321582
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
21584-
F: drivers/genpd/ti/omap_prm.c
21583+
F: drivers/pmdomain/ti/omap_prm.c
2158521584
F: drivers/soc/ti/*
2158621585

2158721586
TI LM49xxx FAMILY ASoC CODEC DRIVERS

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 6
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

‎arch/parisc/include/asm/cache.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ extern int split_tlb;
3737
extern int dcache_stride;
3838
extern int icache_stride;
3939
extern struct pdc_cache_info cache_info;
40+
extern struct pdc_btlb_info btlb_info;
4041
void parisc_setup_cache_timing(void);
4142

4243
#define pdtlb(sr, addr) asm volatile("pdtlb 0(%%sr%0,%1)" \

‎arch/parisc/include/asm/mckinley.h

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎arch/parisc/include/asm/pdc.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ int pdc_model_capabilities(unsigned long *capabilities);
4444
int pdc_model_platform_info(char *orig_prod_num, char *current_prod_num, char *serial_no);
4545
int pdc_cache_info(struct pdc_cache_info *cache);
4646
int pdc_spaceid_bits(unsigned long *space_bits);
47-
#ifndef CONFIG_PA20
4847
int pdc_btlb_info(struct pdc_btlb_info *btlb);
48+
int pdc_btlb_insert(unsigned long long vpage, unsigned long physpage, unsigned long len,
49+
unsigned long entry_info, unsigned long slot);
50+
int pdc_btlb_purge_all(void);
4951
int pdc_mem_map_hpa(struct pdc_memory_map *r_addr, struct pdc_module_path *mod_path);
50-
#endif /* !CONFIG_PA20 */
5152
int pdc_pim_toc11(struct pdc_toc_pim_11 *ret);
5253
int pdc_pim_toc20(struct pdc_toc_pim_20 *ret);
5354
int pdc_lan_station_id(char *lan_addr, unsigned long net_hpa);

‎arch/parisc/include/asm/processor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ extern void do_syscall_trace_exit(struct pt_regs *);
310310
struct seq_file;
311311
extern void early_trap_init(void);
312312
extern void collect_boot_cpu_data(void);
313+
extern void btlb_init_per_cpu(void);
313314
extern int show_cpuinfo (struct seq_file *m, void *v);
314315

315316
/* driver code in driver/parisc */

‎arch/parisc/include/asm/ropes.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
struct ioc {
3030
void __iomem *ioc_hpa; /* I/O MMU base address */
3131
char *res_map; /* resource map, bit == pdir entry */
32-
u64 *pdir_base; /* physical base address */
32+
__le64 *pdir_base; /* physical base address */
3333
unsigned long ibase; /* pdir IOV Space base - shared w/lba_pci */
3434
unsigned long imask; /* pdir IOV Space mask - shared w/lba_pci */
3535
#ifdef ZX1_SUPPORT
@@ -86,6 +86,9 @@ struct sba_device {
8686
struct ioc ioc[MAX_IOC];
8787
};
8888

89+
/* list of SBA's in system, see drivers/parisc/sba_iommu.c */
90+
extern struct sba_device *sba_list;
91+
8992
#define ASTRO_RUNWAY_PORT 0x582
9093
#define IKE_MERCED_PORT 0x803
9194
#define REO_MERCED_PORT 0x804
@@ -110,7 +113,7 @@ static inline int IS_PLUTO(struct parisc_device *d) {
110113

111114
#define SBA_PDIR_VALID_BIT 0x8000000000000000ULL
112115

113-
#define SBA_AGPGART_COOKIE 0x0000badbadc0ffeeULL
116+
#define SBA_AGPGART_COOKIE (__force __le64) 0x0000badbadc0ffeeULL
114117

115118
#define SBA_FUNC_ID 0x0000 /* function id */
116119
#define SBA_FCLASS 0x0008 /* function class, bist, header, rev... */

‎arch/parisc/include/asm/shmparam.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
#ifndef _ASMPARISC_SHMPARAM_H
33
#define _ASMPARISC_SHMPARAM_H
44

5+
/*
6+
* PA-RISC uses virtually indexed & physically tagged (VIPT) caches
7+
* which has strict requirements when two pages to the same physical
8+
* address are accessed through different mappings. Read the section
9+
* "Address Aliasing" in the arch docs for more detail:
10+
* PA-RISC 1.1 (page 3-6):
11+
* https://parisc.wiki.kernel.org/images-parisc/6/68/Pa11_acd.pdf
12+
* PA-RISC 2.0 (page F-5):
13+
* https://parisc.wiki.kernel.org/images-parisc/7/73/Parisc2.0.pdf
14+
*
15+
* For Linux we allow kernel and userspace to map pages on page size
16+
* granularity (SHMLBA) but have to ensure that, if two pages are
17+
* mapped to the same physical address, the virtual and physical
18+
* addresses modulo SHM_COLOUR are identical.
19+
*/
520
#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
621
#define SHM_COLOUR 0x00400000 /* shared mappings colouring */
722

0 commit comments

Comments
 (0)