From patchwork Mon Nov 13 14:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 164517 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1249474vqg; Mon, 13 Nov 2023 06:45:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IEI1DBpPKpQx48KgfpWL+cuMUTcHZ92QZQ7lc55LnVmC8h9d9n3UJGYwqB32ikMDUvVmDus X-Received: by 2002:a17:90b:4b90:b0:281:554d:b317 with SMTP id lr16-20020a17090b4b9000b00281554db317mr4692050pjb.38.1699886704991; Mon, 13 Nov 2023 06:45:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699886704; cv=none; d=google.com; s=arc-20160816; b=m+FK36hal1jVdyjflaxIPAx2vFxFbWvrE9i9DNAO3qAM5Xt5Tll5Bfv1/wrw0/SF8W Zm7bhQ/QZxBDcc0XwieGKFVsWzThyDFELzLHbImQXwgLx4229D5vgWSu2zK8OF0T5tb5 se7U1cFEeA7+F5t9Zt9EUQQLGSoLZsbtgkTNIoq0/n6IRkdsIxeHMWiF5DsQaz82Gkiw n1RcKFDYV4Oe5mfQGiOYVMM9wjdWSWilT5D+oLSSrqX1yv/04LlK5ARR9TUleeYlO3V0 ttKKVz9IHNbdBW3ZKyBnVGNnDvV4PtBrCHKe8sL3ZvIG/JvH3x0HeWkVJEdkQz9KZd3B sMHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=053670vNwP13YdPy+JoG38ND3fYYc+OjTbm03kf6lD0=; fh=K3zJQyTKBLAkBucIcWM7aB9VmIORN+yDy3I0HaPGyfk=; b=RgN9m39h/GWBO+bKBTfgz4kDwGuFfsxln666UuNvnnNGsc9ahguCzcHuq2UEeuh6Bk Q9TIodrrPSvNXUXDuBnvzXDzsZc8OE5gs00fUdw9mx3t9nSkLtP0RhJm0S9jBNC+G/fI rI9zQpS/6xZwz+aiup6MRYCwj5khP7KOhx5HdZbg3P3V28SJYxR55Asok66DPajA6Tu0 3QV+vxUhl2X6p6Bm0aRHc7C2HCgJCovcmSpGexc42Q1TN4LLX6Ot9AxHleEFqa67dX5f EK8fBcixY/0vlHFnE0lg893cWGhrI31gohbjuTOIuziM1DqSbWacXpfQyNNIkGEn7v1m /FQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=zNYEbkoN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id my6-20020a17090b4c8600b0027cde7f5860si6464358pjb.30.2023.11.13.06.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 06:45:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=zNYEbkoN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3D2CA802C654; Mon, 13 Nov 2023 06:45:03 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231298AbjKMOo7 (ORCPT + 29 others); Mon, 13 Nov 2023 09:44:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230265AbjKMOoo (ORCPT ); Mon, 13 Nov 2023 09:44:44 -0500 Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7BFD171A for ; Mon, 13 Nov 2023 06:44:39 -0800 (PST) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3ADEi7wN014479; Mon, 13 Nov 2023 08:44:07 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1699886647; bh=053670vNwP13YdPy+JoG38ND3fYYc+OjTbm03kf6lD0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=zNYEbkoNQd+sDfjFR12op9/wajo8uAidiw3Uxm75F1IahoT1ETBFf42yv/CFGO42Q UaVu/EmbLspgLRGM6QilwcY4CyWP1VHDfJFJCL4wH0bS8DhhdNIYGcqFRVTzNTpdT6 +NMPGbgZI2/2PJ980QNjWcTCctTvxkhzLv/ldlN8= Received: from DLEE111.ent.ti.com (dlee111.ent.ti.com [157.170.170.22]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3ADEi7pV020192 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 13 Nov 2023 08:44:07 -0600 Received: from DLEE100.ent.ti.com (157.170.170.30) 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, 13 Nov 2023 08:44:06 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE100.ent.ti.com (157.170.170.30) 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, 13 Nov 2023 08:44:06 -0600 Received: from fllv0040.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3ADEi0u2065232; Mon, 13 Nov 2023 08:44:06 -0600 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH v3 8/9] ARM: mach-hpe: Rework support and directory structure Date: Mon, 13 Nov 2023 08:43:58 -0600 Message-ID: <20231113144359.174140-9-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231113144359.174140-1-afd@ti.com> References: <20231113144359.174140-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 06:45:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782460401462167667 X-GMAIL-MSGID: 1782460401462167667 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. Signed-off-by: Andrew Davis --- 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 73f1100014218..eba68bf3417fa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2216,7 +2216,6 @@ F: Documentation/devicetree/bindings/spi/hpe,gxp-spifi.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 395530fe22402..ed069b336c308 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -383,8 +383,6 @@ source "arch/arm/mach-highbank/Kconfig" source "arch/arm/mach-hisi/Kconfig" -source "arch/arm/mach-hpe/Kconfig" - source "arch/arm/mach-imx/Kconfig" source "arch/arm/mach-ixp4xx/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index acaced2f0ab04..b4ad800a17b7e 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. +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 699be64a74be6..47c53c068e3d8 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -184,7 +184,6 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge machine-$(CONFIG_ARCH_GEMINI) += gemini machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_HISI) += hisi -machine-$(CONFIG_ARCH_HPE) += hpe machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx machine-$(CONFIG_ARCH_KEYSTONE) += keystone machine-$(CONFIG_ARCH_LPC18XX) += 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) += 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[] = { - "hpe,gxp", - NULL, -}; - -DT_MACHINE_START(GXP_DT, "HPE GXP") - .dt_compat = gxp_board_dt_compat, - .l2c_aux_val = 0, - .l2c_aux_mask = ~0, -MACHINE_END