change otg to host mode

hc

2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777

 kernel/arch/powerpc/kvm/book3s_hv_rm_xics.c
..
..
@@ -1,16 +1,14 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright 2012 Michael Ellerman, IBM Corporation.
3
4
  * Copyright 2012 Benjamin Herrenschmidt, IBM Corporation
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License, version 2, as
7
- * published by the Free Software Foundation.
8
5
  */
9
6
 
10
7
 #include <linux/kernel.h>
11
8
 #include <linux/kvm_host.h>
12
9
 #include <linux/err.h>
13
10
 #include <linux/kernel_stat.h>
11
+#include <linux/pgtable.h>
14
12
 
15
13
 #include <asm/kvm_book3s.h>
16
14
 #include <asm/kvm_ppc.h>
..
..
@@ -18,7 +16,6 @@
18
16
 #include <asm/xics.h>
19
17
 #include <asm/synch.h>
20
18
 #include <asm/cputhreads.h>
21
-#include <asm/pgtable.h>
22
19
 #include <asm/ppc-opcode.h>
23
20
 #include <asm/pnv-pci.h>
24
21
 #include <asm/opal.h>
..
..
@@ -136,11 +133,18 @@
136
133
 
137
134
 	/* Mark the target VCPU as having an interrupt pending */
138
135
 	vcpu->stat.queue_intr++;
139
-	set_bit(BOOK3S_IRQPRIO_EXTERNAL_LEVEL, &vcpu->arch.pending_exceptions);
136
+	set_bit(BOOK3S_IRQPRIO_EXTERNAL, &vcpu->arch.pending_exceptions);
140
137
 
141
138
 	/* Kick self ? Just set MER and return */
142
139
 	if (vcpu == this_vcpu) {
143
140
 		mtspr(SPRN_LPCR, mfspr(SPRN_LPCR) | LPCR_MER);
141
+		return;
142
+	}
143
+
144
+	if (xive_enabled() && kvmhv_on_pseries()) {
145
+		/* No XICS access or hypercalls available, too hard */
146
+		this_icp->rm_action |= XICS_RM_KICK_VCPU;
147
+		this_icp->rm_kick_target = vcpu;
144
148
 		return;
145
149
 	}
146
150
 
..
..
@@ -170,8 +174,7 @@
170
174
 static void icp_rm_clr_vcpu_irq(struct kvm_vcpu *vcpu)
171
175
 {
172
176
 	/* Note: Only called on self ! */
173
-	clear_bit(BOOK3S_IRQPRIO_EXTERNAL_LEVEL,
174
-		  &vcpu->arch.pending_exceptions);
177
+	clear_bit(BOOK3S_IRQPRIO_EXTERNAL, &vcpu->arch.pending_exceptions);
175
178
 	mtspr(SPRN_LPCR, mfspr(SPRN_LPCR) & ~LPCR_MER);
176
179
 }
177
180
 
..
..
@@ -761,12 +764,20 @@
761
764
 	return ics_rm_eoi(vcpu, irq);
762
765
 }
763
766
 
764
-unsigned long eoi_rc;
767
+static unsigned long eoi_rc;
765
768
 
766
769
 static void icp_eoi(struct irq_chip *c, u32 hwirq, __be32 xirr, bool *again)
767
770
 {
768
771
 	void __iomem *xics_phys;
769
772
 	int64_t rc;
773
+
774
+	if (kvmhv_on_pseries()) {
775
+		unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
776
+
777
+		iosync();
778
+		plpar_hcall_raw(H_EOI, retbuf, hwirq);
779
+		return;
780
+	}
770
781
 
771
782
 	rc = pnv_opal_pci_msi_eoi(c, hwirq);
772
783
 
..
..
@@ -808,7 +819,7 @@
808
819
 	raddr = per_cpu_ptr(addr, cpu);
809
820
 	l = (unsigned long)raddr;
810
821
 
811
-	if (REGION_ID(l) == VMALLOC_REGION_ID) {
822
+	if (get_region_id(l) == VMALLOC_REGION_ID) {
812
823
 		l = vmalloc_to_phys(raddr);
813
824
 		raddr = (unsigned int *)l;
814
825
 	}