2024-02-13 21:09:47

by Thomas Gleixner

[permalink] [raw]
Subject: [patch V3 03/22] x86/ioapic: Replace some more set bit nonsense

From: Thomas Gleixner <[email protected]>

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

Signed-off-by: Thomas Gleixner <[email protected]>


---
arch/x86/include/asm/mpspec.h | 3 ---
arch/x86/kernel/apic/io_apic.c | 6 ++----
2 files changed, 2 insertions(+), 7 deletions(-)
---

--- 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;




Subject: [tip: x86/apic] x86/ioapic: Replace some more set bit nonsense

The following commit has been merged into the x86/apic branch of tip:

Commit-ID: 2ac9e529d76a8534fa357e723942dd3f076c37da
Gitweb: https://git.kernel.org/tip/2ac9e529d76a8534fa357e723942dd3f076c37da
Author: Thomas Gleixner <[email protected]>
AuthorDate: Tue, 13 Feb 2024 22:04:55 +01:00
Committer: Thomas Gleixner <[email protected]>
CommitterDate: Thu, 15 Feb 2024 22:07:39 +01:00

x86/ioapic: Replace some more set bit nonsense

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

Signed-off-by: Thomas Gleixner <[email protected]>
Tested-by: Michael Kelley <[email protected]>
Tested-by: Sohil Mehta <[email protected]>
Link: https://lore.kernel.org/r/[email protected]



---
arch/x86/include/asm/mpspec.h | 3 ---
arch/x86/kernel/apic/io_apic.c | 6 ++----
2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 4b0f98a..9bf1e75 100644
--- 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)

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index e71745e..b62c7ee 100644
--- 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(unsigned int from)
#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 ioapic, int apic_id)
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;