On 6/15/23 02:36, Rob Herring wrote:
> Add COMPILE_TEST to enable building Cavium Octeon drivers in MIPS
> allyesconfig/allmodconfig builds. There's a dependency on MIPS headers,
> so other arches can't be enabled.
Yes, I tried... That is unfortunate.
Looks good to me though. If I get an Ack for patch 1, I can queue this up
through the ata tree.
>
> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
> ---
> Tested on allmodconfig build. Not sure if there's other MIPS configs
> where this doesn't work. We'll see what 0-day says.
>
> drivers/ata/Kconfig | 4 ++--
> drivers/ata/pata_octeon_cf.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index 42b51c9812a0..4572f837e504 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -239,7 +239,7 @@ config AHCI_MVEBU
>
> config AHCI_OCTEON
> tristate "Cavium Octeon Soc Serial ATA"
> - depends on SATA_AHCI_PLATFORM && CAVIUM_OCTEON_SOC
> + depends on SATA_AHCI_PLATFORM && MIPS && (CAVIUM_OCTEON_SOC || COMPILE_TEST)
> default y
> help
> This option enables support for Cavium Octeon SoC Serial ATA.
> @@ -373,7 +373,7 @@ config PDC_ADMA
>
> config PATA_OCTEON_CF
> tristate "OCTEON Boot Bus Compact Flash support"
> - depends on CAVIUM_OCTEON_SOC
> + depends on MIPS && (CAVIUM_OCTEON_SOC || COMPILE_TEST)
> select PATA_TIMINGS
> help
> This option enables a polled compact flash driver for use with
> diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
> index 57b2166a6d5d..cc9e4b63ded9 100644
> --- a/drivers/ata/pata_octeon_cf.c
> +++ b/drivers/ata/pata_octeon_cf.c
> @@ -853,8 +853,8 @@ static int octeon_cf_probe(struct platform_device *pdev)
> of_node_put(dma_node);
> return -EINVAL;
> }
> - cf_port->dma_base = (u64)devm_ioremap(&pdev->dev, res_dma->start,
> - resource_size(res_dma));
> + cf_port->dma_base = (uintptr_t)devm_ioremap(&pdev->dev, res_dma->start,
> + resource_size(res_dma));
> if (!cf_port->dma_base) {
> put_device(&dma_dev->dev);
> of_node_put(dma_node);
--
Damien Le Moal
Western Digital Research
