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 91262C001BA for ; Mon, 12 Apr 2021 16:40:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7651E613A5 for ; Mon, 12 Apr 2021 16:40:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344490AbhDLQkG (ORCPT ); Mon, 12 Apr 2021 12:40:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:35674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245264AbhDLQcA (ORCPT ); Mon, 12 Apr 2021 12:32:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 66034613BD; Mon, 12 Apr 2021 16:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618244784; bh=vexq6biuKCrPhpSSvklXRx2AKHq6uV5xEqsuRSIWA50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GtNlz1EKZBN0azJqVEmLZagLSdiWCE5Xgjb1CZUmY5PzMPGUhlfGg50lXJAI4jJdl v875g3GB6OVGdrUOvWq+jZPrlU2MSWAN/mgXaJMGjEkJHkB6qED2U+zeb2bFrH2+Sn epbPjmddBZyUYXToY3qEeBMJOoUvfyW30AxHrK9NUVFapVPrd80SWGOfvK+tvzX0ZJ oxNHsnSIOg0s1duOfS0OTRyu40PQF6xaUBTgPp3RK7iZLQKtkBuWVETP2TmJQLSnnb H7tVXRlzchLoYK31dZutn7w3KZoyoT1yYG5Xl/wLT3tDxNs3N2ImwNswif+PzBf69D 4VoLs5E0Sdc+A== 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 4.19 24/28] pcnet32: Use pci_resource_len to validate PCI resource Date: Mon, 12 Apr 2021 12:25:49 -0400 Message-Id: <20210412162553.315227-24-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210412162553.315227-1-sashal@kernel.org> References: <20210412162553.315227-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