[PATCH 03/23] blk: Enable CONFIG_BLK for all media

[Simon Glass]

Hi Heinrich,

On Mon, 8 Aug 2022 at 02:00, Heinrich Schuchardt <xypron.glpk at gmx.de> wrote:
>
> On 8/7/22 17:46, Simon Glass wrote:
> > Enable this option on all boards which support block devices. Drop the
> > related depencies on BLK since these are not needed anymore.
> >
> > Disable BLOCK_CACHE on M5253DEMO as this causes a build error.
> >
> > Signed-off-by: Simon Glass <sjg at chromium.org>
> > ---
> >
> >   arch/arm/Kconfig            | 1 -
> >   configs/M5253DEMO_defconfig | 1 +
> >   drivers/ata/Kconfig         | 1 -
> >   drivers/block/Kconfig       | 3 ++-
> >   drivers/nvme/Kconfig        | 1 -
> >   drivers/scsi/Kconfig        | 1 -
> >   drivers/virtio/Kconfig      | 1 -
> >   7 files changed, 3 insertions(+), 6 deletions(-)
> >
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > index 949ebb46ba2..3cb949af165 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -1016,7 +1016,6 @@ config ARCH_NPCM
> >   config ARCH_APPLE
> >       bool "Apple SoCs"
> >       select ARM64
> > -     select BLK
> >       select CLK
> >       select CMD_USB
> >       select DM
> > diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
> > index 79382eb0fe4..a73aca082c3 100644
> > --- a/configs/M5253DEMO_defconfig
> > +++ b/configs/M5253DEMO_defconfig
> > @@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y
> >   CONFIG_CMD_FAT=y
> >   CONFIG_MAC_PARTITION=y
> >   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> > +# CONFIG_BLOCK_CACHE is not set
> >   CONFIG_SYS_IDE_MAXBUS=1
> >   CONFIG_SYS_ATA_STRIDE=4
> >   CONFIG_SYS_ATA_DATA_OFFSET=0xA0
> > diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> > index 7715c403656..7d2315bd4a2 100644
> > --- a/drivers/ata/Kconfig
> > +++ b/drivers/ata/Kconfig
> > @@ -9,7 +9,6 @@ config AHCI
> >
> >   config SATA
> >       bool "Support SATA controllers"
> > -     depends on BLK
> >       select HAVE_BLOCK_DEVICE
> >       help
> >         This enables support for SATA (Serial Advanced Technology
> > diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
> > index b5b482086af..79cdb62aa81 100644
> > --- a/drivers/block/Kconfig
> > +++ b/drivers/block/Kconfig
> > @@ -1,7 +1,8 @@
> >   config BLK
> >       bool "Support block devices"
> >       depends on DM
> > -     default y if DM_MMC || DM_USB
> > +     default y if MMC || USB || SCSI || NVME || IDE || AHCI
> > +     default y if EFI_MEDIA || VIRTIO_BLK || PVBLOCK
>
> Shouldn't SATA be in this list?

OK I'll add it

>
> The logic in this patch is wrong.
>
> Default y means that a user may configure BLK=n even if VIRTIO_BLK=y.
> With patch 1-3 applied qemu-riscv64_smode_defconfig plus DM_MMC=n, BLK=n
> does not compile.
>
> VIRTIO_BLK must depend on BLK=y. Same for all other drivers.
> Or you must otherwise ensure that BLK=n does not lead to a build failure.

But this is changed in a later patch, so I think this is correct. I am
trying to do one thing at a time.

Regards,
Simon