From patchwork Wed Oct 9 09:24:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13827986 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5A69ACED63E for ; Wed, 9 Oct 2024 09:25:11 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.814048.1227134 (Exim 4.92) (envelope-from ) id 1sySwC-0006Tr-TU; Wed, 09 Oct 2024 09:24:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 814048.1227134; Wed, 09 Oct 2024 09:24:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sySwC-0006Tk-R1; Wed, 09 Oct 2024 09:24:56 +0000 Received: by outflank-mailman (input) for mailman id 814048; Wed, 09 Oct 2024 09:24:56 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sySwC-0006TZ-DF for xen-devel@lists.xenproject.org; Wed, 09 Oct 2024 09:24:56 +0000 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [2a00:1450:4864:20::62f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 588c9b09-8620-11ef-a0bd-8be0dac302b0; Wed, 09 Oct 2024 11:24:55 +0200 (CEST) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a9943897c07so560675466b.3 for ; Wed, 09 Oct 2024 02:24:55 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a992e623957sm627601766b.76.2024.10.09.02.24.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Oct 2024 02:24:54 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 588c9b09-8620-11ef-a0bd-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1728465895; x=1729070695; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=dJN/oUOljW0y9dXzhI8yPyqKExVJQBlP+Fu4RB9uvL8=; b=aOlBlPvkIX3XtsJPGZiKi1LTqBx10V9xmMiLZ1HXWj4vQkrltjNgBRipgeV6y4Beu9 opAMWtnvO+/agjY4FiM6Yea8I4V/QKy1mPVNkl2ed+7DJr9ymjPL/Rhy1YS7T0+e5o1+ acvZkz8As6l0mul7dFZRVISp9oCHKjhGzf4OuE0w9QBxSJ+2M4klwKjhPPqPIpPxfTU0 1fKMyrvXni4/N7gJpKBJ2+8idHDcvEhXCL3VaDNjOqNV7r2EumyiN0D9F7tJtlnOrjfL CwJ90Y1NJ7bXLfACWQ9fxvIc5c/ua6JYT1awthPpaT7tcn8l8h+xXr3ITUHkIj/y1PAp d7ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728465895; x=1729070695; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dJN/oUOljW0y9dXzhI8yPyqKExVJQBlP+Fu4RB9uvL8=; b=TibmGkb1gYMLnZAsTpfVa9nxYNr9wy4GjGKLfTrzj/+6ubejrVMttahCe2v7Z4yt/u +bHIuZRyZHZ4X9VR4kXhWA2UkxSFUnbwCiffZMtm8q3Hujou1UlA99kDY5rj4y7OEsp4 ZYl+pBBXzPiY0vUJFUigSiplbAW9f75UbUXQnvTtKSP8E3BSjXCRZ3lyXvxJqmqtuaYY cE4sh8WpF93z/h7LegMVEFOKTfRJv4ETKYtySh5Izf8EtP7bsXlxOasi13TvsBFzPJ1g y9xNKtSZ0VBK2ezycDWm5Kvum1p814qPCzJM2hnxuTlBJlH4DV01x1mnVfyHTHHzPWci l/Ag== X-Gm-Message-State: AOJu0YwRuFbk6r7VwC+y9uY/Dxduc1Z84RgqoG6XsegBVcRFBjNNE5iL YyXbjUhLF92SuzlAiJFF3RxPc1k+ewtZ+2+Ww3JElKTNBLmyJX9hFEXzJg2xglJZmQmUkUBKvNQ = X-Google-Smtp-Source: AGHT+IEXt3/J4C+eyW5Yl0LniacQ1BLVl7nf5/vEeM1tXDNjGOnTPV2MdTrh6y1Z8liZKaLx5G2SEg== X-Received: by 2002:a17:906:7313:b0:a99:5957:b8f0 with SMTP id a640c23a62f3a-a998d31c11emr141654566b.49.1728465894981; Wed, 09 Oct 2024 02:24:54 -0700 (PDT) Message-ID: <832f8384-71b5-4872-92eb-8a81d7e1d50a@suse.com> Date: Wed, 9 Oct 2024 11:24:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 5/7] types: replace remaining uses of __u32 From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Julien Grall , Stefano Stabellini , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <17b6b894-9b41-4e8c-a3a9-ce837797eac3@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <17b6b894-9b41-4e8c-a3a9-ce837797eac3@suse.com> ... and move the type itself to linux-compat.h. While doing so drop casts (instead of modiyfing them) from x86'es wrmsrl(). Signed-off-by: Jan Beulich --- a/xen/arch/x86/include/asm/byteorder.h +++ b/xen/arch/x86/include/asm/byteorder.h @@ -4,7 +4,7 @@ #include #include -static inline attr_const __u32 ___arch__swab32(__u32 x) +static inline attr_const uint32_t ___arch__swab32(uint32_t x) { asm("bswap %0" : "=r" (x) : "0" (x)); return x; --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -33,9 +33,8 @@ static inline void wrmsrl(unsigned int msr, __u64 val) { - __u32 lo, hi; - lo = (__u32)val; - hi = (__u32)(val >> 32); + uint32_t lo = val, hi = val >> 32; + wrmsr(msr, lo, hi); } --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -413,7 +413,7 @@ static inline int get_count_order(unsign * @word: value to rotate * @shift: bits to roll */ -static inline __u32 rol32(__u32 word, unsigned int shift) +static inline uint32_t rol32(uint32_t word, unsigned int shift) { return (word << shift) | (word >> (32 - shift)); } @@ -424,7 +424,7 @@ static inline __u32 rol32(__u32 word, un * @word: value to rotate * @shift: bits to roll */ -static inline __u32 ror32(__u32 word, unsigned int shift) +static inline uint32_t ror32(uint32_t word, unsigned int shift) { return (word >> shift) | (word << (32 - shift)); } --- a/xen/include/xen/linux-compat.h +++ b/xen/include/xen/linux-compat.h @@ -16,6 +16,7 @@ typedef uint8_t __u8; typedef int16_t s16, __s16; typedef uint16_t __u16; typedef int32_t s32, __s32; +typedef uint32_t __u32; typedef int64_t s64, __s64; typedef paddr_t phys_addr_t; --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -7,7 +7,7 @@ /* Linux inherited types which are being phased out */ typedef uint8_t u8; typedef uint16_t u16; -typedef uint32_t u32, __u32; +typedef uint32_t u32; typedef uint64_t u64, __u64; #include @@ -53,8 +53,8 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; typedef uint16_t __le16; typedef uint16_t __be16; -typedef __u32 __le32; -typedef __u32 __be32; +typedef uint32_t __le32; +typedef uint32_t __be32; typedef __u64 __le64; typedef __u64 __be64;