From patchwork Wed Oct 9 05:18:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 1994551 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=lZ+ZIZ86; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev+bounces-1869-incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XNh4R5Nbtz1xsq for ; Wed, 9 Oct 2024 16:18:31 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4XNh4R3jqTz2yG9; Wed, 9 Oct 2024 16:18:31 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1728451111; cv=none; b=Bf3ndsG7sv1xRziET/2Mq9N0p5xPBBB6Dgj5qVN53fozAFB1MBQRmL86RiN9nsaGHcwlua659P7kn8Wt/EsfPVCx4lhzYEf7cFgwTyNOSB/5/F8aI+fBci12jbQWbeUjSZ2YXJhmNWKqus9BRkUZYSdZBHVuFpMy4G1HItuZRkOKQpCTb29kipY60aPcP2oqexOYq2HJE+kOWvwd4TBqXLpsHHfvnS9X3uBZKWs1sNfP49dU+iktHVOz1xy76u0ujRTiMyBGHhj9eUXxFMGon3h3V5EV+KACYkEGV3uJE4PAlhHerfQy9fR7F8Ngksmp/hZVqrFkGRJimJQ4UfbPLw== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1728451111; c=relaxed/relaxed; bh=/2fdo1k4hKJkz1aBMESfCkRGljgvCeelgkI8u7WzoGM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Dk7/iKzDIlKHOjftZL/l9lGequ51i3dHItc8QaWiAVpriUSRdmLQIPc5ZHno8qIS0E66vJkSnzCN7UTMmv6yuTsqr5vahRpC5kyJ3bTg/fEslynrXZg37ajB73IgZfeSbMtLbGChTOzBlwuXnMMjA+HKldCHv9kmYwor0BLX5XQJt24T1od3yRBLiobIy2Hds3AwGLPIhzl4pGD4q2EofEImkI0Po8r3iCFhhjUdiYBudrn28JhHvW6zyllmXT4XR2UpLXuXBDnkUdCc+iUsXjmulSwfNL97smwl7FO/8FRc6rTg7vZMLk0D3wwO8fSjH90ssJhLGprJYIfPbKrD8A== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=lZ+ZIZ86; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=lZ+ZIZ86; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4XNh4Q5q5kz2xks for ; Wed, 9 Oct 2024 16:18:30 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1728451110; bh=/2fdo1k4hKJkz1aBMESfCkRGljgvCeelgkI8u7WzoGM=; h=From:To:Subject:Date:From; b=lZ+ZIZ861742w7kXYzNu+34K1Zk6CoLupWXQyhA2E4es8XF5/eKkPpAd0zZFJxRs2 l7UPezbUikZeLBb6a3RzvZ9U8VhGcNdb0mzNDO8zV6OtM4iD7FO/Ar7u5MXzGOXgfC 1+Y7ZXs2a0HxngTktEJPhTHW8ci/SCYSUzeSQUyctjN5AIx5g9JSZnuKnl4i5C15RH ZpkGznbXKtH/wAC1nmaIkIKHODE50w/9bSHXhNtiEGscu/Z6IcPBRZL26/f3yvL3rM bO/hy1FpxSPcpJTVhQYvZzRi+iPSpIGpxWGhyDibWPb6LBbbsIqT1GlgWCtKat2Ici k+X9up8HCTBbA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4XNh4P6nRCz4wy9; Wed, 9 Oct 2024 16:18:29 +1100 (AEDT) From: Michael Ellerman To: Subject: [PATCH 1/2] powerpc/machdep: Drop include of seq_file.h Date: Wed, 9 Oct 2024 16:18:25 +1100 Message-ID: <20241009051826.132805-1-mpe@ellerman.id.au> X-Mailer: git-send-email 2.46.2 X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Post: List-Subscribe: , , List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on lists.ozlabs.org Drop the include of seq_file.h in machdep.h, replace it with a forward declaration of struct seq_file, which is all that's required. Add direct includes of seq_file.h to some files that were getting seq_file.h via machdep.h. Signed-off-by: Michael Ellerman --- arch/powerpc/include/asm/machdep.h | 2 +- arch/powerpc/platforms/52xx/efika.c | 1 + arch/powerpc/platforms/embedded6xx/linkstation.c | 1 + arch/powerpc/platforms/embedded6xx/mvme5100.c | 1 + arch/powerpc/platforms/pseries/lpar.c | 1 + arch/powerpc/platforms/pseries/msi.c | 1 + arch/powerpc/platforms/pseries/papr_scm.c | 1 + arch/powerpc/sysdev/xive/spapr.c | 1 + 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 1862f94335ee..3326730cd300 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -4,7 +4,6 @@ #ifdef __KERNEL__ #include -#include #include #include #include @@ -18,6 +17,7 @@ struct file; struct pci_controller; struct kimage; struct pci_host_bridge; +struct seq_file; struct machdep_calls { const char *name; diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c index 37a67120f257..a7172f9ebaad 100644 --- a/arch/powerpc/platforms/52xx/efika.c +++ b/arch/powerpc/platforms/52xx/efika.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index e265f026eee2..4012f206ec63 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include diff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c index 00bec0f051be..5ca41972ef22 100644 --- a/arch/powerpc/platforms/embedded6xx/mvme5100.c +++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index c1d8bee8f701..0c428f1ae712 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c index 6dfb55b52d36..fdc2f7f38dc9 100644 --- a/arch/powerpc/platforms/pseries/msi.c +++ b/arch/powerpc/platforms/pseries/msi.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index 9e297f88adc5..f84ac9fbe203 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c index f2fa985a2c77..5aedbe3e8e6a 100644 --- a/arch/powerpc/sysdev/xive/spapr.c +++ b/arch/powerpc/sysdev/xive/spapr.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include From patchwork Wed Oct 9 05:18:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 1994552 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=myJQxFHt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev+bounces-1870-incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XNh4X4pTnz1xsq for ; Wed, 9 Oct 2024 16:18:36 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4XNh4S6kqTz2yVG; Wed, 9 Oct 2024 16:18:32 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1728451112; cv=none; b=n47gj/2W6OS1+g5ykVGsHDUZv6bHTKTp7iI/Ae5UKChC9u6eb8uu9ZvLrwu5ShbZsaXWxqvZV9SDzZJhAYAv/lu1BmEKiiJ31RrD13rwmK6OKb8yB6b6qjkSB6v7a4mE7UUHSO59RvrhXZ+Q5cFOEoAxzRCuxCzTy5Wx860GBzyPG04T/AWeYcDPp/KaSyUyDsQVd7VrgfAYaJeHog8nmY6RIM5Beya6cCSc3YHCv8r8Az+4uvhDrI78n5oaIZL5N+UnlwRoNyOGxmlvdg2LtuUPhpgP+BOv+efahr7AplihXrxD0UX66yqKAsj9VtiAW+XvhIXFi2T44E7Od9UqXA== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1728451112; c=relaxed/relaxed; bh=eWl+SngBEf+IgWIyKVrQhZ0jzt1CRGybVC4NFfwT/o4=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cFwcAdUzVboiKN8LQq8S9Xvy7Y+wRPhsqFzafAFM63eUDIsWxM3xTFhMUWrH5zwE+JLc3ZgBX9QtBUpca2x1LwNuMeEiiPiSX924huNFf1XyyUkntI0jYXqRRM2z/T45Vwbrq01ldL84gAIQZkIXMzQlseEIc0W1o77PFnCorX7ItdwqYX2TEOgmSGcsuey5OuSz/geuQIIUVIIixj5nCLiqz9KIudL56jq2KSxcnKs1Qld11u7/se8wbdBtJn07bH/PlsprLJnAHSSt9hasQmwLeYQBSDY200nQ2Iccm1+bYRUigJh65IKy/8nxYB+cdZoBXJX8+rizY5B6RGx5rQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=myJQxFHt; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=myJQxFHt; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4XNh4S3kLtz2xks for ; Wed, 9 Oct 2024 16:18:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1728451111; bh=eWl+SngBEf+IgWIyKVrQhZ0jzt1CRGybVC4NFfwT/o4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=myJQxFHtkCqPjkhcPQ3S8e18kXSpNOHmdd27GGJZUhMCDHTba/C47lvDQkTYCM37j jQKNiY8n+eSc0FfOWjywDDwgyYnLrHneWPbaInBBs4wF+Vw1xhsM77koY6t27N+UiB rMypMvIJSfZHXzvtKO8pzAbtDPaGW0nAMVTb1UnorugR43BnvkhtLakaPl13pJzvHn Rw9/qxXEl663qwKgJQuke3UvcDUH2NADC1igXCwN059HRccfhrVbMH3ICHBVYuOSZd daOBg8Rlwb9Bs+9AtQjG5Sf2164FmQmtfTjLZ5di08JRHKyU3q2XiB/kyLUeRf1g9y a7RZ96vdjTE5Q== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4XNh4R2tZhz4x8C; Wed, 9 Oct 2024 16:18:31 +1100 (AEDT) From: Michael Ellerman To: Subject: [PATCH 2/2] powerpc/machdep: Drop include of dma-mapping.h Date: Wed, 9 Oct 2024 16:18:26 +1100 Message-ID: <20241009051826.132805-2-mpe@ellerman.id.au> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241009051826.132805-1-mpe@ellerman.id.au> References: <20241009051826.132805-1-mpe@ellerman.id.au> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Post: List-Subscribe: , , List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on lists.ozlabs.org Drop the include of dma-mapping.h in machdep.h, replace it with forward declarations of struct device and struct pci_dev, and include time64.h and page.h which are required for time64_t and pgprot_t respectively. Add direct includes of some other headers to some files that were getting them via machdep.h. Signed-off-by: Michael Ellerman --- arch/powerpc/include/asm/machdep.h | 6 +++++- arch/powerpc/kernel/sysfs.c | 1 + arch/powerpc/platforms/pseries/svm.c | 1 + drivers/cpuidle/cpuidle-pseries.c | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 3326730cd300..3298eec123a3 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -5,15 +5,19 @@ #include #include -#include #include +#include + +#include struct pt_regs; struct pci_bus; +struct device; struct device_node; struct iommu_table; struct rtc_time; struct file; +struct pci_dev; struct pci_controller; struct kimage; struct pci_host_bridge; diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index b842c83ab497..6b3dd6decdf9 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/powerpc/platforms/pseries/svm.c b/arch/powerpc/platforms/pseries/svm.c index 3b4045d508ec..10b8eb6bff39 100644 --- a/arch/powerpc/platforms/pseries/svm.c +++ b/arch/powerpc/platforms/pseries/svm.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/cpuidle/cpuidle-pseries.c b/drivers/cpuidle/cpuidle-pseries.c index 14db9b7d985d..f68c65f1d023 100644 --- a/drivers/cpuidle/cpuidle-pseries.c +++ b/drivers/cpuidle/cpuidle-pseries.c @@ -22,6 +22,7 @@ #include #include #include +#include static struct cpuidle_driver pseries_idle_driver = { .name = "pseries_idle",