From mboxrd@z Thu Jan 1 00:00:00 1970 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 8EE74C433F5 for ; Sat, 22 Jan 2022 13:18:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 692F583003; Sat, 22 Jan 2022 14:18:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="gQIzaZKK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CDE58830B9; Sat, 22 Jan 2022 14:18:35 +0100 (CET) Received: from mail-vk1-xa2d.google.com (mail-vk1-xa2d.google.com [IPv6:2607:f8b0:4864:20::a2d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7D5EF82EBB for ; Sat, 22 Jan 2022 14:18:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@google.com Received: by mail-vk1-xa2d.google.com with SMTP id v192so7245423vkv.4 for ; Sat, 22 Jan 2022 05:18:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=p6sIo/s28FzicU1KIqQ30fc+IKK1QP2b3tKAWiR9kuY=; b=gQIzaZKKTt5FbHzvagWHYB1rVr0vbAd4SNcd1W6D8sYL4ZMX9knYzXJ2qCDnvPSKFp 2/lqfLbYt0MXn5xUjgT+56duQtg77aETwdixhSTNQDe1nmJD5FnkJAwBSyUR12m8wSGx OJW/nw4eHN1jOixv8tXPR7A1qBNA8O+Da6sBQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=p6sIo/s28FzicU1KIqQ30fc+IKK1QP2b3tKAWiR9kuY=; b=syZZ5RQ2+rtY9fXAqzhUFy6K+pUeB7+UTuVMiqNSK+u3aJ/MR7db/9AVIbAyBjaPA3 sybd0E633jsdHTTJHw2TAvX8dXExo0mqB9zoR7rD7rgiliMkWzEbS5Xihg9Pf5HXf859 8XmxFlPFDvTruq8OrxtXEwcyP6Sa/4W5FXktvH2R2P4ZCeRa1/JrzcPHRQZbdFTRdIyY 9/TCseT3JXeOMVsFaiSyeAiNTqwGNUZiU44Kpwkuv+GPadtRmrpu7lY2k5TU8m1yI+vX lmynxAunvh1Cp17PPaMVHotbDLKAo4H77UUy1+ZF0RNKYUbBExkYJTV5qLLEq2MLGN/l 0x0w== X-Gm-Message-State: AOAM531rX6S2xTSKgzDeAWdV9Y9gz8cCGr1sXYEOSy3zrnS6+NNquBq7 X6Cw1MdRg7aD8sbSGqXxm+H1r7zSdMnyL54v1M4afw== X-Google-Smtp-Source: ABdhPJyj1ZdVNSUJW8RB40wnitAQi5IcYq6yCTT4+4ky+zP/NGEJ/CXJB9DROQG19jQDp1cFo2gVlqEMepqc8+Kh8zw= X-Received: by 2002:a05:6122:208a:: with SMTP id i10mr3534108vkd.16.1642857510891; Sat, 22 Jan 2022 05:18:30 -0800 (PST) MIME-Version: 1.0 References: <20220114110438.58452-1-kettenis@openbsd.org> <20220114110438.58452-2-kettenis@openbsd.org> In-Reply-To: From: Simon Glass Date: Sat, 22 Jan 2022 06:18:18 -0700 Message-ID: Subject: Re: [PATCH 1/8] nvme: Split out PCI support To: Mark Kettenis Cc: Mark Kettenis , U-Boot Mailing List , Jaehoon Chung , Tom Rini , sven@svenpeter.dev, marcan@marcan.st, Bin Meng Content-Type: text/plain; charset="UTF-8" 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 Hi Mark, On Sat, 22 Jan 2022 at 05:48, Mark Kettenis wrote: > > > 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. OK. BTW I noticed that the U-Boot logo has the wrong colours on the Macbook Air, with these patches applied to mainline. > > > Otherwise: > > Reviewed-by: Simon Glass > > Tested on: Macbook Air M1 > > Tested-by: Simon Glass Regards, Simon