diff mbox series

[04/53] x86/ioapic: Replace some more set bit nonsense

Message ID	20230807135026.636507272@linutronix.de
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Message-ID: <20230807135026.636507272@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: x86@kernel.org, Tom Lendacky <thomas.lendacky@amd.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Arjan van de Ven <arjan@linux.intel.com>, Huang Rui <ray.huang@amd.com>, Juergen Gross <jgross@suse.com>, Dimitri Sivanich <dimitri.sivanich@hpe.com>, Michael Kelley <mikelley@microsoft.com>, Sohil Mehta <sohil.mehta@intel.com>, K Prateek Nayak <kprateek.nayak@amd.com>, Kan Liang <kan.liang@linux.intel.com>, Zhang Rui <rui.zhang@intel.com>, "Paul E. McKenney" <paulmck@kernel.org>, Feng Tang <feng.tang@intel.com>, Andy Shevchenko <andy@infradead.org> Subject: [patch 04/53] x86/ioapic: Replace some more set bit nonsense References: <20230807130108.853357011@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Mon, 7 Aug 2023 15:52:39 +0200 (CEST) Precedence: bulk
Series	x86/topology: The final installment \| [00/53] x86/topology: The final installment [01/53] x86/cpu/topology: Cure off by one in fake_topology() [02/53] x86/cpu/topology: Make the APIC mismatch warnings complete [03/53] x86/platform/ce4100: Dont override x86_init.mpparse.setup_ioapic_ids [04/53] x86/ioapic: Replace some more set bit nonsense [05/53] x86/apic: Get rid of get_physical_broadcast() [06/53] x86/ioapic: Make io_apic_get_unique_id() simpler [07/53] x86/ioapic: Simplify setup_ioapic_ids_from_mpc_nocheck() [08/53] x86/apic: Remove check_apicid_used() and ioapic_phys_id_map() [09/53] x86/mpparse: Rename default_find_smp_config() [10/53] x86/mpparse: Provide separate early/late callbacks [11/53] x86/mpparse: Prepare for callback separation [12/53] x86/dtb: Rename x86_dtb_init() [13/53] x86/platform/ce4100: Prepare for separate mpparse callbacks [14/53] x86/platform/intel-mid: Prepare for separate mpparse callbacks [15/53] x86/jailhouse: Prepare for separate mpparse callbacks [16/53] x86/xen/smp_pv: Prepare for separate mpparse callbacks [17/53] x86/mpparse: Switch to new init callbacks [18/53] x86/mm/numa: Move early mptable evaluation into common code [19/53] x86/mpparse: Remove the physid_t bitmap wrapper [20/53] x86/apic: Remove the pointless writeback of boot_cpu_physical_apicid [21/53] x86/apic: Remove yet another dubious callback [22/53] x86/apic: Use a proper define for invalid ACPI CPU ID [23/53] x86/cpu/topology: Move registration out of APIC code [24/53] x86/cpu/topology: Provide separate APIC registration functions [25/53] x86/acpi: Use new APIC registration functions [26/53] x86/jailhouse: Use new APIC registration function [27/53] x86/of: Use new APIC registration functions [28/53] x86/mpparse: Use new APIC registration function [29/53] x86/acpi: Dont invoke topology_register_apic() for XEN PV [30/53] x86/xen/smp_pv: Register fake APICs [31/53] x86/cpu/topology: Confine topology information [32/53] x86/cpu/topology: Simplify APIC registration [33/53] x86/cpu/topology: Use a data structure for topology info [34/53] x86/smpboot: Make error message actually useful [35/53] x86/cpu/topology: Sanitize the APIC admission logic [36/53] x86/cpu/topology: Rework possible CPU management [37/53] x86/cpu: Detect real BSP on crash kernels [38/53] x86/topology: Add a mechanism to track topology via APIC IDs [39/53] x86/cpu/topology: Reject unknown APIC IDs on ACPI hotplug [40/53] x86/cpu/topology: Assign hotpluggable CPUIDs during init [41/53] x86/xen/smp_pv: Count number of vCPUs early [42/53] x86/cpu/topology: Let XEN/PV use topology from CPUID/MADT [43/53] x86/cpu/topology: Use topology bitmaps for sizing [44/53] x86/cpu/topology: Mop up primary thread mask handling [45/53] x86/cpu/topology: Simplify cpu_mark_primary_thread() [46/53] x86/cpu/topology: Provide logical pkg/die mapping [47/53] x86/cpu/topology: Use topology logical mapping mechanism [48/53] x86/cpu/topology: Retrieve cores per package from topology bitmaps [49/53] x86: Use topology functions instead of smp_num_siblings where applicable [50/53] x86/cpu/topology: Rename smp_num_siblings [51/53] x86/cpu/topology: Rename topology_max_die_per_package() [52/53] x86/cpu/topology: Provide __num_[cores\|threads]_per_package [53/53] x86/cpu/topology: Get rid of cpuinfo::x86_max_cores

Commit Message

Thomas Gleixner Aug. 7, 2023, 1:52 p.m. UTC

  Yet another set_bit() operation wrapped in oring a mask.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/include/asm/mpspec.h  |    3 ---
 arch/x86/kernel/apic/io_apic.c |    6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff mbox series

Patch

--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -86,9 +86,6 @@  typedef struct physid_mask physid_mask_t
 #define physid_set(physid, map)			set_bit(physid, (map).mask)
 #define physid_isset(physid, map)		test_bit(physid, (map).mask)
 
-#define physids_or(dst, src1, src2)					\
-	bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_LOCAL_APIC)
-
 #define physids_clear(map)					\
 	bitmap_zero((map).mask, MAX_LOCAL_APIC)
 
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2494,9 +2494,8 @@  unsigned int arch_dynirq_lower_bound(uns
 #ifdef CONFIG_X86_32
 static int io_apic_get_unique_id(int ioapic, int apic_id)
 {
-	union IO_APIC_reg_00 reg_00;
 	static physid_mask_t apic_id_map = PHYSID_MASK_NONE;
-	physid_mask_t tmp;
+	union IO_APIC_reg_00 reg_00;
 	unsigned long flags;
 	int i = 0;
 
@@ -2542,8 +2541,7 @@  static int io_apic_get_unique_id(int ioa
 		apic_id = i;
 	}
 
-	physid_set_mask_of_physid(apic_id, &tmp);
-	physids_or(apic_id_map, apic_id_map, tmp);
+	physid_set(apic_id, apic_id_map);
 
 	if (reg_00.bits.ID != apic_id) {
 		reg_00.bits.ID = apic_id;