Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp913694pxb; Wed, 6 Apr 2022 04:07:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFUHhluhRkf7TX9yjOSpvxe/jeLZx/LjE4+Wphxg/HphbOORt8kkAU+UADdjcrieUEYnSy X-Received: by 2002:a65:6a13:0:b0:373:14f6:5d33 with SMTP id m19-20020a656a13000000b0037314f65d33mr6904262pgu.62.1649243224388; Wed, 06 Apr 2022 04:07:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649243224; cv=none; d=google.com; s=arc-20160816; b=BgmVtFXcZhw5KvhGM8/txgM26Y93B31EnL+3y/wmHOH9Xm9vfaTot/3S7LeHIym16z GFYdNtMN6cbdJpjce28TAmzjn9tBHPM5G7Vy20OS5uB5yAxP9kBJSIB3NouhkLqnCM5Q EkLjmYkRqI71UFfLCPzzzwetpH/37HvxuBudt+zOIzq3LJ9FsMC5IR+3vvQVz0jRBDU2 YqUizF07tjoQuRBNZuUiq+qzCCSTwmB7u/unuDVLa+gVZO3d8UTyN9i4/V31S8B0Ui6h 7srYlijRxaM9ciZWuERZVjvRbkXaukU7q6WvSIfy2aRtiAWIInMmjCWheFs20sHIF6DX kRBw== 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=IJ1L6dr3YQq/MslrvKSiIbILlBrOentiyq19hBCNveg=; b=mxkqDAZTCWWe2LY23XbUe9FS0vFWDbpn/EuxmPYIohIkkeMd0f1m6rh17RPoo/VAiB kh5wMKL2+ajeZt54Jh87uSh5W8F46FWzbiOBsNsVyEa5k2hDSs8KMuk+X6eTS43Fxu3a s+0/sAbTdBuN4XoipEd+UNn929iZ16vkCc1nAUM2VUtM1fEqDeV5tYfIIglsh5SVTehl CRQ4gRbvSNVUdoX+vFXTeo7UYV1r4PUxdNSBv2uB0LOfMKGi/nsiV7tX0K5s7NQh/P40 GU71NS0XJ6LKLq1ikpBHgRjoqreZvTE04Q4VW13UaJH7h951SqfqWB8LocT16gx0IvGO z4+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XxeBrc+m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id a2-20020a655c82000000b003990f846137si9629661pgt.636.2022.04.06.04.07.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 04:07:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XxeBrc+m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8451752A136; Wed, 6 Apr 2022 02:29:27 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1454195AbiDFBJj (ORCPT + 99 others); Tue, 5 Apr 2022 21:09:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232475AbiDEKeE (ORCPT ); Tue, 5 Apr 2022 06:34:04 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13165DEBB2; Tue, 5 Apr 2022 03:19:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 51B34B81C9B; Tue, 5 Apr 2022 10:19:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9252EC385A0; Tue, 5 Apr 2022 10:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649153952; bh=sulm2l5MFKxSWxx/4IX0otO2ult3nj9f2nHGUriHALA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XxeBrc+mabrfCNALm7/Yjlu6TZkojacVvSy3V8VbyPU6CCTKB06a6sfODYENCGHCs QsyrfhtPEIn5imKS5szrKps06ckRkdKutTPS4SRxZWQQVVR0R+CAYnZ3/eSJn0BsLJ nr4GFMYZhngGPRlm/+LC0eJb0ulPi91CCWoRr9IA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jie Hai , Zhou Wang , Vinod Koul , Sasha Levin Subject: [PATCH 5.10 404/599] dmaengine: hisi_dma: fix MSI allocate fail when reload hisi_dma Date: Tue, 5 Apr 2022 09:31:38 +0200 Message-Id: <20220405070310.853553440@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070258.802373272@linuxfoundation.org> References: <20220405070258.802373272@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jie Hai [ Upstream commit b95044b38425f563404234d96bbb20cc6360c7e1 ] Remove the loaded hisi_dma driver and reload it, the driver fails to work properly. The following error is reported in the kernel log: [ 1475.597609] hisi_dma 0000:7b:00.0: Failed to allocate MSI vectors! [ 1475.604915] hisi_dma: probe of 0000:7b:00.0 failed with error -28 As noted in "The MSI Driver Guide HOWTO"[1], the number of MSI interrupt must be a power of two. The Kunpeng DMA driver allocates 30 MSI interrupts. As a result, no space left on device is reported when the driver is reloaded and allocates interrupt vectors from the interrupt domain. This patch changes the number of interrupt vectors allocated by hisi_dma driver to 32 to avoid this problem. [1] https://www.kernel.org/doc/html/latest/PCI/msi-howto.html Fixes: e9f08b65250d ("dmaengine: hisilicon: Add Kunpeng DMA engine support") Signed-off-by: Jie Hai Acked-by: Zhou Wang Link: https://lore.kernel.org/r/20220216072101.34473-1-haijie1@huawei.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/hisi_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/hisi_dma.c b/drivers/dma/hisi_dma.c index e1a958ae7925..3e83769615d1 100644 --- a/drivers/dma/hisi_dma.c +++ b/drivers/dma/hisi_dma.c @@ -30,7 +30,7 @@ #define HISI_DMA_MODE 0x217c #define HISI_DMA_OFFSET 0x100 -#define HISI_DMA_MSI_NUM 30 +#define HISI_DMA_MSI_NUM 32 #define HISI_DMA_CHAN_NUM 30 #define HISI_DMA_Q_DEPTH_VAL 1024 -- 2.34.1