From nobody Tue Feb 27 22:10:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TksB81HJGz5Bn01; Tue, 27 Feb 2024 22:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TksB76y1Kz4Bp2; Tue, 27 Feb 2024 22:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709071840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RfF3KS0/PTKrMdimOVHI2SC14PDKlgkzadEJ9Cz/PQ=; b=cMNm5BFS//jCoSvddcq9I7ZkPI1EkxRF2L1e5BUibAyMwbtmo5vQfqpTMfS8Dl+qh2gUuJ tria4XJp9jHXPfKM8RuN/zT5JHdQfi8AIRkUvgLV3KNEJjZWacnCRoDTWC6pSO/6BlDYIM 0XMkiUpkVevflTqSA3Zejt/cC7vNXwYz5ZWPZ4mKvp5NszPIqIVyw3PrYujYPVs9Nm7Yrd uQPDNTjXIrfDZrtRYFDFdya5RjH/fVnfB7x5X7PMz72ya+PRYfdep4kwCoH74GywIX7Xcw 3GwBzTa4XUWCj/FQYrd3KJX5qEG6cLr75QxYkPbk+OoE5H8bdvmeCTtBJcyo6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709071840; a=rsa-sha256; cv=none; b=oS1h23/E3XkkkYWjjY3A22jDbMZnSLfzUtY4s6v5I4GWJ1jTVq0eHQcqrBF9A2OJv8F6bP xHx7t480zqTSAlFPJRBKZrJdfkN/8hboWEfdIqeTDSk/2Tn8xrSVZFTLGfvHbjFDTKdE7m TUh33hgXcjAMRVMZpmuPJ2z9GZi/nT8+7rvVTWLiFok4MO0XgHPdW1wBrDU3QdAJYpvHac UWOujqlfU8zuc1ekQvymZarK9B3Ego5N1JGnQIIajNiWRmI4veBSNbR78hMHGhRHaOPIrz 1oHa97eKf8IO16Ornk2qJcAGrFDarll9WBRZf5oGVzBAttKx4RzkiLhIvEflMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709071840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RfF3KS0/PTKrMdimOVHI2SC14PDKlgkzadEJ9Cz/PQ=; b=MsQi/YauzGVzwabeY/ueFM2jD6U8So0LY8V0gjRn/+NaNBL8D6Ojl0AzQ8vGJyp5Y63NSp aTdklVMaxnCQ8NHnlUqftkfA6We/vNvnWpS21sLXMp9f4l87SYk2W/6mu0vYc358mVA0EO pDKX6dzDomHtbTvPDeyiMcNs2gJLulrwsXevdqSoeF2YQ1nQNvqt+Y8EZFhnRHzZKP2Acz I8Xj+iIhVJ0fETI/U4zQEZA4hIlIJmM8w/U893wBdg0mXxvB9Dp/LaKgKTErFCVj2Tc9Kr gPX18XtDaxdgB1EXVBLKA+x5Pl84m2B/NTD8Lry4sQ7KUiy/PeAqvhfaAPSCCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TksB75xBlzWjs; Tue, 27 Feb 2024 22:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RMAdPk040330; Tue, 27 Feb 2024 22:10:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RMAddh040327; Tue, 27 Feb 2024 22:10:39 GMT (envelope-from git) Date: Tue, 27 Feb 2024 22:10:39 GMT Message-Id: <202402272210.41RMAddh040327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: a01dc140b27e - main - conf: deduplicate dwc config logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a01dc140b27e98c200eef173e1db6e750f7d3ea0 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a01dc140b27e98c200eef173e1db6e750f7d3ea0 commit a01dc140b27e98c200eef173e1db6e750f7d3ea0 Author: Mitchell Horne AuthorDate: 2024-02-27 21:59:53 +0000 Commit: Mitchell Horne CommitDate: 2024-02-27 22:10:14 +0000 conf: deduplicate dwc config logic Move the core dwc(4) file entries to the MI conf/files. Platform-specific versions e.g. rk_dwc are retained in their current position. On arm64 this necessitates adding an additional 'device dwc' option. This hardware is found on several available/emerging RISC-V SoCs, so we will soon need it on this architecture. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44103 --- sys/arm64/conf/NOTES | 1 + sys/arm64/conf/std.altera | 1 + sys/arm64/conf/std.rockchip | 1 + sys/conf/files | 4 ++++ sys/conf/files.arm | 4 ---- sys/conf/files.arm64 | 4 ---- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index 48cd2647df70..21b1b22a5f01 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -93,6 +93,7 @@ device neta # Marvell Armada 370/38x/XP/3700 NIC device smc # SMSC LAN91C111 device vnic # Cavium ThunderX NIC device al_eth # Annapurna Alpine Ethernet NIC +device dwc # Synopsys Designware GMAC Ethernet device dwc_rk # Rockchip Designware device dwc_socfpga # Altera SOCFPGA Ethernet MAC device ice # Intel 800 Series Physical Function diff --git a/sys/arm64/conf/std.altera b/sys/arm64/conf/std.altera index 8ef17481c9e1..5a15c20f6624 100644 --- a/sys/arm64/conf/std.altera +++ b/sys/arm64/conf/std.altera @@ -12,6 +12,7 @@ device dwgpio # Synopsys DesignWare APB GPIO Controller device uart_snps # Ethernet NICs +device dwc # Synopsys DesignWare GMAC controller device dwc_socfpga # Altera SOCFPGA Ethernet MAC # MMC/SD/SDIO Card slot support diff --git a/sys/arm64/conf/std.rockchip b/sys/arm64/conf/std.rockchip index 8f8084379d62..3733ddc4eeae 100644 --- a/sys/arm64/conf/std.rockchip +++ b/sys/arm64/conf/std.rockchip @@ -35,6 +35,7 @@ device rk_pwm device uart_snps # Ethernet NICs +device dwc # Synopsys DesignWare GMAC controller device dwc_rk # Rockchip Designware device eqos # Synopsys Designware Ethernet QoS controller diff --git a/sys/conf/files b/sys/conf/files index b5f28b848800..cc476dc88210 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1591,6 +1591,10 @@ dev/drm2/ttm/ttm_execbuf_util.c optional drm2 dev/drm2/ttm/ttm_memory.c optional drm2 dev/drm2/ttm/ttm_page_alloc.c optional drm2 dev/drm2/ttm/ttm_bo_vm.c optional drm2 +dev/dwc/if_dwc.c optional dwc fdt +dev/dwc/if_dwc_if.m optional dwc fdt +dev/dwc/dwc1000_core.c optional dwc fdt +dev/dwc/dwc1000_dma.c optional dwc fdt dev/efidev/efidev.c optional efirt dev/efidev/efirt.c optional efirt dev/efidev/efirtc.c optional efirt diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 28e80016d97b..110c0a9e9dbf 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -86,10 +86,6 @@ contrib/openzfs/module/icp/asm-arm/sha2/sha512-armv7.S optional zfs compile-with crypto/des/des_enc.c optional netsmb dev/cpufreq/cpufreq_dt.c optional cpufreq fdt -dev/dwc/if_dwc.c optional dwc -dev/dwc/if_dwc_if.m optional dwc -dev/dwc/dwc1000_core.c optional dwc -dev/dwc/dwc1000_dma.c optional dwc dev/fb/fb.c optional sc dev/fdt/fdt_arm_platform.c optional platform fdt dev/video/crtc_if.m optional vt diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index cc217b3ce78f..5ff090fcf8b2 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -258,10 +258,6 @@ dev/dpaa2/memac_mdio_fdt.c optional soc_nxp_ls dpaa2 fdt dev/dpaa2/memac_mdio_if.m optional soc_nxp_ls dpaa2 acpi | soc_nxp_ls dpaa2 fdt # Synopsys DesignWare Ethernet Controller -dev/dwc/if_dwc.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 -dev/dwc/if_dwc_if.m optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 -dev/dwc/dwc1000_core.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 -dev/dwc/dwc1000_dma.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 dev/dwc/if_dwc_rk.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 dev/dwc/if_dwc_socfpga.c optional fdt dwc_socfpga