Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1582FC433EF for ; Sat, 22 Jan 2022 12:48:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9D4CF8192E; Sat, 22 Jan 2022 13:47:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xs4all.nl Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 8E52E81974; Sat, 22 Jan 2022 13:47:57 +0100 (CET) Received: from sibelius.xs4all.nl (sibelius.xs4all.nl [83.163.83.176]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A261381109 for ; Sat, 22 Jan 2022 13:47:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xs4all.nl Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=mark.kettenis@xs4all.nl Received: from localhost (bloch.sibelius.xs4all.nl [local]) by bloch.sibelius.xs4all.nl (OpenSMTPD) with ESMTPA id 1bede0b1; Sat, 22 Jan 2022 13:47:53 +0100 (CET) Date: Sat, 22 Jan 2022 13:47:53 +0100 (CET) From: Mark Kettenis To: Simon Glass Cc: kettenis@openbsd.org, u-boot@lists.denx.de, jh80.chung@samsung.com, trini@konsulko.com, sven@svenpeter.dev, marcan@marcan.st, bmeng.cn@gmail.com In-Reply-To: (message from Simon Glass on Fri, 21 Jan 2022 18:40:11 -0700) Subject: Re: [PATCH 1/8] nvme: Split out PCI support References: <20220114110438.58452-1-kettenis@openbsd.org> <20220114110438.58452-2-kettenis@openbsd.org> Message-ID: X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean > From: Simon Glass > Date: Fri, 21 Jan 2022 18:40:11 -0700 > > Hi Mark, > > On Fri, 14 Jan 2022 at 04:05, Mark Kettenis wrote: > > > > Apple SoCs have an integrated NVMe controller that isn't connected > > over a PCIe bus. In preparation for adding support for this NVMe > > controller, split out the PCI support into its own file. This file > > is selected through a new CONFIG_NVME_PCI Kconfig option, so do > > a wholesale replacement of CONFIG_NVME with CONFIG_NVME_PCI. > > > > Signed-off-by: Mark Kettenis > > --- > > configs/clearfog_gt_8k_defconfig | 2 +- > > configs/firefly-rk3399_defconfig | 2 +- > > configs/khadas-vim3_android_ab_defconfig | 2 +- > > configs/khadas-vim3_android_defconfig | 2 +- > > configs/khadas-vim3_defconfig | 2 +- > > configs/khadas-vim3l_android_ab_defconfig | 2 +- > > configs/khadas-vim3l_android_defconfig | 2 +- > > configs/khadas-vim3l_defconfig | 2 +- > > configs/kontron_sl28_defconfig | 2 +- > > configs/ls1012afrdm_qspi_defconfig | 2 +- > > configs/ls1012afrdm_tfa_defconfig | 2 +- > > .../ls1012afrwy_qspi_SECURE_BOOT_defconfig | 2 +- > > configs/ls1012afrwy_qspi_defconfig | 2 +- > > configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1012afrwy_tfa_defconfig | 2 +- > > configs/ls1012aqds_qspi_defconfig | 2 +- > > configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1012aqds_tfa_defconfig | 2 +- > > configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 2 +- > > configs/ls1012ardb_qspi_defconfig | 2 +- > > configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1012ardb_tfa_defconfig | 2 +- > > configs/ls1021aiot_qspi_defconfig | 2 +- > > configs/ls1021aiot_sdcard_defconfig | 2 +- > > configs/ls1021aqds_ddr4_nor_defconfig | 2 +- > > configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 2 +- > > configs/ls1021aqds_nand_defconfig | 2 +- > > configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 2 +- > > configs/ls1021aqds_nor_defconfig | 2 +- > > configs/ls1021aqds_nor_lpuart_defconfig | 2 +- > > configs/ls1021aqds_qspi_defconfig | 2 +- > > configs/ls1021aqds_sdcard_ifc_defconfig | 2 +- > > configs/ls1021aqds_sdcard_qspi_defconfig | 2 +- > > configs/ls1021atsn_qspi_defconfig | 2 +- > > configs/ls1021atsn_sdcard_defconfig | 2 +- > > configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 +- > > configs/ls1021atwr_nor_defconfig | 2 +- > > configs/ls1021atwr_nor_lpuart_defconfig | 2 +- > > configs/ls1021atwr_qspi_defconfig | 2 +- > > configs/ls1021atwr_sdcard_ifc_defconfig | 2 +- > > configs/ls1021atwr_sdcard_qspi_defconfig | 2 +- > > configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1028aqds_tfa_defconfig | 2 +- > > configs/ls1028aqds_tfa_lpuart_defconfig | 2 +- > > configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1028ardb_tfa_defconfig | 2 +- > > configs/ls1043aqds_defconfig | 2 +- > > configs/ls1043aqds_lpuart_defconfig | 2 +- > > configs/ls1043aqds_nand_defconfig | 2 +- > > configs/ls1043aqds_nor_ddr3_defconfig | 2 +- > > configs/ls1043aqds_qspi_defconfig | 2 +- > > configs/ls1043aqds_sdcard_ifc_defconfig | 2 +- > > configs/ls1043aqds_sdcard_qspi_defconfig | 2 +- > > configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1043aqds_tfa_defconfig | 2 +- > > configs/ls1043ardb_SECURE_BOOT_defconfig | 2 +- > > configs/ls1043ardb_defconfig | 2 +- > > configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 2 +- > > configs/ls1043ardb_nand_defconfig | 2 +- > > configs/ls1043ardb_sdcard_defconfig | 2 +- > > configs/ls1043ardb_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1043ardb_tfa_defconfig | 2 +- > > configs/ls1046afrwy_tfa_defconfig | 2 +- > > configs/ls1046aqds_SECURE_BOOT_defconfig | 2 +- > > configs/ls1046aqds_defconfig | 2 +- > > configs/ls1046aqds_lpuart_defconfig | 2 +- > > configs/ls1046aqds_nand_defconfig | 2 +- > > configs/ls1046aqds_qspi_defconfig | 2 +- > > configs/ls1046aqds_sdcard_ifc_defconfig | 2 +- > > configs/ls1046aqds_sdcard_qspi_defconfig | 2 +- > > configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1046aqds_tfa_defconfig | 2 +- > > configs/ls1046ardb_emmc_defconfig | 2 +- > > configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 2 +- > > configs/ls1046ardb_qspi_defconfig | 2 +- > > configs/ls1046ardb_qspi_spl_defconfig | 2 +- > > configs/ls1046ardb_sdcard_defconfig | 2 +- > > configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1046ardb_tfa_defconfig | 2 +- > > configs/ls1088aqds_defconfig | 2 +- > > configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 2 +- > > configs/ls1088aqds_qspi_defconfig | 2 +- > > configs/ls1088aqds_sdcard_ifc_defconfig | 2 +- > > configs/ls1088aqds_sdcard_qspi_defconfig | 2 +- > > configs/ls1088aqds_tfa_defconfig | 2 +- > > configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 2 +- > > configs/ls1088ardb_qspi_defconfig | 2 +- > > configs/ls1088ardb_sdcard_qspi_defconfig | 2 +- > > configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls1088ardb_tfa_defconfig | 2 +- > > configs/ls2080aqds_SECURE_BOOT_defconfig | 2 +- > > configs/ls2080aqds_defconfig | 2 +- > > configs/ls2080aqds_nand_defconfig | 2 +- > > configs/ls2080aqds_qspi_defconfig | 2 +- > > configs/ls2080aqds_sdcard_defconfig | 2 +- > > configs/ls2080ardb_SECURE_BOOT_defconfig | 2 +- > > configs/ls2080ardb_defconfig | 2 +- > > configs/ls2080ardb_nand_defconfig | 2 +- > > configs/ls2081ardb_defconfig | 2 +- > > configs/ls2088aqds_tfa_defconfig | 2 +- > > configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 2 +- > > configs/ls2088ardb_qspi_defconfig | 2 +- > > configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/ls2088ardb_tfa_defconfig | 2 +- > > configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/lx2160aqds_tfa_defconfig | 2 +- > > configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 2 +- > > configs/lx2160ardb_tfa_defconfig | 2 +- > > configs/lx2160ardb_tfa_stmm_defconfig | 2 +- > > configs/mvebu_crb_cn9130_defconfig | 2 +- > > configs/mvebu_db_armada8k_defconfig | 2 +- > > configs/mvebu_db_cn9130_defconfig | 2 +- > > configs/mvebu_espressobin-88f3720_defconfig | 2 +- > > configs/mvebu_mcbin-88f8040_defconfig | 2 +- > > configs/mvebu_puzzle-m801-88f8040_defconfig | 2 +- > > configs/nanopc-t4-rk3399_defconfig | 2 +- > > configs/octeontx2_96xx_defconfig | 2 +- > > configs/octeontx_81xx_defconfig | 2 +- > > configs/octeontx_83xx_defconfig | 2 +- > > configs/p3450-0000_defconfig | 2 +- > > configs/pinebook-pro-rk3399_defconfig | 2 +- > > configs/qemu-x86_64_defconfig | 2 +- > > configs/qemu-x86_defconfig | 2 +- > > configs/qemu_arm64_defconfig | 2 +- > > configs/qemu_arm_defconfig | 2 +- > > configs/rcar3_salvator-x_defconfig | 2 +- > > configs/roc-pc-mezzanine-rk3399_defconfig | 2 +- > > configs/rock-pi-4-rk3399_defconfig | 2 +- > > configs/rock-pi-4c-rk3399_defconfig | 2 +- > > configs/rock-pi-n10-rk3399pro_defconfig | 2 +- > > configs/rock960-rk3399_defconfig | 2 +- > > configs/rockpro64-rk3399_defconfig | 2 +- > > configs/sandbox64_defconfig | 2 +- > > configs/sandbox_defconfig | 2 +- > > configs/sandbox_flattree_defconfig | 2 +- > > configs/sandbox_noinst_defconfig | 2 +- > > configs/sandbox_spl_defconfig | 2 +- > > configs/sifive_unmatched_defconfig | 2 +- > > configs/synquacer_developerbox_defconfig | 2 +- > > configs/turris_mox_defconfig | 2 +- > > configs/turris_omnia_defconfig | 2 +- > > doc/develop/driver-model/nvme.rst | 1 + > > drivers/nvme/Kconfig | 10 +++- > > drivers/nvme/Makefile | 1 + > > drivers/nvme/nvme.c | 38 ++------------ > > drivers/nvme/nvme.h | 3 ++ > > drivers/nvme/nvme_pci.c | 49 +++++++++++++++++++ > > 147 files changed, 207 insertions(+), 177 deletions(-) > > create mode 100644 drivers/nvme/nvme_pci.c > > > > Shouldn't the vendor addition go in another patch? I don't think that would make a ton of sense. It is intricately linked to splitting out the PCI support, as the current code grovels into pci_child_plat struct in a place that needs to be bus-agnostic. > Otherwise: > Reviewed-by: Simon Glass > Tested on: Macbook Air M1 > Tested-by: Simon Glass