From patchwork Fri Apr 19 11:08:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1088182 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="t2OXgmVF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44m5tr4RnQz9s6w for ; Sat, 20 Apr 2019 05:41:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728107AbfDSTlH (ORCPT ); Fri, 19 Apr 2019 15:41:07 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:38817 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727041AbfDSTlF (ORCPT ); Fri, 19 Apr 2019 15:41:05 -0400 Received: by mail-wm1-f66.google.com with SMTP id w15so7353689wmc.3; Fri, 19 Apr 2019 12:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=vWfV/uLxHlKTCY8jgaOm/hsQsubaADZJKJWfjxs7Npo=; b=t2OXgmVFbBh0Y1EuHpno5rs+bEy8/NT4sQpbVkXbZhdnpPL/4pORRl5gKSQRYp9b/3 MwlvwiYNq5i8tzwMESnUoWDyGhieiBMCgAjvdc/xib8LXe0Qsnr3fbRIngnj3MnX6aHX lesDND0C91IxOV5V1xS+v80lVbRg1v4bC/eOM77xPR7ryoBGX0HCDQ2IEpfFKaVSg6nG VXaWkQW4XYmD6J5+jSOL0nROlNk0yY16JUMV/hSjFF0ceIpBWKFfhYf4HRQ3AXdM6dHI H6hGwnPPfK80HboSTaxyXdnO6F75SmPI8NAYFkGFM41FBxlHliS05FOrdoPWxTXOzItm cjyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=vWfV/uLxHlKTCY8jgaOm/hsQsubaADZJKJWfjxs7Npo=; b=DQGodinMqGQMQC3YHVb24g/UVnChsx1MAsWCcvNdblgf85sDgob2gmtrPgDmtyrD+1 oW2KKO8eZqKok8Awnft91wqtOXNodZTQQcInpb0GUlofnZjcqJk4ugNh0QhgJ+MRbdvw tBXam02j0Dy2pxVqsr8fXltJpN2DroQY/pWl20WSUAsueUZJ6KOZDy9dmvIAUIuLX83m 8T4HbrtExZm364F/Bzx+aHIoFzRmOszF42nJsJbB8bYWPvK9aeYmN8cEsm4xmMB5DfWF VJpwk/VR2teNAwgCzMuuZcX8RFRkKn+JEul78sFe4SezA9D/dZ+GPkRQnbqHwoqMABR6 PNrw== X-Gm-Message-State: APjAAAX2OzpvW2CTOKn15l+5PukYXmh4CP0QSlMmGbZgO/vDcIgPJAph aL3OMC1gdrNm0s3iSYVvtJG0mrri X-Google-Smtp-Source: APXvYqwJj5NC0zkNsl/Atrn2tJbWzRyFSf+v3WICQ6F0yeHaqLbcujdUsIG2uFo7AHDnntcbzaPbBQ== X-Received: by 2002:a05:600c:2189:: with SMTP id e9mr2289251wme.4.1555672231669; Fri, 19 Apr 2019 04:10:31 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:5700:584:3262:bfe6:7518? (p200300EA8BD4570005843262BFE67518.dip0.t-ipconnect.de. [2003:ea:8bd4:5700:584:3262:bfe6:7518]) by smtp.googlemail.com with ESMTPSA id b134sm7324314wmd.26.2019.04.19.04.10.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 04:10:31 -0700 (PDT) Subject: [PATCH 1/3] PCI: add helper pci_dev_id From: Heiner Kallweit To: Bjorn Helgaas , "linux-pci@vger.kernel.org" , "netdev@vger.kernel.org" References: Message-ID: <8e0ebcd1-e448-67a1-d4e8-bc955d895feb@gmail.com> Date: Fri, 19 Apr 2019 13:08:52 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In several places in the kernel we find PCI_DEVID used like this: PCI_DEVID(dev->bus->number, dev->devfn) Therefore create a helper for it. Signed-off-by: Heiner Kallweit --- include/linux/pci.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/pci.h b/include/linux/pci.h index 2c056a7a7..28d0313a3 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -598,6 +598,11 @@ struct pci_bus { #define to_pci_bus(n) container_of(n, struct pci_bus, dev) +static inline u16 pci_dev_id(struct pci_dev *dev) +{ + return PCI_DEVID(dev->bus->number, dev->devfn); +} + /* * Returns true if the PCI bus is root (behind host-PCI bridge), * false otherwise From patchwork Fri Apr 19 11:09:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1088092 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VaXAjqGV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44m40Y5SV4z9s8m for ; Sat, 20 Apr 2019 04:15:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725926AbfDSSPq (ORCPT ); Fri, 19 Apr 2019 14:15:46 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:36729 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725880AbfDSSPo (ORCPT ); Fri, 19 Apr 2019 14:15:44 -0400 Received: by mail-wr1-f68.google.com with SMTP id a15so3328693wrw.3; Fri, 19 Apr 2019 11:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=kB/xsYXQ3pDchMWCMlizuJaQAcde2gxIfDs80kGqcvg=; b=VaXAjqGV+vVVSmMMQLPJayyVmgoBevlvb9BEUkj/jE0i8rLvNqELcUoR3GdksTDB7n CrhjtfME9njssgWasehqpC1gngUPDzOY3uFEnnSKpvwERnpX0bFyfBUXMGJveuXPUFux CxhYddFelJHnudlK+gJOAx4VPEy5/qGrPBMugP0Y6qgx3UqeCTsoOG6Nxv+UcClgisZF ctzWxlDSsNYoZRjYj/RQgT9e6ZOQAfUmAbVNUZOnM4d1eYZrUzcrDrz06iifSVa3a75A UdZaiFbWqCDVRzzj9ymVTgmmWzkccE/+Oa6qHHFTfQHZvmo+QF9O6gfBNFG+/0qZSY2H mdew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kB/xsYXQ3pDchMWCMlizuJaQAcde2gxIfDs80kGqcvg=; b=knP++ne4Jjuasplo2ImqTraOBlgUjbLObjY33kyo00EogKc5FLboEthkB225N3BmF+ wNoX5+nSZ5CnstfrJPSUaRj2Kyf7sSDARYutdZeqCtoDdt1GMvvnO+Nr/VT3ad/MjwkO xxp2ZX8qDglTSxQXXKQPUMqypDQofbSNJ2vSMlZSo6MSB1tvlGDrMp10ZOy4+ECIIx6x c+G9mYXB9Hq8Fl/erYtbG2zseDPfqZntJ68OZsP+QWhR/kZ1rcH8bUGzT1AczX7EWRZ4 vOZemuqauZV+p/DbNLiwmWJsOLvNRT0vsPLojiME4b+iodTbXU0Fq4nLaGvmxEwaU1/9 KpXg== X-Gm-Message-State: APjAAAWS509NYVCTjXv6fpWqRHCEyi/3lOf+cmwLEjiBBos8sSMrVE/L UQMBnfsTBNGn32FbiVcOhTwg7D6/ X-Google-Smtp-Source: APXvYqwGZYRxhQaiG2Ql39+qiMZCrZENYIQKu+cVh06piTjfCBnd4xH3FKzoj7QqrOgNemqRTIJKug== X-Received: by 2002:adf:f30a:: with SMTP id i10mr2532633wro.111.1555672232978; Fri, 19 Apr 2019 04:10:32 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:5700:584:3262:bfe6:7518? (p200300EA8BD4570005843262BFE67518.dip0.t-ipconnect.de. [2003:ea:8bd4:5700:584:3262:bfe6:7518]) by smtp.googlemail.com with ESMTPSA id g5sm5745383wrw.40.2019.04.19.04.10.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 04:10:32 -0700 (PDT) Subject: [PATCH 2/3] PCI: use helper pci_dev_id From: Heiner Kallweit To: Bjorn Helgaas , "linux-pci@vger.kernel.org" , "netdev@vger.kernel.org" References: Message-ID: <96beedd9-fc9d-68b6-049a-b8093c4c312e@gmail.com> Date: Fri, 19 Apr 2019 13:09:30 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use new helper pci_dev_id() to simplify the code. Signed-off-by: Heiner Kallweit --- drivers/pci/msi.c | 6 +++--- drivers/pci/search.c | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 73986825d..e039b740f 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1338,7 +1338,7 @@ irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev, struct msi_desc *desc) { return (irq_hw_number_t)desc->msi_attrib.entry_nr | - PCI_DEVID(dev->bus->number, dev->devfn) << 11 | + pci_dev_id(dev) << 11 | (pci_domain_nr(dev->bus) & 0xFFFFFFFF) << 27; } @@ -1508,7 +1508,7 @@ static int get_msi_id_cb(struct pci_dev *pdev, u16 alias, void *data) u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev) { struct device_node *of_node; - u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn); + u32 rid = pci_dev_id(pdev); pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid); @@ -1531,7 +1531,7 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev) struct irq_domain *pci_msi_get_device_domain(struct pci_dev *pdev) { struct irq_domain *dom; - u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn); + u32 rid = pci_dev_id(pdev); pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid); dom = of_msi_map_get_device_domain(&pdev->dev, rid); diff --git a/drivers/pci/search.c b/drivers/pci/search.c index 2b5f72086..5c7922612 100644 --- a/drivers/pci/search.c +++ b/drivers/pci/search.c @@ -33,7 +33,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev, struct pci_bus *bus; int ret; - ret = fn(pdev, PCI_DEVID(pdev->bus->number, pdev->devfn), data); + ret = fn(pdev, pci_dev_id(pdev), data); if (ret) return ret; @@ -88,9 +88,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev, return ret; continue; case PCI_EXP_TYPE_PCIE_BRIDGE: - ret = fn(tmp, - PCI_DEVID(tmp->bus->number, - tmp->devfn), data); + ret = fn(tmp, pci_dev_id(tmp), data); if (ret) return ret; continue; @@ -101,9 +99,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev, PCI_DEVID(tmp->subordinate->number, PCI_DEVFN(0, 0)), data); else - ret = fn(tmp, - PCI_DEVID(tmp->bus->number, - tmp->devfn), data); + ret = fn(tmp, pci_dev_id(tmp), data); if (ret) return ret; } From patchwork Fri Apr 19 11:10:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1088112 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VEheSSdV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44m4K90GSJz9sB8 for ; Sat, 20 Apr 2019 04:30:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727218AbfDSSaT (ORCPT ); Fri, 19 Apr 2019 14:30:19 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34901 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726392AbfDSSaS (ORCPT ); Fri, 19 Apr 2019 14:30:18 -0400 Received: by mail-wr1-f66.google.com with SMTP id o12so4539542wrn.2; Fri, 19 Apr 2019 11:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=+k7fklQVC1wXNkIsXxuBFFgxierE2Y58VYjajnqTX8M=; b=VEheSSdVL8xcEk5WIbzmxNBN0LRVx0rC1MT6Cy75WEkcRSKh9T+2UtQEiNBnrMOC5l ONnPX6dSUbLO8IUUFWErCJi72VsQ7zzatlQ5Yg7j2LtMzK/F2lxVEShnCCAVmtvb4aBG MiBIV1DALHVbvSfQn+iyeSeGEf++ts7tNQiOQOdP01aJM4oBLrUhrklg0RTvJiw5X+rE DPmtz0dqF/plKZpdwdTT1Pc5U00fRN0yj9k3CI721jVs/p2q232PT4Vv2Ng/mDgqIkpT JWnNX2Bh6vAB/7G5PKNxzuzw1jTbV8zDSTaLokugyIZCSn2qMW2n7dQxX8MC44In4kvu egHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=+k7fklQVC1wXNkIsXxuBFFgxierE2Y58VYjajnqTX8M=; b=mGOkn9C+YHLrd0XX32OTFQ38ApJ0J/IGgOMmB/2t4EBJsyiHjl07fRZBl1D8M3I5KQ SSRT2XPkFpF8FZTVwmZWqFZzgMbjCn0WfAu3Ke8iJR/xH9E1LVHyVM5vvLod8WtoDT3h XcGOH22LLl9sDJjXFiIenkwG/GIAaJwO/1pX/D6F7gVAIQAv0z7SB8Ug9lj4/bK9WfyK wxilrSIXI4b9qM3is58MqkTYivUlPZz05/Mpa6FeH/ReRZUb3srpAWlKF2NXgurku21S lkge8JANOb3SYQQkFzFQColPRYj+I3nt6aWsBQdBQEDXvUqZ6CQ8TE9dtL4DEu5zcnsS 6WYA== X-Gm-Message-State: APjAAAXyGJ0lmVBkLoBH1LX0E/Ijg6q1Ilc9SdkPHyNmOOmZ81eApXhA iI7fyL3mD0zpwarDF3GPxFPRQLom X-Google-Smtp-Source: APXvYqxAS0VW7ubMQH9lHmT8YRuJHNgWO9dAC7OqIXv8qbIN1Ytqsp30R6rUcimb5ORYq3FV65+ekg== X-Received: by 2002:adf:dc4a:: with SMTP id m10mr2538448wrj.0.1555672234349; Fri, 19 Apr 2019 04:10:34 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:5700:584:3262:bfe6:7518? (p200300EA8BD4570005843262BFE67518.dip0.t-ipconnect.de. [2003:ea:8bd4:5700:584:3262:bfe6:7518]) by smtp.googlemail.com with ESMTPSA id x12sm2878752wrl.34.2019.04.19.04.10.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 04:10:33 -0700 (PDT) Subject: [PATCH 3/3] r8169: use new helper pci_dev_id From: Heiner Kallweit To: Bjorn Helgaas , "linux-pci@vger.kernel.org" , "netdev@vger.kernel.org" References: Message-ID: <061caba3-7648-4b20-14a6-b26c7f29d194@gmail.com> Date: Fri, 19 Apr 2019 13:10:13 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use new helper pci_dev_id() to simplify the code. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index efaea1a0a..ae476fe8d 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7020,8 +7020,7 @@ static int r8169_mdio_register(struct rtl8169_private *tp) new_bus->priv = tp; new_bus->parent = &pdev->dev; new_bus->irq[0] = PHY_IGNORE_INTERRUPT; - snprintf(new_bus->id, MII_BUS_ID_SIZE, "r8169-%x", - PCI_DEVID(pdev->bus->number, pdev->devfn)); + snprintf(new_bus->id, MII_BUS_ID_SIZE, "r8169-%x", pci_dev_id(pdev)); new_bus->read = r8169_mdio_read_reg; new_bus->write = r8169_mdio_write_reg;