From nobody Mon May 6 02:21:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1596631932; cv=none; d=zohomail.com; s=zohoarc; b=UzysPzCNkVJUnzPokaLZIfK+xJFPCw7c5YQstmlsqN+x4qY3soFgnziTL2ZASPD7+RDDdowYY4tu8nHqF+MuvHy7yG1nIBBk8UoNMYN7Z6YF5OnlxQFzdzIDmu3wHar5ZdxJn6YO0R0zYmen/ixSjrJMao5mJxEBPctuXLPBBeM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596631932; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=uGs4M1ZrnONMoZODkv6cE5CplVG34+SmrM71Yvpp4wc=; b=N9GwKlmDHkW6ILdmWySjEMwOSFGlCJkIIj/C1FAfr+dpwoF9679M9QZipO47eZehdX3mGj5fi/FrqnuSL5FB2anuKqodqt2dfNvZUU52UongZg9OwGISH3+xoAzhXJVuE2DX7KHDf456iJx3GRVU/Y/VLd2pLoou5oVFZSVya7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1596631932031933.7017878429011; Wed, 5 Aug 2020 05:52:12 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k3Itg-0003Lo-6i; Wed, 05 Aug 2020 12:51:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k3Ite-0003Lc-VC for xen-devel@lists.xenproject.org; Wed, 05 Aug 2020 12:51:54 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c0ce91e3-776a-4307-9d4e-17039861a371; Wed, 05 Aug 2020 12:51:53 +0000 (UTC) X-Inumbo-ID: c0ce91e3-776a-4307-9d4e-17039861a371 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1596631913; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=rRFT9u3/O3zvV8jxX2uNkA4cBsg0DH2hVxBAe+fvmPE=; b=HiTX2IOepLYkTi2o/oX+dTL42qv9b9uk6ILjEECIuVPNG+v4/+mjjmZ1 dWpfPzYZFo6sV8aJRqZUxI3nyMb/9W5zW7luImr37b0TKr/3MpgmVyd93 CZjhGBQtf3B+W++3CDQcvy29gWIdvtvK0cAPNXNwLTw40NRh+5HADt0VQ o=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: ohW9JmQu13lbrqMX3sYNIaH378KG3zbGQbpGh5NLpG4SXOlJm58gvC1FP0EN7C3lPO61nRNsqq 8o9nRuZrqezEWldAMWarq/9chwQYNLQEs2355qDCkXScVcrkG/Obah3o8V1mkp7Y+rKqxiDrbo jphMATrqV1EGja5YYJjVYEZsNKuENymEoVvU6y5pihkBJwDjlreG6bB5z3yy8dsyzOn4eCOPlQ oWlRUJHe8ZTMCbITrTCTjb7OWIwUSbOqa1Mj9/9uaqrYNJ3aPa7CV8pKZJLaJ8fXNOBAt7tE9+ Cn8= X-SBRS: 3.7 X-MesageID: 24813330 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.75,436,1589256000"; d="scan'208";a="24813330" From: Andrew Cooper To: Xen-devel Subject: [PATCH] x86/ioapic: Fix style in io_apic.h Date: Wed, 5 Aug 2020 13:51:24 +0100 Message-ID: <20200805125124.7763-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This file is a mix of Xen and Linux styles. Switch it fully to Xen style. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monn=C3=A9 --- xen/include/asm-x86/io_apic.h | 48 +++++++++++++++++++++------------------= ---- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h index e006b2b8dd..daf17d4c3d 100644 --- a/xen/include/asm-x86/io_apic.h +++ b/xen/include/asm-x86/io_apic.h @@ -13,9 +13,9 @@ * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar */ =20 -#define IO_APIC_BASE(idx) \ - ((volatile int *)(__fix_to_virt(FIX_IO_APIC_BASE_0 + idx) \ - + (mp_ioapics[idx].mpc_apicaddr & ~PAGE_MASK))) +#define IO_APIC_BASE(idx) \ + ((volatile int *)(__fix_to_virt(FIX_IO_APIC_BASE_0 + idx) \ + + (mp_ioapics[idx].mpc_apicaddr & ~PAGE_MASK))) =20 #define IO_APIC_ID(idx) (mp_ioapics[idx].mpc_apicid) =20 @@ -78,14 +78,14 @@ extern int nr_ioapics; extern int nr_ioapic_entries[MAX_IO_APICS]; =20 enum ioapic_irq_destination_types { - dest_Fixed =3D 0, - dest_LowestPrio =3D 1, - dest_SMI =3D 2, - dest__reserved_1 =3D 3, - dest_NMI =3D 4, - dest_INIT =3D 5, - dest__reserved_2 =3D 6, - dest_ExtINT =3D 7 + dest_Fixed =3D 0, + dest_LowestPrio =3D 1, + dest_SMI =3D 2, + dest__reserved_1 =3D 3, + dest_NMI =3D 4, + dest_INIT =3D 5, + dest__reserved_2 =3D 6, + dest_ExtINT =3D 7 }; =20 struct IO_APIC_route_entry { @@ -135,28 +135,28 @@ unsigned int io_apic_gsi_base(unsigned int apic); =20 static inline unsigned int __io_apic_read(unsigned int apic, unsigned int = reg) { - *IO_APIC_BASE(apic) =3D reg; - return *(IO_APIC_BASE(apic)+4); + *IO_APIC_BASE(apic) =3D reg; + return *(IO_APIC_BASE(apic)+4); } =20 static inline unsigned int io_apic_read(unsigned int apic, unsigned int re= g) { - if (ioapic_reg_remapped(reg)) - return iommu_read_apic_from_ire(apic, reg); - return __io_apic_read(apic, reg); + if ( ioapic_reg_remapped(reg) ) + return iommu_read_apic_from_ire(apic, reg); + return __io_apic_read(apic, reg); } =20 static inline void __io_apic_write(unsigned int apic, unsigned int reg, un= signed int value) { - *IO_APIC_BASE(apic) =3D reg; - *(IO_APIC_BASE(apic)+4) =3D value; + *IO_APIC_BASE(apic) =3D reg; + *(IO_APIC_BASE(apic)+4) =3D value; } =20 static inline void io_apic_write(unsigned int apic, unsigned int reg, unsi= gned int value) { - if (ioapic_reg_remapped(reg)) - return iommu_update_ire_from_apic(apic, reg, value); - __io_apic_write(apic, reg, value); + if ( ioapic_reg_remapped(reg) ) + return iommu_update_ire_from_apic(apic, reg, value); + __io_apic_write(apic, reg, value); } =20 /* @@ -165,9 +165,9 @@ static inline void io_apic_write(unsigned int apic, uns= igned int reg, unsigned i */ static inline void io_apic_modify(unsigned int apic, unsigned int reg, uns= igned int value) { - if (ioapic_reg_remapped(reg)) - return iommu_update_ire_from_apic(apic, reg, value); - *(IO_APIC_BASE(apic)+4) =3D value; + if ( ioapic_reg_remapped(reg) ) + return iommu_update_ire_from_apic(apic, reg, value); + *(IO_APIC_BASE(apic)+4) =3D value; } =20 /* 1 if "noapic" boot option passed */ --=20 2.11.0