From nobody Wed Dec 4 19:02:46 2024 Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB5136AAD for ; Mon, 2 Dec 2024 20:27:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.23.249 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733171255; cv=none; b=qICH2kRoE4GAA2GOR0sRDovJ2OIDWwPcePIsKsIgAii/4WfYXoj4lhZFznXPGz5s3/NzEJ6VG7sHRjitSghAIik8DkHXF7w6p6yqoepxd4op16iEyXUY1LgNAsqNGaRTkckUS9TwtpCMRPyLhoKtQNDo7tSX25KIXr5V3nsOlVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733171255; c=relaxed/simple; bh=2HU7XWxip2UgDVkC7chuPQVOS72O62R8gByblaP2zs4=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=R24d1FR4xNNdGy6ikyg79yE/F9wQLrEKjjCra+l0Fyq6Dt0wWL0POCSQH6MjM9KNeDvhA1wY8Rd2iuFJY/iyksBC3vJq47UHvuJJvY+TF7MIeH54bpafh4ErsC4gHijH7D/Dsc3OAKecKYwliM45748i9x2y6umNmO0Fgd+xnio= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=mRdzOJj7; arc=none smtp.client-ip=198.47.23.249 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="mRdzOJj7" Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 4B2KRLik075303; Mon, 2 Dec 2024 14:27:21 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1733171241; bh=NaRKe/7DGKnbOUiUz5NG4MKDmFIpIXZ07dw8DEoCr3c=; h=From:To:CC:Subject:Date; b=mRdzOJj7wA9IOFsVrYOoF1DkbWWDDRX9Xb4gsUbfGfulK3sIX1FWCxj3nDtxQWt3g Z5RTiVvvKiEVRkLHr4VR/qGrCz9NrrEQ12bIt3f9y373dPqeCMMchl/iDDWS0ixS1T XH2u44tsBWVbjnOOs+lvu3CJdo4gwYu0ArJvfTdY= Received: from DLEE111.ent.ti.com (dlee111.ent.ti.com [157.170.170.22]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 4B2KRL8n122460 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 2 Dec 2024 14:27:21 -0600 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 2 Dec 2024 14:27:21 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 2 Dec 2024 14:27:20 -0600 Received: from fllvsmtp8.itg.ti.com ([10.249.42.149]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 4B2KRKcT081503; Mon, 2 Dec 2024 14:27:20 -0600 From: Andrew Davis To: Linus Walleij , Russell King , Arnd Bergmann , Jean-Marie Verdun , Nick Hawkins CC: , , Andrew Davis Subject: [PATCH v2] ARM: mach-hpe: Rework support and directory structure Date: Mon, 2 Dec 2024 14:27:19 -0600 Message-ID: <20241202202719.111739-1-afd@ti.com> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea Content-Type: text/plain; charset="utf-8" Having a platform need a mach-* directory should be seen as a negative, it means the platform needs special non-standard handling. ARM64 support does not allow mach-* directories at all. While we may not get to that given all the non-standard architectures we support, we should still try to get as close as we can and reduce the number of mach directories. The mach-hpe/ directory and files, provides just one "feature": having the kernel print the machine name if the DTB does not also contain a "model" string (which they always do). To reduce the number of mach-* directories let's do without that feature and remove this directory. Note, we drop the l2c_aux_mask =3D ~0 line, but this is safe as the fallback GENERIC_DT machine has that as the default. Signed-off-by: Andrew Davis --- Changes for v2: - Rebased on v6.13-rc1 MAINTAINERS | 1 - arch/arm/Kconfig | 2 -- arch/arm/Kconfig.platforms | 25 +++++++++++++++++++++++++ arch/arm/Makefile | 1 - arch/arm/mach-hpe/Kconfig | 23 ----------------------- arch/arm/mach-hpe/Makefile | 1 - arch/arm/mach-hpe/gxp.c | 15 --------------- 7 files changed, 25 insertions(+), 43 deletions(-) delete mode 100644 arch/arm/mach-hpe/Kconfig delete mode 100644 arch/arm/mach-hpe/Makefile delete mode 100644 arch/arm/mach-hpe/gxp.c diff --git a/MAINTAINERS b/MAINTAINERS index 1e930c7a58b13..8d8f3caa4066d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2489,7 +2489,6 @@ F: Documentation/devicetree/bindings/spi/hpe,gxp-spif= i.yaml F: Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml F: Documentation/hwmon/gxp-fan-ctrl.rst F: arch/arm/boot/dts/hpe/ -F: arch/arm/mach-hpe/ F: drivers/clocksource/timer-gxp.c F: drivers/hwmon/gxp-fan-ctrl.c F: drivers/i2c/busses/i2c-gxp.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 202397be76d80..4053aee636ef1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -391,8 +391,6 @@ source "arch/arm/mach-highbank/Kconfig" =20 source "arch/arm/mach-hisi/Kconfig" =20 -source "arch/arm/mach-hpe/Kconfig" - source "arch/arm/mach-imx/Kconfig" =20 source "arch/arm/mach-ixp4xx/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index 845ab08e20a4b..5c19c1f2cff61 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -87,6 +87,31 @@ config MACH_ASM9260 help Support for Alphascale ASM9260 based platform. =20 +menuconfig ARCH_HPE + bool "HPE SoC support" + depends on ARCH_MULTI_V7 + help + This enables support for HPE ARM based BMC chips. + +if ARCH_HPE + +config ARCH_HPE_GXP + bool "HPE GXP SoC" + depends on ARCH_MULTI_V7 + select ARM_VIC + select GENERIC_IRQ_CHIP + select CLKSRC_MMIO + help + HPE GXP is the name of the HPE Soc. This SoC is used to implement many + BMC features at HPE. It supports ARMv7 architecture based on the Cortex + A9 core. It is capable of using an AXI bus to which a memory controller + is attached. It has multiple SPI interfaces to connect boot flash and + BIOS flash. It uses a 10/100/1000 MAC for network connectivity. It + has multiple i2c engines to drive connectivity with a host + infrastructure. + +endif + menuconfig ARCH_MOXART bool "MOXA ART SoC" depends on ARCH_MULTI_V4 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 00ca7886b18ef..c1cd02a53aa3d 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -188,7 +188,6 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) +=3D footbridge machine-$(CONFIG_ARCH_GEMINI) +=3D gemini machine-$(CONFIG_ARCH_HIGHBANK) +=3D highbank machine-$(CONFIG_ARCH_HISI) +=3D hisi -machine-$(CONFIG_ARCH_HPE) +=3D hpe machine-$(CONFIG_ARCH_IXP4XX) +=3D ixp4xx machine-$(CONFIG_ARCH_KEYSTONE) +=3D keystone machine-$(CONFIG_ARCH_LPC18XX) +=3D lpc18xx diff --git a/arch/arm/mach-hpe/Kconfig b/arch/arm/mach-hpe/Kconfig deleted file mode 100644 index 3372bbf38d383..0000000000000 --- a/arch/arm/mach-hpe/Kconfig +++ /dev/null @@ -1,23 +0,0 @@ -menuconfig ARCH_HPE - bool "HPE SoC support" - depends on ARCH_MULTI_V7 - help - This enables support for HPE ARM based BMC chips. -if ARCH_HPE - -config ARCH_HPE_GXP - bool "HPE GXP SoC" - depends on ARCH_MULTI_V7 - select ARM_VIC - select GENERIC_IRQ_CHIP - select CLKSRC_MMIO - help - HPE GXP is the name of the HPE Soc. This SoC is used to implement many - BMC features at HPE. It supports ARMv7 architecture based on the Cortex - A9 core. It is capable of using an AXI bus to which a memory controller - is attached. It has multiple SPI interfaces to connect boot flash and - BIOS flash. It uses a 10/100/1000 MAC for network connectivity. It - has multiple i2c engines to drive connectivity with a host - infrastructure. - -endif diff --git a/arch/arm/mach-hpe/Makefile b/arch/arm/mach-hpe/Makefile deleted file mode 100644 index 8b0a91234df4e..0000000000000 --- a/arch/arm/mach-hpe/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_ARCH_HPE_GXP) +=3D gxp.o diff --git a/arch/arm/mach-hpe/gxp.c b/arch/arm/mach-hpe/gxp.c deleted file mode 100644 index 581c8da517b86..0000000000000 --- a/arch/arm/mach-hpe/gxp.c +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Hewlett-Packard Enterprise Development Company, L.P.= */ - -#include - -static const char * const gxp_board_dt_compat[] =3D { - "hpe,gxp", - NULL, -}; - -DT_MACHINE_START(GXP_DT, "HPE GXP") - .dt_compat =3D gxp_board_dt_compat, - .l2c_aux_val =3D 0, - .l2c_aux_mask =3D ~0, -MACHINE_END --=20 2.39.2