From patchwork Wed May 12 14:50:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 435610 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5060985jao; Wed, 12 May 2021 11:06:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEYtBkw+2DoZ2zag0V9azh3d5rz44CXx0itYEcIFTs6vyExnTGOE4Rq9++5IamkT6aR+6o X-Received: by 2002:a92:d34a:: with SMTP id a10mr3790307ilh.123.1620842773528; Wed, 12 May 2021 11:06:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620842773; cv=none; d=google.com; s=arc-20160816; b=SresEFxDDymxPBJvXW7lgufSMS9K5qsAzTXRWgzGh6IhCXHayoMj1LK0JdBEln9zg6 KpBp9lVfu0wx+VfKL8NDAWFWOGHpGGaWCipddX6hpj2dxRXmoeqGgcTFdW26oaosqEnK JTeGbN/vJAtPhlTMZE9RzyRpaCBK6azSJhAfTFDic61czg9YBdl766KZpsTtwQtY9lWy eqRCvju5YZ0ZFWekGXDWVtjPLzgRGsFsZ+7a8uNuu/DSD20u2Q8dBmoJ24et/RVjyP/4 9sEI9scMoq+zkv03kEd4Ktl69jP1G6+nZjg0DB2YUFPpUiX1tga8tG9nBT6AMCb0hK/z 8qmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q075/FUQiefqHKf6S/YWh2/nBK+zonAbiULQ8GeuDyo=; b=a8iyjUUm9oUXSCifv7K7VUlBSYpJiL/KFyKLcVHCd6eEgJFZXo5Tb3dOnT13GeF1Eq xPO8l5z2nXdCFvTV94mZk/K/DaWU4tQx5Or3OU4cDJK5h/wvwOMLtH55gxarItRanBYb snrAZEySPMMg0zXZ7We6HzYOsHLnft/ycFvYDEubBdOk12QMZTY+fuGJPLwiWLP1y2ug LPqfSF4Fb2Sr7L3p95/ntcpTHw4DvfaBhqEc89HTs3u6rrcpztP9thUeGiqvjAtlv1rH bt7ZBzugZzGI2K1NrQFnglGSL77QR+HiRrX3DqYmwPPQQwBGlHYiXF1PQbyDtyjNCq8j b+UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=w273FAhg; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q8si330223ior.12.2021.05.12.11.06.13; Wed, 12 May 2021 11:06:13 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=w273FAhg; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237316AbhELQaD (ORCPT + 12 others); Wed, 12 May 2021 12:30:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:58402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231733AbhELQV6 (ORCPT ); Wed, 12 May 2021 12:21:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D1CD2613C1; Wed, 12 May 2021 15:46:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834410; bh=/eUJkXkBmOsXOpykiOeBOrZfPsjIwNMYCY4YJqVHwhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w273FAhg3073KHqTeSp8UuHgPu3EmgCWT93+nKc7sY5j25+O2L5PNS+AurrPa8st+ UxFcJjRdUKJobkSwNgO0AsRQhIzjVFodNamoiR5G3K0iTkmARcMBvTC3M6hr3Xozr+ LFtdu05Nb1jqm30pa4Qqa97htDUmho0n2sRKafnE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , "David S. Miller" , Sasha Levin Subject: [PATCH 5.11 533/601] net: ethernet: ixp4xx: Set the DMA masks explicitly Date: Wed, 12 May 2021 16:50:10 +0200 Message-Id: <20210512144845.405156971@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit 8d892d60941b00c86d2029c8a99db24ab4979673 ] The former fix only papered over the actual problem: the ethernet core expects the netdev .dev member to have the proper DMA masks set, or there will be BUG_ON() triggered in kernel/dma/mapping.c. Fix this by simply copying dma_mask and dma_mask_coherent from the parent device. Fixes: e45d0fad4a5f ("net: ethernet: ixp4xx: Use parent dev for DMA pool") Signed-off-by: Linus Walleij Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/xscale/ixp4xx_eth.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c index 2e5202923510..403358f2c853 100644 --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c @@ -1086,7 +1086,7 @@ static int init_queues(struct port *port) int i; if (!ports_open) { - dma_pool = dma_pool_create(DRV_NAME, port->netdev->dev.parent, + dma_pool = dma_pool_create(DRV_NAME, &port->netdev->dev, POOL_ALLOC_SIZE, 32, 0); if (!dma_pool) return -ENOMEM; @@ -1436,6 +1436,9 @@ static int ixp4xx_eth_probe(struct platform_device *pdev) ndev->netdev_ops = &ixp4xx_netdev_ops; ndev->ethtool_ops = &ixp4xx_ethtool_ops; ndev->tx_queue_len = 100; + /* Inherit the DMA masks from the platform device */ + ndev->dev.dma_mask = dev->dma_mask; + ndev->dev.coherent_dma_mask = dev->coherent_dma_mask; netif_napi_add(ndev, &port->napi, eth_poll, NAPI_WEIGHT);