From patchwork Wed May 4 19:09:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 67166 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp357319qge; Wed, 4 May 2016 12:10:35 -0700 (PDT) X-Received: by 10.98.66.80 with SMTP id p77mr14437487pfa.75.1462389035696; Wed, 04 May 2016 12:10:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w5si6152380pfi.174.2016.05.04.12.10.35; Wed, 04 May 2016 12:10:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754147AbcEDTK3 (ORCPT + 29 others); Wed, 4 May 2016 15:10:29 -0400 Received: from mail-by2on0061.outbound.protection.outlook.com ([207.46.100.61]:48768 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753526AbcEDTKZ (ORCPT ); Wed, 4 May 2016 15:10:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=C+QuQReQwkLHT49snYOPBGlK11TVXlz/oIGdLfm8DzU=; b=YJdYs99ojBFdE1hw1+9z4ZzJ2y9+MKsqzKpxtio2VmE4UslM5zultwtBWXvazUfYMT9YHBI0kn+g5DmBvm+8dABXhbtYanaLVV7RZrrW9tA9fY5p7wz/9k9wYE+gubK7FuVxo7qCeMyKfPezBQakpg6y/d72x7mIewHi6WZU47Q= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none; redhat.com; dmarc=none action=none header.from=amd.com; Received: from ssuthiku-cz-dev.amd.com (165.204.77.1) by BLUPR12MB0433.namprd12.prod.outlook.com (10.162.92.139) with Microsoft SMTP Server (TLS) id 15.1.477.8; Wed, 4 May 2016 19:10:19 +0000 From: Suravee Suthikulpanit To: , , , , , CC: , , , , Suravee Suthikulpanit Subject: [PART1 V5 02/13] KVM: x86: Rename kvm_apic_get_reg to kvm_lapic_get_reg Date: Wed, 4 May 2016 14:09:41 -0500 Message-ID: <1462388992-25242-3-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462388992-25242-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1462388992-25242-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BY2PR21CA0014.namprd21.prod.outlook.com (10.162.74.152) To BLUPR12MB0433.namprd12.prod.outlook.com (10.162.92.139) X-MS-Office365-Filtering-Correlation-Id: 1086ca18-7247-42f5-9652-08d3744fbce5 X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0433; 2:y4RQ4zBxDudGEo4xwrlXesNU35HbwvVyQUQHs+ibmqa9gm9w0PpOcbzIOE5rLc+nsy9E3HLEaiqCB3BBvUm3UuUYmsmFyXAoOHkx/ix6SwFxR7x/y7w6fQJLZNXPaKil9tBMdfRzszg+m4uLZuuvpPnWC2y2fz32Ga+Ome3eHV6/O3dNwUYXr7jSZJTc4o/6; 3:apJUpOYrbGM0nDJs7o4WSjTOMyRHMXRg+Cn9f3nYIrBzgnnFua2rUwkGia7/hpnFo2kQw8hR0kNDXtd2pglfwHYYYl6/Vfdi99pE3P3sIpo2SpLVqC6i6FlAzYpuCbkD; 25:P16fA8OS49FJbcbO9OQN8Mgu/c3QxTMkUIVzh88cQYYEkzjS+z5wvotbgtQoqBMNZXNM7edWlQCos1qsOVQI1y1toxKM6xB+J2a2rfxIgz23h49Ua1YvcFH1LXXjMoSWRM8eJGIpnxQ7m+CMi63+Bfunhc9/6ZcBX20ALTys4uXKsSLeJujpLuMpMgFmS2drYQStavD4Las4fgX/LLpKNrSTF3IOcudVLPJzqBNCXfMhjxzEc6pEztmgST8hFoUCbunyMbuTXoCjgk8UXuYCzri29pm1MN9iuxBqjj29W681+xqsU+vf/bhNovge1WWQ8S/UNhcaykSuVRcwhbs+zQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0433; X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0433; 20:aMyggcLyKnXMPHjC7AuydNHGRmaGwSic0hRLcYlI7iOkxv5nryfvoo9nqs063o4IoT3BAOlRK2lZzWpBw7cXyGcBH2M9ng9KtPYuV84MUir9yc3mh1M+FYjCdkSBrTqX3gcLoFpSYoD1is98nf/6j4OsDFBzqO9tSVfadn/yZKDUsSsM74KajgExrjEjXFkNxrLY/h5Z4iqREAGePfLe5q5sxTDAh3L7W/ofj83xTXPVM5gVYkUAlyeePRKR1z34hz0HHzJJuTLmJXkGq65Xqd0K0nPviFRLMefxqATZnHLlDtpwWSTepbU7CD1T3RGX9CsXu5J3j70VnRNPUwTEC+vtAyO7TcqNszujk36nSqWxWZngNRpt9vLMxzZlSjUijIecvDjOnV59VKIdPZr5zpJLEzNO/beBS51HuMCN4MgtiPSyB3Iu1t097GCGPZKBbqqL8UOzOttZqErvuNL4SKdlLLSvdntUneIFZlr5/eget3pjj+zZcWn4b6YT8O3+; 4:yEZwPt0NJm+42FQp9rP7CZ0OyaxG6UaJPu2Z2Sf+d4Qgu6fLjmrKwBYAUI5lW42KYyENEi3OuLW4RSr2s1CU5859VYioQhlt+kJWp2yyY+xax47CYMiUkc85FkB4aUusAM3+fXpLYLsfeBFKofCpbHuTTk3MHTGjcPnEVD2LVlQQ+a8JvVSvdmE/w5u0U89WvL/SaVYqM+DZUynr2novcxV5hv7SNExZ+9S+QXLFgvzsNbPA7E9Cn93BR6ffImguUEbitJ0SffgpeijsV3eRnuk4IWfoxzRTqdpU5pxXlLmdxdbgGlWCCdFQX/vE4y8jCPav+//ISf+DworhwDA1bUxqfiYibmMMXJjtntxa7HJLEY5wYu71MspTeRla7IrnLcqryhzkrbj7ti1yYuC50jG+utD4tHYBN9IGPVWU+ztteZM6DSVUhWke4MJyk4uZ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101528026)(9101521098)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:BLUPR12MB0433; BCL:0; PCL:0; RULEID:; SRVR:BLUPR12MB0433; X-Forefront-PRVS: 093290AD39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(50986999)(76176999)(50226002)(47776003)(66066001)(229853001)(36756003)(189998001)(19580395003)(19580405001)(2906002)(2950100001)(5003940100001)(53416004)(2201001)(5004730100002)(92566002)(4326007)(5001770100001)(77096005)(586003)(42186005)(5008740100001)(81166005)(48376002)(3846002)(6116002)(575784001)(86362001)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR12MB0433; H:ssuthiku-cz-dev.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0433; 23:s3OIRq9MtgyADd8fJCkPNHjWXIvXju/5xIgot7bgDSqYNHtFkMxD6RAZ3jhGxmCIHOppAmSavgQxIsDCb3JNSiVhDhdLaf5XmbMUO9MH2GGomI66luSMdxyP52+mkRNkN9xV/FxDoydkrXzfFzNQLS3xsGKk4ZrJF/Xj1IWYsjUfd3kbCwkGUzTMIAdx1SjfxLeDRK4AdEt8JS2toscGpZWc7s9cmEgDDG7SrfC13PnZr5VtXX/T7UsbZk1q5DGo6I69Rcy9zFIOJ2KqYQzgt19ul2VAlDX3GDmcax3YW5eg7WBnA9/gni+dMbj+hcSpVfntEmcQnlLu6O+iJNiYqDClYQNtfRrMWUA/WVkFZONDlMjui4Rs96H6I6i43rts8/w5Pjc7iC17a66ZFSNR5dsk5Ej6Uql4Va9SJTfxgmzLYtUd3Z6+MfdFbrYE7d9aiYkkOnvYIuJMdEqCfS+X4ZQgFZN92cbL6W/FutKfnCHtFmOmmDHeCPRN1AINiq6UKDBjoUtmRGMK3P6zNaMltxrdV9vLqJrHAE99XBIJ7JDw6Nl6cjRaE4648ziOI/9AT0kX637xLtoJKmQOj0Mi8QAvk5ByHPTfnffJBbO3xtj1toeKA8Ro7lPN4lDKv8SFKDSrfGId67dn1aoH3t6IOVdvHlqyvGeC64glRNnuzSJSndB41xM19ot8/xXm7eV4ILgpLDCN1TBO1b9RKEgKjLzs7H/pZmRaTvRUEv2K6aHL/0m2MnsnptP9l8PrEvilrk3852fkS7ZVZv/mwJbqefZdN3qtFX4EoIjUc63+Ru3YtSmaEk0KiDxTJmYIWAJZCKMuIcDg1CeG9b6p2Pa+6Q7aoQ5NxC4sNKN+6Rk7KBw6iG2I4Oj7B1nuN38z98eGzW6ABUAWSpwfBK+w6rTg2g== X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0433; 5:9e7dURWLviui15M0lqB9bcs5RWElGs/xShJLPps3GmsfEpn99jiDmlMLGzp5UeEeZEa4tNu7pOYRc/QBPKTGbPDaedNVlxPCEJTT0tx9PZLeTqvRzk9ahg4QaqqK4iq+pKutcGvDv+ySbsW3wIpzxQ==; 24:uKc6rtn4npHjQFrOdXM+M2yk3CXxhPWdSPMMznmAnbiL6d3yNn+iF37RshEhFIx+Io46RLetMruYdbc0thjzh10tsaPjSEQWIKHWP+gcS7I=; 7:6BhL5wtrcAV+eyXF2BgwjAx1FqPqFZTlLkGMUaQ7kqOow4f5Ruz+2nr/BGT3pRkO6xU3MeWiafV4apIkjbrHLs6mcyyxXFD0Q3h60MULqQuKcjFwJuKpIENXPkzGOB0+iKeY+O778UEgxT9GauBKJSr+6lNjT2NEqjQ1OXOsGeQ=; 20:KFupn5/5O3Jemgf3KeKGvokjkIxichzv124OFi73cLi12QQvmJbpz79IY/Jrasrk6d4EtgCXtVFUEfOp3YrEpaO1jGlp3019oqldST6iURt+l28BNrGdoWx0ONurYqRSJ4/DJ/c1JjNkuk2uvVD1M+Qq52t1Klx0NjsKn2/pqYet8dV7njfmBsTObzaOg2yjxSTcQ8FXEEzXYJFQyacTYXaA1XMufDJm3lnQoLoVf0u2i+GU/nNpe/lUseUXBisq X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2016 19:10:19.3053 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR12MB0433 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suravee Suthikulpanit Rename kvm_apic_get_reg to kvm_lapic_get_reg to be consistent with the existing kvm_lapic_set_reg counterpart. Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/ioapic.c | 2 +- arch/x86/kvm/lapic.c | 58 +++++++++++++++++++++++++-------------------------- arch/x86/kvm/lapic.h | 6 +++--- 3 files changed, 33 insertions(+), 33 deletions(-) -- 1.9.1 diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c index 9db4709..5f42d03 100644 --- a/arch/x86/kvm/ioapic.c +++ b/arch/x86/kvm/ioapic.c @@ -443,7 +443,7 @@ static void __kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu, spin_lock(&ioapic->lock); if (trigger_mode != IOAPIC_LEVEL_TRIG || - kvm_apic_get_reg(apic, APIC_SPIV) & APIC_SPIV_DIRECTED_EOI) + kvm_lapic_get_reg(apic, APIC_SPIV) & APIC_SPIV_DIRECTED_EOI) continue; ASSERT(ent->fields.trig_mode == IOAPIC_LEVEL_TRIG); diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index f6f42f6..34c28c0 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -159,7 +159,7 @@ static void recalculate_apic_map(struct kvm *kvm) continue; aid = kvm_apic_id(apic); - ldr = kvm_apic_get_reg(apic, APIC_LDR); + ldr = kvm_lapic_get_reg(apic, APIC_LDR); if (aid < ARRAY_SIZE(new->phys_map)) new->phys_map[aid] = apic; @@ -168,7 +168,7 @@ static void recalculate_apic_map(struct kvm *kvm) new->mode |= KVM_APIC_MODE_X2APIC; } else if (ldr) { ldr = GET_APIC_LOGICAL_ID(ldr); - if (kvm_apic_get_reg(apic, APIC_DFR) == APIC_DFR_FLAT) + if (kvm_lapic_get_reg(apic, APIC_DFR) == APIC_DFR_FLAT) new->mode |= KVM_APIC_MODE_XAPIC_FLAT; else new->mode |= KVM_APIC_MODE_XAPIC_CLUSTER; @@ -233,12 +233,12 @@ static inline void kvm_apic_set_x2apic_id(struct kvm_lapic *apic, u8 id) static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type) { - return !(kvm_apic_get_reg(apic, lvt_type) & APIC_LVT_MASKED); + return !(kvm_lapic_get_reg(apic, lvt_type) & APIC_LVT_MASKED); } static inline int apic_lvt_vector(struct kvm_lapic *apic, int lvt_type) { - return kvm_apic_get_reg(apic, lvt_type) & APIC_VECTOR_MASK; + return kvm_lapic_get_reg(apic, lvt_type) & APIC_VECTOR_MASK; } static inline int apic_lvtt_oneshot(struct kvm_lapic *apic) @@ -525,8 +525,8 @@ static void apic_update_ppr(struct kvm_lapic *apic) u32 tpr, isrv, ppr, old_ppr; int isr; - old_ppr = kvm_apic_get_reg(apic, APIC_PROCPRI); - tpr = kvm_apic_get_reg(apic, APIC_TASKPRI); + old_ppr = kvm_lapic_get_reg(apic, APIC_PROCPRI); + tpr = kvm_lapic_get_reg(apic, APIC_TASKPRI); isr = apic_find_highest_isr(apic); isrv = (isr != -1) ? isr : 0; @@ -577,7 +577,7 @@ static bool kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda) if (kvm_apic_broadcast(apic, mda)) return true; - logical_id = kvm_apic_get_reg(apic, APIC_LDR); + logical_id = kvm_lapic_get_reg(apic, APIC_LDR); if (apic_x2apic_mode(apic)) return ((logical_id >> 16) == (mda >> 16)) @@ -586,7 +586,7 @@ static bool kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda) logical_id = GET_APIC_LOGICAL_ID(logical_id); mda = GET_APIC_DEST_FIELD(mda); - switch (kvm_apic_get_reg(apic, APIC_DFR)) { + switch (kvm_lapic_get_reg(apic, APIC_DFR)) { case APIC_DFR_FLAT: return (logical_id & mda) != 0; case APIC_DFR_CLUSTER: @@ -594,7 +594,7 @@ static bool kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda) && (logical_id & mda & 0xf) != 0; default: apic_debug("Bad DFR vcpu %d: %08x\n", - apic->vcpu->vcpu_id, kvm_apic_get_reg(apic, APIC_DFR)); + apic->vcpu->vcpu_id, kvm_lapic_get_reg(apic, APIC_DFR)); return false; } } @@ -1050,8 +1050,8 @@ EXPORT_SYMBOL_GPL(kvm_apic_set_eoi_accelerated); static void apic_send_ipi(struct kvm_lapic *apic) { - u32 icr_low = kvm_apic_get_reg(apic, APIC_ICR); - u32 icr_high = kvm_apic_get_reg(apic, APIC_ICR2); + u32 icr_low = kvm_lapic_get_reg(apic, APIC_ICR); + u32 icr_high = kvm_lapic_get_reg(apic, APIC_ICR2); struct kvm_lapic_irq irq; irq.vector = icr_low & APIC_VECTOR_MASK; @@ -1088,7 +1088,7 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic) ASSERT(apic != NULL); /* if initial count is 0, current count should also be 0 */ - if (kvm_apic_get_reg(apic, APIC_TMICT) == 0 || + if (kvm_lapic_get_reg(apic, APIC_TMICT) == 0 || apic->lapic_timer.period == 0) return 0; @@ -1145,13 +1145,13 @@ static u32 __apic_read(struct kvm_lapic *apic, unsigned int offset) break; case APIC_PROCPRI: apic_update_ppr(apic); - val = kvm_apic_get_reg(apic, offset); + val = kvm_lapic_get_reg(apic, offset); break; case APIC_TASKPRI: report_tpr_access(apic, false); /* fall thru */ default: - val = kvm_apic_get_reg(apic, offset); + val = kvm_lapic_get_reg(apic, offset); break; } @@ -1227,7 +1227,7 @@ static void update_divide_count(struct kvm_lapic *apic) { u32 tmp1, tmp2, tdcr; - tdcr = kvm_apic_get_reg(apic, APIC_TDCR); + tdcr = kvm_lapic_get_reg(apic, APIC_TDCR); tmp1 = tdcr & 0xf; tmp2 = ((tmp1 & 0x3) | ((tmp1 & 0x8) >> 1)) + 1; apic->divide_count = 0x1 << (tmp2 & 0x7); @@ -1238,7 +1238,7 @@ static void update_divide_count(struct kvm_lapic *apic) static void apic_update_lvtt(struct kvm_lapic *apic) { - u32 timer_mode = kvm_apic_get_reg(apic, APIC_LVTT) & + u32 timer_mode = kvm_lapic_get_reg(apic, APIC_LVTT) & apic->lapic_timer.timer_mode_mask; if (apic->lapic_timer.timer_mode != timer_mode) { @@ -1274,7 +1274,7 @@ static void apic_timer_expired(struct kvm_lapic *apic) static bool lapic_timer_int_injected(struct kvm_vcpu *vcpu) { struct kvm_lapic *apic = vcpu->arch.apic; - u32 reg = kvm_apic_get_reg(apic, APIC_LVTT); + u32 reg = kvm_lapic_get_reg(apic, APIC_LVTT); if (kvm_apic_hw_enabled(apic)) { int vec = reg & APIC_VECTOR_MASK; @@ -1322,7 +1322,7 @@ static void start_apic_timer(struct kvm_lapic *apic) if (apic_lvtt_period(apic) || apic_lvtt_oneshot(apic)) { /* lapic timer in oneshot or periodic mode */ now = apic->lapic_timer.timer.base->get_time(); - apic->lapic_timer.period = (u64)kvm_apic_get_reg(apic, APIC_TMICT) + apic->lapic_timer.period = (u64)kvm_lapic_get_reg(apic, APIC_TMICT) * APIC_BUS_CYCLE_NS * apic->divide_count; if (!apic->lapic_timer.period) @@ -1354,7 +1354,7 @@ static void start_apic_timer(struct kvm_lapic *apic) "timer initial count 0x%x, period %lldns, " "expire @ 0x%016" PRIx64 ".\n", __func__, APIC_BUS_CYCLE_NS, ktime_to_ns(now), - kvm_apic_get_reg(apic, APIC_TMICT), + kvm_lapic_get_reg(apic, APIC_TMICT), apic->lapic_timer.period, ktime_to_ns(ktime_add_ns(now, apic->lapic_timer.period))); @@ -1443,7 +1443,7 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) case APIC_SPIV: { u32 mask = 0x3ff; - if (kvm_apic_get_reg(apic, APIC_LVR) & APIC_LVR_DIRECTED_EOI) + if (kvm_lapic_get_reg(apic, APIC_LVR) & APIC_LVR_DIRECTED_EOI) mask |= APIC_SPIV_DIRECTED_EOI; apic_set_spiv(apic, val & mask); if (!(val & APIC_SPIV_APIC_ENABLED)) { @@ -1451,7 +1451,7 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) u32 lvt_val; for (i = 0; i < KVM_APIC_LVT_NUM; i++) { - lvt_val = kvm_apic_get_reg(apic, + lvt_val = kvm_lapic_get_reg(apic, APIC_LVTT + 0x10 * i); kvm_lapic_set_reg(apic, APIC_LVTT + 0x10 * i, lvt_val | APIC_LVT_MASKED); @@ -1646,14 +1646,14 @@ void kvm_lapic_set_tpr(struct kvm_vcpu *vcpu, unsigned long cr8) struct kvm_lapic *apic = vcpu->arch.apic; apic_set_tpr(apic, ((cr8 & 0x0f) << 4) - | (kvm_apic_get_reg(apic, APIC_TASKPRI) & 4)); + | (kvm_lapic_get_reg(apic, APIC_TASKPRI) & 4)); } u64 kvm_lapic_get_cr8(struct kvm_vcpu *vcpu) { u64 tpr; - tpr = (u64) kvm_apic_get_reg(vcpu->arch.apic, APIC_TASKPRI); + tpr = (u64) kvm_lapic_get_reg(vcpu->arch.apic, APIC_TASKPRI); return (tpr & 0xf0) >> 4; } @@ -1725,7 +1725,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) if (kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_LINT0_REENABLED)) kvm_lapic_set_reg(apic, APIC_LVT0, SET_APIC_DELIVERY_MODE(0, APIC_MODE_EXTINT)); - apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0)); + apic_manage_nmi_watchdog(apic, kvm_lapic_get_reg(apic, APIC_LVT0)); kvm_lapic_set_reg(apic, APIC_DFR, 0xffffffffU); apic_set_spiv(apic, 0xff); @@ -1785,7 +1785,7 @@ int apic_has_pending_timer(struct kvm_vcpu *vcpu) int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type) { - u32 reg = kvm_apic_get_reg(apic, lvt_type); + u32 reg = kvm_lapic_get_reg(apic, lvt_type); int vector, mode, trig_mode; if (kvm_apic_hw_enabled(apic) && !(reg & APIC_LVT_MASKED)) { @@ -1880,14 +1880,14 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu) apic_update_ppr(apic); highest_irr = apic_find_highest_irr(apic); if ((highest_irr == -1) || - ((highest_irr & 0xF0) <= kvm_apic_get_reg(apic, APIC_PROCPRI))) + ((highest_irr & 0xF0) <= kvm_lapic_get_reg(apic, APIC_PROCPRI))) return -1; return highest_irr; } int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu) { - u32 lvt0 = kvm_apic_get_reg(vcpu->arch.apic, APIC_LVT0); + u32 lvt0 = kvm_lapic_get_reg(vcpu->arch.apic, APIC_LVT0); int r = 0; if (!kvm_apic_hw_enabled(vcpu->arch.apic)) @@ -1953,7 +1953,7 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu, apic_update_ppr(apic); hrtimer_cancel(&apic->lapic_timer.timer); apic_update_lvtt(apic); - apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0)); + apic_manage_nmi_watchdog(apic, kvm_lapic_get_reg(apic, APIC_LVT0)); update_divide_count(apic); start_apic_timer(apic); apic->irr_pending = true; @@ -2076,7 +2076,7 @@ void kvm_lapic_sync_to_vapic(struct kvm_vcpu *vcpu) if (!test_bit(KVM_APIC_CHECK_VAPIC, &vcpu->arch.apic_attention)) return; - tpr = kvm_apic_get_reg(apic, APIC_TASKPRI) & 0xff; + tpr = kvm_lapic_get_reg(apic, APIC_TASKPRI) & 0xff; max_irr = apic_find_highest_irr(apic); if (max_irr < 0) max_irr = 0; diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index a70cb62..bbe5d12 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -123,9 +123,9 @@ static inline void kvm_lapic_set_irr(int vec, struct kvm_lapic *apic) apic->irr_pending = true; } -static inline u32 kvm_apic_get_reg(struct kvm_lapic *apic, int reg_off) +static inline u32 kvm_lapic_get_reg(struct kvm_lapic *apic, int reg_off) { - return *((u32 *) (apic->regs + reg_off)); + return *((u32 *) (apic->regs + reg_off)); } static inline void kvm_lapic_set_reg(struct kvm_lapic *apic, int reg_off, u32 val) @@ -198,7 +198,7 @@ static inline int kvm_lapic_latched_init(struct kvm_vcpu *vcpu) static inline int kvm_apic_id(struct kvm_lapic *apic) { - return (kvm_apic_get_reg(apic, APIC_ID) >> 24) & 0xff; + return (kvm_lapic_get_reg(apic, APIC_ID) >> 24) & 0xff; } bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);