[PATCH v2 1/2] powerpc/kvm: Remove unused macros from asm-offset

[Nicholas Piggin]

On Fri Sep 16, 2022 at 8:57 PM AEST, Disha Goel wrote:
> The kvm code was refactored to convert some of kvm assembly routines to C.
> This includes commits which moved code path for the kvm guest entry/exit
> for p7/8 from aseembly to C. As part of the code changes, usage of some of
> the macros were removed. But definitions still exist in the assembly files.
> Commits are listed below:
>
> Commit 2e1ae9cd56f8 ("KVM: PPC: Book3S HV: Implement radix prefetch workaround by disabling MMU")
> Commit 9769a7fd79b6 ("KVM: PPC: Book3S HV: Remove radix guest support from P7/8 path")
> Commit fae5c9f3664b ("KVM: PPC: Book3S HV: remove ISA v3.0 and v3.1 support from P7/8 path")
> Commit 57dc0eed73ca ("KVM: PPC: Book3S HV P9: Implement PMU save/restore in C")
>
> Many of the asm-offset macro definitions were missed to remove. Patch
> fixes by removing the unused macros.
>
> Signed-off-by: Disha Goel <disgoel at linux.vnet.ibm.com>

Thanks, good cleanup.

Reviewed-by: Nicholas Piggin <npiggin at gmail.com>

> ---
>  arch/powerpc/kernel/asm-offsets.c | 25 -------------------------
>  1 file changed, 25 deletions(-)
>
> diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
> index 8c10f536e478..95744e7c056d 100644
> --- a/arch/powerpc/kernel/asm-offsets.c
> +++ b/arch/powerpc/kernel/asm-offsets.c
> @@ -418,21 +418,18 @@ int main(void)
>  
>  	/* book3s */
>  #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
> -	OFFSET(KVM_TLB_SETS, kvm, arch.tlb_sets);
>  	OFFSET(KVM_SDR1, kvm, arch.sdr1);
>  	OFFSET(KVM_HOST_LPID, kvm, arch.host_lpid);
>  	OFFSET(KVM_HOST_LPCR, kvm, arch.host_lpcr);
>  	OFFSET(KVM_HOST_SDR1, kvm, arch.host_sdr1);
>  	OFFSET(KVM_ENABLED_HCALLS, kvm, arch.enabled_hcalls);
>  	OFFSET(KVM_VRMA_SLB_V, kvm, arch.vrma_slb_v);
> -	OFFSET(KVM_RADIX, kvm, arch.radix);
>  	OFFSET(KVM_SECURE_GUEST, kvm, arch.secure_guest);
>  	OFFSET(VCPU_DSISR, kvm_vcpu, arch.shregs.dsisr);
>  	OFFSET(VCPU_DAR, kvm_vcpu, arch.shregs.dar);
>  	OFFSET(VCPU_VPA, kvm_vcpu, arch.vpa.pinned_addr);
>  	OFFSET(VCPU_VPA_DIRTY, kvm_vcpu, arch.vpa.dirty);
>  	OFFSET(VCPU_HEIR, kvm_vcpu, arch.emul_inst);
> -	OFFSET(VCPU_NESTED, kvm_vcpu, arch.nested);
>  	OFFSET(VCPU_CPU, kvm_vcpu, cpu);
>  	OFFSET(VCPU_THREAD_CPU, kvm_vcpu, arch.thread_cpu);
>  #endif
> @@ -449,16 +446,12 @@ int main(void)
>  	OFFSET(VCPU_DABRX, kvm_vcpu, arch.dabrx);
>  	OFFSET(VCPU_DAWR0, kvm_vcpu, arch.dawr0);
>  	OFFSET(VCPU_DAWRX0, kvm_vcpu, arch.dawrx0);
> -	OFFSET(VCPU_DAWR1, kvm_vcpu, arch.dawr1);
> -	OFFSET(VCPU_DAWRX1, kvm_vcpu, arch.dawrx1);
>  	OFFSET(VCPU_CIABR, kvm_vcpu, arch.ciabr);
>  	OFFSET(VCPU_HFLAGS, kvm_vcpu, arch.hflags);
>  	OFFSET(VCPU_DEC_EXPIRES, kvm_vcpu, arch.dec_expires);
>  	OFFSET(VCPU_PENDING_EXC, kvm_vcpu, arch.pending_exceptions);
>  	OFFSET(VCPU_CEDED, kvm_vcpu, arch.ceded);
>  	OFFSET(VCPU_PRODDED, kvm_vcpu, arch.prodded);
> -	OFFSET(VCPU_IRQ_PENDING, kvm_vcpu, arch.irq_pending);
> -	OFFSET(VCPU_DBELL_REQ, kvm_vcpu, arch.doorbell_request);
>  	OFFSET(VCPU_MMCR, kvm_vcpu, arch.mmcr);
>  	OFFSET(VCPU_MMCRA, kvm_vcpu, arch.mmcra);
>  	OFFSET(VCPU_MMCRS, kvm_vcpu, arch.mmcrs);
> @@ -486,8 +479,6 @@ int main(void)
>  	OFFSET(VCPU_TCSCR, kvm_vcpu, arch.tcscr);
>  	OFFSET(VCPU_ACOP, kvm_vcpu, arch.acop);
>  	OFFSET(VCPU_WORT, kvm_vcpu, arch.wort);
> -	OFFSET(VCPU_TID, kvm_vcpu, arch.tid);
> -	OFFSET(VCPU_PSSCR, kvm_vcpu, arch.psscr);
>  	OFFSET(VCPU_HFSCR, kvm_vcpu, arch.hfscr);
>  	OFFSET(VCORE_ENTRY_EXIT, kvmppc_vcore, entry_exit_map);
>  	OFFSET(VCORE_IN_GUEST, kvmppc_vcore, in_guest);
> @@ -582,8 +573,6 @@ int main(void)
>  	HSTATE_FIELD(HSTATE_HWTHREAD_STATE, hwthread_state);
>  	HSTATE_FIELD(HSTATE_KVM_VCPU, kvm_vcpu);
>  	HSTATE_FIELD(HSTATE_KVM_VCORE, kvm_vcore);
> -	HSTATE_FIELD(HSTATE_XIVE_TIMA_PHYS, xive_tima_phys);
> -	HSTATE_FIELD(HSTATE_XIVE_TIMA_VIRT, xive_tima_virt);
>  	HSTATE_FIELD(HSTATE_HOST_IPI, host_ipi);
>  	HSTATE_FIELD(HSTATE_PTID, ptid);
>  	HSTATE_FIELD(HSTATE_FAKE_SUSPEND, fake_suspend);
> @@ -594,9 +583,6 @@ int main(void)
>  	HSTATE_FIELD(HSTATE_SDAR, host_mmcr[4]);
>  	HSTATE_FIELD(HSTATE_MMCR2, host_mmcr[5]);
>  	HSTATE_FIELD(HSTATE_SIER, host_mmcr[6]);
> -	HSTATE_FIELD(HSTATE_MMCR3, host_mmcr[7]);
> -	HSTATE_FIELD(HSTATE_SIER2, host_mmcr[8]);
> -	HSTATE_FIELD(HSTATE_SIER3, host_mmcr[9]);
>  	HSTATE_FIELD(HSTATE_PMC1, host_pmc[0]);
>  	HSTATE_FIELD(HSTATE_PMC2, host_pmc[1]);
>  	HSTATE_FIELD(HSTATE_PMC3, host_pmc[2]);
> @@ -672,17 +658,6 @@ int main(void)
>  	OFFSET(VCPU_HOST_MAS6, kvm_vcpu, arch.host_mas6);
>  #endif
>  
> -#ifdef CONFIG_KVM_XICS
> -	DEFINE(VCPU_XIVE_SAVED_STATE, offsetof(struct kvm_vcpu,
> -					       arch.xive_saved_state));
> -	DEFINE(VCPU_XIVE_CAM_WORD, offsetof(struct kvm_vcpu,
> -					    arch.xive_cam_word));
> -	DEFINE(VCPU_XIVE_PUSHED, offsetof(struct kvm_vcpu, arch.xive_pushed));
> -	DEFINE(VCPU_XIVE_ESC_ON, offsetof(struct kvm_vcpu, arch.xive_esc_on));
> -	DEFINE(VCPU_XIVE_ESC_RADDR, offsetof(struct kvm_vcpu, arch.xive_esc_raddr));
> -	DEFINE(VCPU_XIVE_ESC_VADDR, offsetof(struct kvm_vcpu, arch.xive_esc_vaddr));
> -#endif
> -
>  #ifdef CONFIG_KVM_EXIT_TIMING
>  	OFFSET(VCPU_TIMING_EXIT_TBU, kvm_vcpu, arch.timing_exit.tv32.tbu);
>  	OFFSET(VCPU_TIMING_EXIT_TBL, kvm_vcpu, arch.timing_exit.tv32.tbl);
> -- 
> 2.31.1