From patchwork Sat Dec 9 23:43:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 846633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.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=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gky4eGPi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yvQm91hWNz9sQm for ; Sun, 10 Dec 2017 10:44:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751263AbdLIXoA (ORCPT ); Sat, 9 Dec 2017 18:44:00 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:35424 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751190AbdLIXn7 (ORCPT ); Sat, 9 Dec 2017 18:43:59 -0500 Received: by mail-wr0-f195.google.com with SMTP id g53so14057068wra.2; Sat, 09 Dec 2017 15:43:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=f5iG+de+Y2N7KTl2YkSdchniBmkQu5qz58wpWqM2ez8=; b=gky4eGPiq2V0WPhqJ2FYFDkm2viLKjuMjGNz7Be1hiPskEtnt7Fg5+GRHeahmGnf2d MAxFq4uQpk+cDIUA7JaNVVyNSdyAde1BwM9LCxs2ehUCJ1IUQFP6mtDHw8BqYAj22zHE xIjPMgZ+j7zphkEwXnN+M9DdeoZ3mXVe6NTQXZhs3e20EYAeVxyLrZPK6lvTsDcBwz1X M72M1gtjF/34Pwfyn2VfLOqUBCLlFKJhfVBBEHMnGPXPJwxD41/Z2Kj1HE9+/XP89dVi gbV4EUQoodTiCgJKNcNROVLroA9nqhgsMSpB+sKGxeawXSKAYl1bOaZISyBJmXz5r5gU dnkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=f5iG+de+Y2N7KTl2YkSdchniBmkQu5qz58wpWqM2ez8=; b=BmZddxNi3o/Cn7S5hOSGAwXIvxIyNEKkRUUCgXjfdJUjkGxtG1P0tXCBg8dF+6cwti Bgna6oiBD6ynsqrLrohCaxB3B6BORlY16JUaWjlJfJDD3GkXv1vRfEivhsRgHiKM7423 ZYkewRpp26nrUaBf7ovf9immP+5NkqG1ShnjKT6Jx8RYch+whGA9B9Ia0oQNYTXMivbj LKf4Y/aXiDkbOko5GY7SCozgCv6JSErGM+0HWjTqhDmGXeFkCDETvsbDYkOYCMWT1QPV wpOG6ydOchu8BDLvDCtYCiOg5TmFR/vkiy9QVPKtYtGz11Kb6Vn+ZeEYLRRsBKrdj/TL nNNA== X-Gm-Message-State: AJaThX4e8Mv90eCon1tRTjCivI1DrTxc6NLJHN28sv1EBPCyDplRtp38 WYm3E1FfbpdJVHGLRuoBLo1ZpA== X-Google-Smtp-Source: AGs4zMbDFN6Loux73Xfvxa8H5m2v8BUSBmlXQZIkDxWS71OrA7Z2vVnYtPYzk9+7pbfOIKQRzLQfhg== X-Received: by 10.223.190.134 with SMTP id i6mr30251176wrh.177.1512863038030; Sat, 09 Dec 2017 15:43:58 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:7c68:4b91:65b0:560? (p200300EA8BC0E4007C684B9165B00560.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:7c68:4b91:65b0:560]) by smtp.googlemail.com with ESMTPSA id k5sm5307315wmg.21.2017.12.09.15.43.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 15:43:57 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 1/3] PCI: introduce a device-managed version of pci_set_mwi To: Realtek linux nic maintainers , Bjorn Helgaas Cc: "netdev@vger.kernel.org" , "linux-pci@vger.kernel.org" References: <9eee5aba-a739-a609-fd65-76666f377ed1@gmail.com> Message-ID: <3e560e2b-7f11-74e2-6db5-60c8479dc59b@gmail.com> Date: Sun, 10 Dec 2017 00:43:48 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <9eee5aba-a739-a609-fd65-76666f377ed1@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Introduce a device-managed version of pci_set_mwi. First user is the Realtek r8169 driver. Signed-off-by: Heiner Kallweit Acked-by: Bjorn Helgaas --- drivers/pci/pci.c | 29 +++++++++++++++++++++++++++++ include/linux/pci.h | 1 + 2 files changed, 30 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 4a7c6864f..fc57c378d 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1458,6 +1458,7 @@ struct pci_devres { unsigned int pinned:1; unsigned int orig_intx:1; unsigned int restore_intx:1; + unsigned int mwi:1; u32 region_mask; }; @@ -1476,6 +1477,9 @@ static void pcim_release(struct device *gendev, void *res) if (this->region_mask & (1 << i)) pci_release_region(dev, i); + if (this->mwi) + pci_clear_mwi(dev); + if (this->restore_intx) pci_intx(dev, this->orig_intx); @@ -3760,6 +3764,31 @@ int pci_set_mwi(struct pci_dev *dev) } EXPORT_SYMBOL(pci_set_mwi); +/** + * pcim_set_mwi - Managed pci_set_mwi() + * @dev: the PCI device for which MWI is enabled + * + * Managed pci_set_mwi(). + * + * RETURNS: An appropriate -ERRNO error value on error, or zero for success. + */ +int pcim_set_mwi(struct pci_dev *dev) +{ + struct pci_devres *dr; + int ret; + + ret = pci_set_mwi(dev); + if (ret) + return ret; + + dr = find_pci_dr(dev); + if (dr) + dr->mwi = 1; + + return 0; +} +EXPORT_SYMBOL(pcim_set_mwi); + /** * pci_try_set_mwi - enables memory-write-invalidate PCI transaction * @dev: the PCI device for which MWI is enabled diff --git a/include/linux/pci.h b/include/linux/pci.h index 978aad784..0a7ac863a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1064,6 +1064,7 @@ int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state); int pci_set_cacheline_size(struct pci_dev *dev); #define HAVE_PCI_SET_MWI int __must_check pci_set_mwi(struct pci_dev *dev); +int __must_check pcim_set_mwi(struct pci_dev *dev); int pci_try_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); void pci_intx(struct pci_dev *dev, int enable);