From patchwork Mon Feb 17 11:45:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 11386179 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C69E159A for ; Mon, 17 Feb 2020 11:47:20 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1DA39206F4 for ; Mon, 17 Feb 2020 11:47:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="bI2DkhZY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DA39206F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j3eqk-00018e-C4; Mon, 17 Feb 2020 11:46:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j3eqj-000189-3o for xen-devel@lists.xenproject.org; Mon, 17 Feb 2020 11:46:05 +0000 X-Inumbo-ID: 134fa292-517b-11ea-bc8e-bc764e2007e4 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 134fa292-517b-11ea-bc8e-bc764e2007e4; Mon, 17 Feb 2020 11:46:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1581939965; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mi11UQmSHbD8aXYldsLAWbES2mwN5ocU1SVa3JcoBwQ=; b=bI2DkhZY132wHxqjcEYzQUWGS9SG7ttYMCuNy3jc1R2Dn2Xga6L7VmnA HRjVDM8KOInC3qhCE+isEjreb/mjmDNm8lF706XTk4nhwS3kHhY+jto92 JBUNTD+OnvwmyGweEnNEorw7jjjffPNytzJUGRhDrPmNqXVL7Ol8FZwXg Q=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=roger.pau@citrix.com; spf=Pass smtp.mailfrom=roger.pau@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of roger.pau@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of roger.pau@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: XXbBkCzDq5mc6s+B0uNL7D6hSQjjeAnMBhzl1I4TcNO73W1/9NRc6hqkSxuySyyVHyBKxgF3ew d+PnrrAGo7ZIb/q0YJF9X59r3yxnX2TGF7VRy6GZfcdTypowu5qhhL3XYJc3a17jf0rJqmpOuB dl14DmtsdOmD21fvE58Ng52rJzTL8QOg+HMoEhaq5u6wI4Fi0WpKm6Aby1iNu8QbtXo0X1uR7y WUny1Ay/l75nhHbO/Mbg36BXxbp9/pNnxz9nqSy/yxKAWcyEk/ogNHkNQbnmup1g8KzekVffJL y4I= X-SBRS: 2.7 X-MesageID: 12565371 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,452,1574139600"; d="scan'208";a="12565371" From: Roger Pau Monne To: Date: Mon, 17 Feb 2020 12:45:43 +0100 Message-ID: <20200217114545.71112-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217114545.71112-1-roger.pau@citrix.com> References: <20200217114545.71112-1-roger.pau@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v5 2/4] arm: rename BIT_WORD to BITOP_WORD X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Jan Beulich , Volodymyr Babchuk , Roger Pau Monne Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" So BIT_WORD can be imported from Linux. The difference between current Linux implementation of BIT_WORD is that the size of the word unit is a long integer, while the Xen one is hardcoded to 32 bits. Current users of BITOP_WORD on Arm (which considers a word a long integer) are switched to use the generic BIT_WORD which also operates on long integers. No functional change intended. Suggested-by: Julien Grall Suggested-by: Jan Beulich Signed-off-by: Roger Pau Monné --- Changes since v4: - New in this version. --- xen/arch/arm/arm32/lib/bitops.c | 4 ++-- xen/arch/arm/arm64/lib/bitops.c | 4 ++-- xen/arch/arm/arm64/lib/find_next_bit.c | 10 ++++------ xen/include/asm-arm/bitops.h | 10 +++++----- xen/include/xen/bitops.h | 2 ++ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/arm32/lib/bitops.c b/xen/arch/arm/arm32/lib/bitops.c index 3dca769bf0..82d935ce33 100644 --- a/xen/arch/arm/arm32/lib/bitops.c +++ b/xen/arch/arm/arm32/lib/bitops.c @@ -33,7 +33,7 @@ static always_inline bool int_##name(int nr, volatile void *p, bool timeout,\ unsigned int max_try) \ { \ - volatile uint32_t *ptr = (uint32_t *)p + BIT_WORD((unsigned int)nr); \ + volatile uint32_t *ptr = (uint32_t *)p + BITOP_WORD((unsigned int)nr); \ const uint32_t mask = BIT_MASK((unsigned int)nr); \ unsigned long res, tmp; \ \ @@ -71,7 +71,7 @@ bool name##_timeout(int nr, volatile void *p, unsigned int max_try) \ static always_inline bool int_##name(int nr, volatile void *p, int *oldbit, \ bool timeout, unsigned int max_try) \ { \ - volatile uint32_t *ptr = (uint32_t *)p + BIT_WORD((unsigned int)nr); \ + volatile uint32_t *ptr = (uint32_t *)p + BITOP_WORD((unsigned int)nr); \ unsigned int bit = (unsigned int)nr % BITS_PER_WORD; \ const uint32_t mask = BIT_MASK(bit); \ unsigned long res, tmp; \ diff --git a/xen/arch/arm/arm64/lib/bitops.c b/xen/arch/arm/arm64/lib/bitops.c index 27688e5418..f5128c58f5 100644 --- a/xen/arch/arm/arm64/lib/bitops.c +++ b/xen/arch/arm/arm64/lib/bitops.c @@ -32,7 +32,7 @@ static always_inline bool int_##name(int nr, volatile void *p, bool timeout,\ unsigned int max_try) \ { \ - volatile uint32_t *ptr = (uint32_t *)p + BIT_WORD((unsigned int)nr); \ + volatile uint32_t *ptr = (uint32_t *)p + BITOP_WORD((unsigned int)nr); \ const uint32_t mask = BIT_MASK((unsigned int)nr); \ unsigned long res, tmp; \ \ @@ -67,7 +67,7 @@ bool name##_timeout(int nr, volatile void *p, unsigned int max_try) \ static always_inline bool int_##name(int nr, volatile void *p, int *oldbit, \ bool timeout, unsigned int max_try) \ { \ - volatile uint32_t *ptr = (uint32_t *)p + BIT_WORD((unsigned int)nr); \ + volatile uint32_t *ptr = (uint32_t *)p + BITOP_WORD((unsigned int)nr); \ unsigned int bit = (unsigned int)nr % BITS_PER_WORD; \ const uint32_t mask = BIT_MASK(bit); \ unsigned long res, tmp; \ diff --git a/xen/arch/arm/arm64/lib/find_next_bit.c b/xen/arch/arm/arm64/lib/find_next_bit.c index 17cb176266..8ebf8bfe97 100644 --- a/xen/arch/arm/arm64/lib/find_next_bit.c +++ b/xen/arch/arm/arm64/lib/find_next_bit.c @@ -12,8 +12,6 @@ #include #include -#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG) - #ifndef find_next_bit /* * Find the next set bit in a memory region. @@ -21,7 +19,7 @@ unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset) { - const unsigned long *p = addr + BITOP_WORD(offset); + const unsigned long *p = addr + BIT_WORD(offset); unsigned long result = offset & ~(BITS_PER_LONG-1); unsigned long tmp; @@ -67,7 +65,7 @@ EXPORT_SYMBOL(find_next_bit); unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size, unsigned long offset) { - const unsigned long *p = addr + BITOP_WORD(offset); + const unsigned long *p = addr + BIT_WORD(offset); unsigned long result = offset & ~(BITS_PER_LONG-1); unsigned long tmp; @@ -197,7 +195,7 @@ unsigned long find_next_zero_bit_le(const void *addr, unsigned if (offset >= size) return size; - p += BITOP_WORD(offset); + p += BIT_WORD(offset); size -= result; offset &= (BITS_PER_LONG - 1UL); if (offset) { @@ -243,7 +241,7 @@ unsigned long find_next_bit_le(const void *addr, unsigned if (offset >= size) return size; - p += BITOP_WORD(offset); + p += BIT_WORD(offset); size -= result; offset &= (BITS_PER_LONG - 1UL); if (offset) { diff --git a/xen/include/asm-arm/bitops.h b/xen/include/asm-arm/bitops.h index fbb4b82413..fabf218e23 100644 --- a/xen/include/asm-arm/bitops.h +++ b/xen/include/asm-arm/bitops.h @@ -22,7 +22,7 @@ #define BITS_PER_WORD 32 #define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_WORD)) -#define BIT_WORD(nr) ((nr) / BITS_PER_WORD) +#define BITOP_WORD(nr) ((nr) / BITS_PER_WORD) #define BITS_PER_BYTE 8 #define ADDR (*(volatile int *) addr) @@ -87,7 +87,7 @@ static inline int __test_and_set_bit(int nr, volatile void *addr) { unsigned int mask = BIT_MASK(nr); volatile unsigned int *p = - ((volatile unsigned int *)addr) + BIT_WORD(nr); + ((volatile unsigned int *)addr) + BITOP_WORD(nr); unsigned int old = *p; *p = old | mask; @@ -107,7 +107,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) { unsigned int mask = BIT_MASK(nr); volatile unsigned int *p = - ((volatile unsigned int *)addr) + BIT_WORD(nr); + ((volatile unsigned int *)addr) + BITOP_WORD(nr); unsigned int old = *p; *p = old & ~mask; @@ -120,7 +120,7 @@ static inline int __test_and_change_bit(int nr, { unsigned int mask = BIT_MASK(nr); volatile unsigned int *p = - ((volatile unsigned int *)addr) + BIT_WORD(nr); + ((volatile unsigned int *)addr) + BITOP_WORD(nr); unsigned int old = *p; *p = old ^ mask; @@ -135,7 +135,7 @@ static inline int __test_and_change_bit(int nr, static inline int test_bit(int nr, const volatile void *addr) { const volatile unsigned int *p = (const volatile unsigned int *)addr; - return 1UL & (p[BIT_WORD(nr)] >> (nr & (BITS_PER_WORD-1))); + return 1UL & (p[BITOP_WORD(nr)] >> (nr & (BITS_PER_WORD-1))); } /* diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index dfb70417c2..a64595f68e 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -245,4 +245,6 @@ static inline __u32 ror32(__u32 word, unsigned int shift) (bit) < (size); \ (bit) = find_next_bit(addr, size, (bit) + 1) ) +#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) + #endif