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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 407E0C433ED for ; Mon, 12 Apr 2021 16:26:02 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E8136613AB for ; Mon, 12 Apr 2021 16:26:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8136613AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=U/PZADWw629svXApLsTFEl1kEVDFbKe1DQ40H0FSrt8=; b=HZOxv3chOSr3agMTmSlkemnfY DzEM8pGvTmpRD54y5SsvzMf37PSILvoHqrF0dz32p2HQVOkDKOcmKqAQv79XNqORlfEtzkatuyK28 q+U3Td+mTt0reXNdVrIOQx8vCsmI0WFUV+inwDvSExt51ISQnroLkRHY7rN6C1I6Hn3zwMS4y55nQ 34XiqKk8kuCzXdnC2coThJfV+dSzEZdhEY72i1YcElHFZgmNp1t4C631wbOnLQTS8YlIuTlblaFwI Y0nsCF9Mpu0EGNZCRkcYdllwuvqluLpbhL2qB83li6s1ar2AjCXhU8UljFKE0RbI1WxeFjlR9fj6N D6T0GXCtQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVzNp-007FO7-4n; Mon, 12 Apr 2021 16:25:54 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVzNk-007FLs-1Y for linux-riscv@desiato.infradead.org; Mon, 12 Apr 2021 16:25:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=U0nzaVFOa6tyE4I5L6k6cEvUuZTngq7RkMMXHGo/j/Y=; b=Sqfgu2p+KASiyVf+2LgcYWFopv 1fux6f9ptLK+DQcMXwIA6JtfumisB2iiHWX9m98/q0SxFFnFCqbJtVvHaiInV/6/isGKaOb6tRCj6 0q1KCBvVvEjGPaIVTaoNgSvRRjgza6Kdii9VmbZK40xQrj6yZti3yglgdT16NAXMnGJW1Adyb+WBT 1Xlc8Ehe7E+62XAzKyockHQFkU7doKZpfA18NshmpafidmwgHoVLZR9C/kmlxcRXCeRuEY7cZZXWm PX8eFkNIWn46zKA+WZdsHXEbxfgIgIKnpn3+ipcFtI5rZGXx3Y683iF+TGDgyh9TI6GKrNLlXcqhy nDvLszaA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVzNh-006OUX-K7 for linux-riscv@lists.infradead.org; Mon, 12 Apr 2021 16:25:46 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7F0EC613A7; Mon, 12 Apr 2021 16:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618244745; bh=vexq6biuKCrPhpSSvklXRx2AKHq6uV5xEqsuRSIWA50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BhuY2KbfsBvqysoIwv4SuFpenR8LRQumZtRGbGXFXCP9uPRZSEgwzuDrcJGU3cJTM FGLKZj0o90cHzwxE289OE2Df87VCojHEfyUUTUZq8OiJUAcXnOGsIDxAP4GzJUdAdJ 9lRvRzMPr91A1w5t359adralDMpgwZYeCp2feyC6R/yR9nR78FMyJc6yRZCjTbg4AQ d3hjzPpcQPywiZTfrTS1azSJkrdEWiQERaEeFa98Cs7eWH++fj9kl1Z1s0CanUy/2b jxPVQ2s8IGWCxtp1PonRLrcO6NcEofLwFL95JE/1avjZgd3A3J94UO62W7TPOUUMcV HkWJDgXvxA1lQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guenter Roeck , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 34/39] pcnet32: Use pci_resource_len to validate PCI resource Date: Mon, 12 Apr 2021 12:24:56 -0400 Message-Id: <20210412162502.314854-34-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210412162502.314854-1-sashal@kernel.org> References: <20210412162502.314854-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210412_092545_703721_F62E3109 X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Guenter Roeck [ Upstream commit 66c3f05ddc538ee796321210c906b6ae6fc0792a ] pci_resource_start() is not a good indicator to determine if a PCI resource exists or not, since the resource may start at address 0. This is seen when trying to instantiate the driver in qemu for riscv32 or riscv64. pci 0000:00:01.0: reg 0x10: [io 0x0000-0x001f] pci 0000:00:01.0: reg 0x14: [mem 0x00000000-0x0000001f] ... pcnet32: card has no PCI IO resources, aborting Use pci_resouce_len() instead. Signed-off-by: Guenter Roeck Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/amd/pcnet32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index f5ad12c10934..da84660ceae1 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c @@ -1548,8 +1548,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) } pci_set_master(pdev); - ioaddr = pci_resource_start(pdev, 0); - if (!ioaddr) { + if (!pci_resource_len(pdev, 0)) { if (pcnet32_debug & NETIF_MSG_PROBE) pr_err("card has no PCI IO resources, aborting\n"); err = -ENODEV; @@ -1562,6 +1561,8 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) pr_err("architecture does not support 32bit PCI busmaster DMA\n"); goto err_disable_dev; } + + ioaddr = pci_resource_start(pdev, 0); if (!request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci")) { if (pcnet32_debug & NETIF_MSG_PROBE) pr_err("io address range already allocated\n"); -- 2.30.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 A4212C43461 for ; Mon, 12 Apr 2021 16:38:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7852A61025 for ; Mon, 12 Apr 2021 16:38:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244216AbhDLQiT (ORCPT ); Mon, 12 Apr 2021 12:38:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:57616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245128AbhDLQ3l (ORCPT ); Mon, 12 Apr 2021 12:29:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7F0EC613A7; Mon, 12 Apr 2021 16:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618244745; bh=vexq6biuKCrPhpSSvklXRx2AKHq6uV5xEqsuRSIWA50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BhuY2KbfsBvqysoIwv4SuFpenR8LRQumZtRGbGXFXCP9uPRZSEgwzuDrcJGU3cJTM FGLKZj0o90cHzwxE289OE2Df87VCojHEfyUUTUZq8OiJUAcXnOGsIDxAP4GzJUdAdJ 9lRvRzMPr91A1w5t359adralDMpgwZYeCp2feyC6R/yR9nR78FMyJc6yRZCjTbg4AQ d3hjzPpcQPywiZTfrTS1azSJkrdEWiQERaEeFa98Cs7eWH++fj9kl1Z1s0CanUy/2b jxPVQ2s8IGWCxtp1PonRLrcO6NcEofLwFL95JE/1avjZgd3A3J94UO62W7TPOUUMcV HkWJDgXvxA1lQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guenter Roeck , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 34/39] pcnet32: Use pci_resource_len to validate PCI resource Date: Mon, 12 Apr 2021 12:24:56 -0400 Message-Id: <20210412162502.314854-34-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210412162502.314854-1-sashal@kernel.org> References: <20210412162502.314854-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck [ Upstream commit 66c3f05ddc538ee796321210c906b6ae6fc0792a ] pci_resource_start() is not a good indicator to determine if a PCI resource exists or not, since the resource may start at address 0. This is seen when trying to instantiate the driver in qemu for riscv32 or riscv64. pci 0000:00:01.0: reg 0x10: [io 0x0000-0x001f] pci 0000:00:01.0: reg 0x14: [mem 0x00000000-0x0000001f] ... pcnet32: card has no PCI IO resources, aborting Use pci_resouce_len() instead. Signed-off-by: Guenter Roeck Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/amd/pcnet32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index f5ad12c10934..da84660ceae1 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c @@ -1548,8 +1548,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) } pci_set_master(pdev); - ioaddr = pci_resource_start(pdev, 0); - if (!ioaddr) { + if (!pci_resource_len(pdev, 0)) { if (pcnet32_debug & NETIF_MSG_PROBE) pr_err("card has no PCI IO resources, aborting\n"); err = -ENODEV; @@ -1562,6 +1561,8 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) pr_err("architecture does not support 32bit PCI busmaster DMA\n"); goto err_disable_dev; } + + ioaddr = pci_resource_start(pdev, 0); if (!request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci")) { if (pcnet32_debug & NETIF_MSG_PROBE) pr_err("io address range already allocated\n"); -- 2.30.2