Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Wed, 11 Oct 2023 11:20:02 -0700
From:   Saeed Mahameed <saeed@kernel.org>
To:     Niklas Schnelle <schnelle@linux.ibm.com>
Cc:     Saeed Mahameed <saeedm@nvidia.com>,
        Leon Romanovsky <leon@kernel.org>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Matthew Rosato <mjrosato@linux.ibm.com>,
        Joerg Roedel <joro@8bytes.org>,
        Robin Murphy <robin.murphy@arm.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, Shay Drory <shayd@nvidia.com>,
        Moshe Shemesh <moshe@nvidia.com>,
        Heiko Carstens <hca@linux.ibm.com>,
        Alexander Gordeev <agordeev@linux.ibm.com>,
        linux-s390@vger.kernel.org, netdev@vger.kernel.org,
        linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org,
        Jacob Keller <jacob.e.keller@intel.com>
Subject: Re: [PATCH net v3] net/mlx5: fix calling mlx5_cmd_init() before DMA
 mask is set
Message-ID: <ZSbnUlJT1u3xUIqY@x130>
References: <20231011-mlx5_init_fix-v3-1-787ffb9183c6@linux.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <20231011-mlx5_init_fix-v3-1-787ffb9183c6@linux.ibm.com>
Precedence: bulk

On 11 Oct 09:57, Niklas Schnelle wrote:
>Since commit 06cd555f73ca ("net/mlx5: split mlx5_cmd_init() to probe and
>reload routines") mlx5_cmd_init() is called in mlx5_mdev_init() which is
>called in probe_one() before mlx5_pci_init(). This is a problem because
>mlx5_pci_init() is where the DMA and coherent mask is set but
>mlx5_cmd_init() already does a dma_alloc_coherent(). Thus a DMA
>allocation is done during probe before the correct mask is set. This
>causes probe to fail initialization of the cmdif SW structs on s390x
>after that is converted to the common dma-iommu code. This is because on
>s390x DMA addresses below 4 GiB are reserved on current machines and
>unlike the old s390x specific DMA API implementation common code
>enforces DMA masks.
>
>Fix this by moving set_dma_caps() out of mlx5_pci_init() and into
>probe_one() before mlx5_mdev_init(). To match the overall naming scheme
>rename it to mlx5_dma_init().

How about we just call mlx5_pci_init() before mlx5_mdev_init(), instead of
breaking it apart ? 
>