From patchwork Fri Feb 9 16:40:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199006 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp986022dyd; Fri, 9 Feb 2024 08:56:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWlUblm17s0J+V8j60mc9FE6XlWHd3IJmJutf+t23t/ikW8DRS5DkA2D+eL3S/fh+G6JIJRGTtc8O0qiYmbtrZNwBueTA== X-Google-Smtp-Source: AGHT+IEwb0eawh6DkDQTvqlOi9znUmH3t+lFZ8aZU+cmOR6bbmmnLv7/YhjmoV8Iz1KMzLlEEyar X-Received: by 2002:a05:6402:784:b0:55f:ec52:73c4 with SMTP id d4-20020a056402078400b0055fec5273c4mr1842965edy.34.1707497784200; Fri, 09 Feb 2024 08:56:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707497784; cv=pass; d=google.com; s=arc-20160816; b=Ns5//WzXV+/qj9gvD3NFrP+eCocIJZh0MCHWJC0sc9IUbZse3xbKYZO7Is6RB4rVRw PgqQ8i/adDecIKZDMfllQUZDX7/42gEMSdLvwmEu6OolPaJJUIN3ojFgXi65OY3enwC8 s+4NzhFYGln0wA649ouUibIV1Ojnfj29GPD9l8aXBSognFLXbxBK9xzsPmf5Ek4cir8w xYQIgAk7qXwqYaZ2InYPqr0PEJROGWKKK6ApaISsx47ANaZiBbp7XCI2sz1PTy9DCMQi 40VzF68Y9fX5Tx9pLQWsNbjJV2eG2xCkJ4MitjKtJiVdplGLTxr9j2zSLWK/qJeQQ50y Mn9A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Z2wHzIJ+1gKKynMpcxVEtR1yMxxOWj0+XBOjO/6pnQI=; fh=zGNlQ5rDy5zgiU0GHXABaqNKGz6hxgDcm5on/RyESDI=; b=xkyDxs07Y2uxH+CuPWqXA81NqTrZfGr6rXNdTvTsWck8z3hqA/2BxoTrNJBW/4kUbG QBNhhewtIl41gSs7dc+xxjAJ6TDtKmkNwiz3PQZm1wwKpkOtJT9JMAdKBlgC6Cx1eWK4 952LuqN4LSb3cmMEZPsNw8YmxnbRT41NhSl9S/t0+x3lvh5sCzXgizlRovXgsfOjGM8O VP+D4UfSwFCFaiYQ8+sriLgmkgtT2JEKh66tdqLZybGdHSLNgviGcvBu18yEYUjXJg0a DeWK1Q90m3PvFlWTrE2zJH+6Qnn3p0VBIfWyOiBnf58b0F8Rh8EcyednYmxULl5cKWKl ZUzQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=LS71sJ69; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-59653-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59653-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCW/K90z9655ZoHf1yhDBeduGx6dCU7eWnq8Q2FoRHGzUQVhqbzqpRiEZua8hd6PMm6+tCZNGBf6zAJB7abCSstQ56jDBw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id t19-20020aa7d4d3000000b0055f65890218si1074876edr.234.2024.02.09.08.56.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 08:56:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59653-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=LS71sJ69; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-59653-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59653-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 87ACE1F2A0E9 for ; Fri, 9 Feb 2024 16:48:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0E68912E1EE; Fri, 9 Feb 2024 16:41:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="LS71sJ69" Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00927129A9B for ; Fri, 9 Feb 2024 16:41:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496884; cv=none; b=VBDBWr5jusQ65v5nY5YaAq/HQyExSYVkF/62kHStnX+LNBNIkgEIrlwOSx6KzY+Ba/pRVBwRK8fPEkBuLlGp2ZktptNAfPUWS3Nn09qWQ+3gfvIvrHMZlc7dpoAKQ3eYXiVk6X5qJy39z1EWqIU6OneL6bVArFs5iMgw7C4lXQc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496884; c=relaxed/simple; bh=iW4ba7UHKk0KDThAeTMx8C2vBPEV860cssjhylXWogA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=i1aJIojtVZ5TAs3oGBFE+xLI09dsntT51xFQy9k/17KebHDBllmZA4utBeABF7LdoioOcPqH5Up/AkDAZTqscuGAphxqkM47M3t9eiYO2hwen1L+SSeVvGsaELgkDetZQiTBAxPMR8Dbs5uhrZtn4prHRUjg1pnsjcu/ck6pmHk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=LS71sJ69; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-560037b6975so1362280a12.2 for ; Fri, 09 Feb 2024 08:41:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707496877; x=1708101677; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z2wHzIJ+1gKKynMpcxVEtR1yMxxOWj0+XBOjO/6pnQI=; b=LS71sJ69Jt7TkrvVBvwiE6Eh0wltHoKBR0wG3qp2AS8yOBk04sBkYvQM+XvbTi/Z+2 7Ay2d0ES0FRgh8+ZzKL2yHkOh4DU578/Lu8WPTupaV2nz+QY8slMPRywxxltzz6dhUyl H3rooqYNodkK0b3Jnd9khT8YOO7adKeJy8+7IIY4viiwD0U90S7H7+frg8MMU1ul+sdN lzJQGFJxWyB3BeCDyItEmuvOuR1vuYOPPpLBL4vWB1x2GCZOJUSFVP4VG1fkTY+RtfRr /g5895QV7AKhczYrUjuqWS1XiKpFokzlVKsI4Pws6WSkWbCIV1iGjDF+VFcVDsIouExA jwLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707496877; x=1708101677; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z2wHzIJ+1gKKynMpcxVEtR1yMxxOWj0+XBOjO/6pnQI=; b=opDWW6ZQY7tti5oICPIjolBM1kC1q6oldY2fTvbceoTCfwQBA3LuQ2c8rv5X8CLTQJ 8LGJRUEIpHYQFAPxtLq8atb9oYZLZM099f6KZ5xaeGk/t4UB0zBskbyOA01CqMs/dkkZ bZ1t1zPPBuSAM2Rz0kdmYAPTp6zzzp6UL7v0pgMaB9saxzNdCyPQTD4J/Ndv91SoPKb7 yXJWT+SC/YzrxTIIXztCb9BMke+ap9EtYTJGTzPAJTMyA6Mo1V5gXSJduRqdbSLXMfHR xDYhvhN4LMXpZtmBX3ty7C/RKVCF5HfDLCC1JToWbDjV/n7jswY9VnIVWNZkIAiJmpqQ vIVQ== X-Gm-Message-State: AOJu0Yxv3lRklWe4rE7U/E350aPdLgWLTurBkFTwtxTLMU9MUzFF+0B+ gWN30URuXiXgAbEzSLvO5JG+aDQJcSH5UW3YeMykHGcaiILyOPejPp2M/ElsV6W9vy2xrsIqxMR b X-Received: by 2002:a17:906:1154:b0:a38:27fc:aa93 with SMTP id i20-20020a170906115400b00a3827fcaa93mr1623374eja.16.1707496877666; Fri, 09 Feb 2024 08:41:17 -0800 (PST) Received: from raven.intern.cm-ag (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id tl27-20020a170907c31b00b00a3bfe97fe27sm477724ejc.218.2024.02.09.08.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 08:41:16 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v2 33/35] linux/kernel.h: move upper/lower_*_bits macros to wordpart.h Date: Fri, 9 Feb 2024 17:40:25 +0100 Message-Id: <20240209164027.2582906-34-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240209164027.2582906-1-max.kellermann@ionos.com> References: <20240209164027.2582906-1-max.kellermann@ionos.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790441196461549748 X-GMAIL-MSGID: 1790441196461549748 Reducing dependencies on the header linux/kernel.h. Signed-off-by: Max Kellermann --- arch/arm64/include/asm/syscall.h | 2 +- arch/arm64/kvm/handle_exit.c | 2 +- drivers/bus/uniphier-system-bus.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 1 + drivers/spi/spi-pci1xxxx.c | 1 + fs/hfs/hfs_fs.h | 2 +- fs/hfsplus/hfsplus_fs.h | 2 +- include/drm/drm_fixed.h | 2 +- include/linux/dma-fence.h | 2 +- include/linux/goldfish.h | 2 +- include/linux/kernel.h | 29 +---------------------------- include/linux/qed/common_hsi.h | 1 + include/linux/wordpart.h | 28 ++++++++++++++++++++++++++++ include/rdma/uverbs_ioctl.h | 2 +- include/soc/fsl/bman.h | 2 ++ include/soc/fsl/qman.h | 1 + 16 files changed, 44 insertions(+), 37 deletions(-) diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h index 107ada608694..e5f462cc1a54 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -8,7 +8,7 @@ #include #include #include -#include // for lower_32_bits() +#include // for lower_32_bits() typedef long (*syscall_fn_t)(const struct pt_regs *regs); diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index a82b4b31bb36..91bd5b701acf 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -10,7 +10,7 @@ #include #include -#include // for upper_32_bits(), lower_32_bits() +#include // for lower_32_bits(), upper_32_bits() #include #include diff --git a/drivers/bus/uniphier-system-bus.c b/drivers/bus/uniphier-system-bus.c index 8cffdb089a6b..8949a7a5c170 100644 --- a/drivers/bus/uniphier-system-bus.c +++ b/drivers/bus/uniphier-system-bus.c @@ -6,7 +6,7 @@ #include #include // for upper_32_bits(), lower_32_bits() #include -#include // for upper_32_bits() +#include // for upper_32_bits() #include #include #include diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 1be09abac7cc..2b33edb78c26 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -30,6 +30,7 @@ #include #include #include +#include // for lower_32_bits(), upper_32_bits() #include #include diff --git a/drivers/spi/spi-pci1xxxx.c b/drivers/spi/spi-pci1xxxx.c index ab99aac85eb9..1ff89d726927 100644 --- a/drivers/spi/spi-pci1xxxx.c +++ b/drivers/spi/spi-pci1xxxx.c @@ -9,6 +9,7 @@ #include #include #include +#include // for upper_32_bits(), lower_32_bits() #include #include #include diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h index 71ebbed52f5f..99e54ff4df83 100644 --- a/fs/hfs/hfs_fs.h +++ b/fs/hfs/hfs_fs.h @@ -17,7 +17,7 @@ #include #include -#include // for lower_32_bits() +#include // for lower_32_bits() #include #include #include diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h index 157dad01495f..79cac82d050e 100644 --- a/fs/hfsplus/hfsplus_fs.h +++ b/fs/hfsplus/hfsplus_fs.h @@ -21,7 +21,7 @@ #include #include #include -#include // for lower_32_bits() +#include // for lower_32_bits() #include "hfsplus_raw.h" #define DBG_BNODE_REFS 0x00000001 diff --git a/include/drm/drm_fixed.h b/include/drm/drm_fixed.h index 0c9f917a4d4b..ff9a91fa40b6 100644 --- a/include/drm/drm_fixed.h +++ b/include/drm/drm_fixed.h @@ -25,7 +25,7 @@ #ifndef DRM_FIXED_H #define DRM_FIXED_H -#include +#include // for lower_32_bits() #include typedef union dfixed { diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index 3081ff146d41..308d77098e21 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -16,7 +16,7 @@ #include #include #include -#include // for lower_32_bits() +#include // for lower_32_bits() #include #include #include diff --git a/include/linux/goldfish.h b/include/linux/goldfish.h index bcc17f95b906..8b2b3046f779 100644 --- a/include/linux/goldfish.h +++ b/include/linux/goldfish.h @@ -2,7 +2,7 @@ #ifndef __LINUX_GOLDFISH_H #define __LINUX_GOLDFISH_H -#include +#include // for lower_32_bits(), upper_32_bits() #include #include diff --git a/include/linux/kernel.h b/include/linux/kernel.h index ac332f4deed9..6f436367dd16 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -47,34 +48,6 @@ } \ ) -/** - * upper_32_bits - return bits 32-63 of a number - * @n: the number we're accessing - * - * A basic shift-right of a 64- or 32-bit quantity. Use this to suppress - * the "right shift count >= width of type" warning when that quantity is - * 32-bits. - */ -#define upper_32_bits(n) ((u32)(((n) >> 16) >> 16)) - -/** - * lower_32_bits - return bits 0-31 of a number - * @n: the number we're accessing - */ -#define lower_32_bits(n) ((u32)((n) & 0xffffffff)) - -/** - * upper_16_bits - return bits 16-31 of a number - * @n: the number we're accessing - */ -#define upper_16_bits(n) ((u16)((n) >> 16)) - -/** - * lower_16_bits - return bits 0-15 of a number - * @n: the number we're accessing - */ -#define lower_16_bits(n) ((u16)((n) & 0xffff)) - void do_exit(long error_code) __noreturn; extern int get_option(char **str, int *pint); diff --git a/include/linux/qed/common_hsi.h b/include/linux/qed/common_hsi.h index 827624840ee2..11482394d7f3 100644 --- a/include/linux/qed/common_hsi.h +++ b/include/linux/qed/common_hsi.h @@ -11,6 +11,7 @@ #include #include #include +#include // for upper_32_bits() /* dma_addr_t manip */ #define PTR_LO(x) ((u32)(((uintptr_t)(x)) & 0xffffffff)) diff --git a/include/linux/wordpart.h b/include/linux/wordpart.h index c9e6bd773ebd..a73f0c84a03a 100644 --- a/include/linux/wordpart.h +++ b/include/linux/wordpart.h @@ -10,4 +10,32 @@ */ #define REPEAT_BYTE(x) ((~0ul / 0xff) * (x)) +/** + * upper_32_bits - return bits 32-63 of a number + * @n: the number we're accessing + * + * A basic shift-right of a 64- or 32-bit quantity. Use this to suppress + * the "right shift count >= width of type" warning when that quantity is + * 32-bits. + */ +#define upper_32_bits(n) ((u32)(((n) >> 16) >> 16)) + +/** + * lower_32_bits - return bits 0-31 of a number + * @n: the number we're accessing + */ +#define lower_32_bits(n) ((u32)((n) & 0xffffffff)) + +/** + * upper_16_bits - return bits 16-31 of a number + * @n: the number we're accessing + */ +#define upper_16_bits(n) ((u16)((n) >> 16)) + +/** + * lower_16_bits - return bits 0-15 of a number + * @n: the number we're accessing + */ +#define lower_16_bits(n) ((u16)((n) & 0xffff)) + #endif // _LINUX_WORDPART_H diff --git a/include/rdma/uverbs_ioctl.h b/include/rdma/uverbs_ioctl.h index 47a6be467004..05002792b078 100644 --- a/include/rdma/uverbs_ioctl.h +++ b/include/rdma/uverbs_ioctl.h @@ -7,7 +7,7 @@ #define _UVERBS_IOCTL_ #include -#include // for upper_32_bits(), lower_32_bits() +#include #include #include #include diff --git a/include/soc/fsl/bman.h b/include/soc/fsl/bman.h index 173e4049d963..b01d8c0ac204 100644 --- a/include/soc/fsl/bman.h +++ b/include/soc/fsl/bman.h @@ -31,6 +31,8 @@ #ifndef __FSL_BMAN_H #define __FSL_BMAN_H +#include // for upper_32_bits() + /* wrapper for 48-bit buffers */ struct bm_buffer { union { diff --git a/include/soc/fsl/qman.h b/include/soc/fsl/qman.h index 0d3d6beb7fdb..c5230a844114 100644 --- a/include/soc/fsl/qman.h +++ b/include/soc/fsl/qman.h @@ -33,6 +33,7 @@ #include #include +#include // for upper_32_bits() /* Hardware constants */ #define QM_CHANNEL_SWPORTAL0 0