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 X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B399EC32789 for ; Tue, 6 Nov 2018 09:05:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86CF620869 for ; Tue, 6 Nov 2018 09:05:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86CF620869 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=iki.fi Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730301AbeKFS30 (ORCPT ); Tue, 6 Nov 2018 13:29:26 -0500 Received: from emh06.mail.saunalahti.fi ([62.142.5.116]:60440 "EHLO emh06.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729416AbeKFS30 (ORCPT ); Tue, 6 Nov 2018 13:29:26 -0500 Received: from darkstar.musicnaut.iki.fi (85-76-96-200-nat.elisa-mobile.fi [85.76.96.200]) by emh06.mail.saunalahti.fi (Postfix) with ESMTP id B3B6F30133; Tue, 6 Nov 2018 11:05:11 +0200 (EET) Date: Tue, 6 Nov 2018 11:05:11 +0200 From: Aaro Koskinen To: Christoph Hellwig Cc: Robin Murphy , Rob Herring , Paul Burton , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Subject: Re: [REGRESSION] OCTEON MMC driver failure with v4.19 Message-ID: <20181106090511.GA14958@darkstar.musicnaut.iki.fi> References: <20181026205423.GD3792@darkstar.musicnaut.iki.fi> <20181105220632.GA5083@darkstar.musicnaut.iki.fi> <20181106062724.GA12413@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181106062724.GA12413@lst.de> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Tue, Nov 06, 2018 at 07:27:24AM +0100, Christoph Hellwig wrote: > On Tue, Nov 06, 2018 at 12:06:32AM +0200, Aaro Koskinen wrote: > > With the below change, the MMC card probe seems to with v4.19. But it > > feels a bit hackish, don't you think... Is there some obvious simple > > fix that I'm missing? Any comments? > > Please just use dma_coerce_mask_and_coherent in the platform drivers > instead. Tried, but that doesn't help with v4.19: [ 1.290698] octeon_mmc 1180000002000.mmc: dma_coerce_mask_and_coherent(): -5 [ 1.297825] octeon_mmc: probe of 1180000002000.mmc failed with error -5 A. diff --git a/drivers/mmc/host/cavium-octeon.c b/drivers/mmc/host/cavium-octeon.c index 22aded1065ae..f7ce26ba6936 100644 --- a/drivers/mmc/host/cavium-octeon.c +++ b/drivers/mmc/host/cavium-octeon.c @@ -232,7 +232,8 @@ static int octeon_mmc_probe(struct platform_device *pdev) */ host->reg_off_dma = -0x20; - ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); + ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); + dev_err(&pdev->dev, "dma_coerce_mask_and_coherent(): %d", ret); if (ret) return ret;