From patchwork Sat Feb 29 22:20:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=W7j93h5+; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLhG1dwBz9sPk for ; Sun, 1 Mar 2020 09:30:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727185AbgB2W31 (ORCPT ); Sat, 29 Feb 2020 17:29:27 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33750 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726786AbgB2W30 (ORCPT ); Sat, 29 Feb 2020 17:29:26 -0500 Received: by mail-wr1-f68.google.com with SMTP id x7so7826141wrr.0; Sat, 29 Feb 2020 14:29:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=JUcStTd1OYnX+4/KTZoNwT3pKFBsMhYYxXgdxB6jewU=; b=W7j93h5+gAXFNx9VjTexyPvITCCvM44iEc9yXZLJWWLzai9hpbYKLIPlAjzD61SKGy NfQCBuAYb0M6t5HyCnmkWvzu7e2kJCxUa4lL6GfIm/8nsgALkayLXcSQ11KNVgoLfUjp dR0iUK1MWrbED6doNC+8a6LcjaYZFtw3nXLG+cFCzYIxbc+hP4gbGiFJwSNSsRcn6YMr qFs/0sr/K6WqfQWm5OIzt53tNNbyEvKJwTYttGysoXUJsPjCgOr/MGIqHHnYDIWbv59W hyWN/KajLBnQF369IgqPkFZh42HTTMAMuKgC8rd8PEA5J3DYEqz0H3mowyc8mOvAPslA cHjg== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JUcStTd1OYnX+4/KTZoNwT3pKFBsMhYYxXgdxB6jewU=; b=F5XBMskfak5fPZRHhESnq1g5wOxKemBsYzT7oUbXgB4MGhNNDbteQRf0FrpQ0cNtNN RCQODVVUpV7sfd8vs6auLnnyPW70sFAF8g285yFbF2zdeS5X1LCuxVIo5hQpLuoD7vcj CWKH9ligM8l2vOzNRNBWJ1yqKemwRfTS3GOO7zGWzfz08ebxv2RnoARmQRdmP4UI/yZx d+wTObP4+2wCHIN1/PnpT8ysn7E/Jlq/HXcFuDjAf9ViBZPkhZQminXldZTZCza5RR18 fDuvnl0zsKekcwrQAoyfJ3uWONWgcwVxPdrGyiN0OK2knOKRss56j29E45ufgdQ0SmjR L9Sg== X-Gm-Message-State: APjAAAUiWy9+MWg4Ay+GP7yjhIAH/yLsrpNmPVA7R4+qiLA1x3J3UkKc nFpyyK6D+X/byctufsxMtI4a0RX5 X-Google-Smtp-Source: APXvYqxDK8DmyGmZovFQT4NhCchWjRPiRjKFyOka2xlPwNfL3r2zy7c1fFhpYk0IV1YBKCtG+HsPdQ== X-Received: by 2002:a5d:424c:: with SMTP id s12mr12210642wrr.244.1583015364175; Sat, 29 Feb 2020 14:29:24 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id q3sm7781235wmj.38.2020.02.29.14.29.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:23 -0800 (PST) Subject: [PATCH v4 01/10] net: marvell: add PCI_STATUS_SIG_TARGET_ABORT to PCI status error bits From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: <497952d4-de09-e268-0e2a-511a473198d7@gmail.com> Date: Sat, 29 Feb 2020 23:20:32 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In preparation of factoring out PCI_STATUS error bit handling let drivers use the same collection of error bits. To facilitate bisecting we do this in a separate patch per affected driver. For the Marvell drivers we have to add PCI_STATUS_SIG_TARGET_ABORT to the error bits. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/marvell/skge.h | 1 + drivers/net/ethernet/marvell/sky2.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/net/ethernet/marvell/skge.h b/drivers/net/ethernet/marvell/skge.h index 6fa7b6a34..e76c03c87 100644 --- a/drivers/net/ethernet/marvell/skge.h +++ b/drivers/net/ethernet/marvell/skge.h @@ -19,6 +19,7 @@ PCI_STATUS_SIG_SYSTEM_ERROR | \ PCI_STATUS_REC_MASTER_ABORT | \ PCI_STATUS_REC_TARGET_ABORT | \ + PCI_STATUS_SIG_TARGET_ABORT | \ PCI_STATUS_PARITY) enum csr_regs { diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h index b02b65230..aee87f838 100644 --- a/drivers/net/ethernet/marvell/sky2.h +++ b/drivers/net/ethernet/marvell/sky2.h @@ -256,6 +256,7 @@ enum { PCI_STATUS_SIG_SYSTEM_ERROR | \ PCI_STATUS_REC_MASTER_ABORT | \ PCI_STATUS_REC_TARGET_ABORT | \ + PCI_STATUS_SIG_TARGET_ABORT | \ PCI_STATUS_PARITY) enum csr_regs { From patchwork Sat Feb 29 22:21:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=GN7Qn4p/; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLhC196Jz9sPk for ; Sun, 1 Mar 2020 09:30:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727370AbgB2W32 (ORCPT ); Sat, 29 Feb 2020 17:29:28 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:42674 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727170AbgB2W31 (ORCPT ); Sat, 29 Feb 2020 17:29:27 -0500 Received: by mail-wr1-f65.google.com with SMTP id p18so7763660wre.9; Sat, 29 Feb 2020 14:29:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=On6Ph2Wa/oxdpxBxYF8saGAQm3IaLWIIsWy8iRxmdwQ=; b=GN7Qn4p/fWcOcPRqpHYleRN6R6OWLs1ts3joPiWmqUjCfAcnFya5r/AF+hxEjDvVlM KT5pkRNZLz6jK77mjmKrRTvJHeWG13A20eNAnWpyT8uVzGI2Xc2iCWGYc+xaW0V9zOPN nbM7Qx2JdyynEoFArm3B1OBvubjIMgETxFK7yhQBZQBKZ4UCXZOFDlFhFAjic8Dttmai 6SjqAgr2YGrjoo3274vnf+35sJai91+/IFRWXyqFahbk0jrwsmYWBw/2IwmdgAm37Rke +QfMRnnERHHPR6z5i6Tx94L9AcSpVmnzvD3M1D9pHn4awci5We0Fy9HWL2oWNKCZjYbs TDeg== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=On6Ph2Wa/oxdpxBxYF8saGAQm3IaLWIIsWy8iRxmdwQ=; b=DJgaPMctlfWpBE1eCNsFLZ1QpcbDcbt2bAvEkB+5+aw2SP69NCrgff3sbVYuUhLI11 efS45l1edqAUdOoQzdkyS3mFzpVHOJ0iQ4Jj2Qa5nWAOzgtcd5FazIFplqd8aaLBmhqx 1Kbnx+Dt3YXnx5HkooVGbjW41u3RrQfpI2UxoQvcaWcMuzM7XLS+pnjojqU7H70+YDu6 Cqha49bmMQl3lrVz8d0rhDNvg5uX9gcP014JVDRe48Y1JtXPp8AHe8AP+K6glXoHw0tl L+w5uB+q8tTeH29JHT2MwnWfW7wwEvQSjXRBT7h4KvX3UEfwjkeayJRldaz/O4QRfL1s JPVw== X-Gm-Message-State: APjAAAWGsGRm2QoUKoTXb5Gna/EipuPiziTT+I3cGl4iSzg8QNJmYjNM cjAr1Jv9SYN8y9cAt/G61ug= X-Google-Smtp-Source: APXvYqwSlXcxniZ13ry9LyVrVt4CFktdOfbXViWq9Te4zmzKgkoUro/HE76JxXpRgoXw6acfbLj4Qw== X-Received: by 2002:adf:de09:: with SMTP id b9mr12146765wrm.160.1583015365283; Sat, 29 Feb 2020 14:29:25 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id m21sm7852123wmi.27.2020.02.29.14.29.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:24 -0800 (PST) Subject: [PATCH v4 02/10] net: skfp: add PCI_STATUS_REC_TARGET_ABORT to PCI status error bits From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: <32caa349-cf26-7409-47d4-20740509c776@gmail.com> Date: Sat, 29 Feb 2020 23:21:45 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In preparation of factoring out PCI_STATUS error bit handling let drivers use the same collection of error bits. To facilitate bisecting we do this in a separate patch per affected driver. For the skfp driver we have to add PCI_STATUS_REC_TARGET_ABORT to the error bits. Signed-off-by: Heiner Kallweit --- drivers/net/fddi/skfp/h/skfbi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/fddi/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h index 480795681..36e20a514 100644 --- a/drivers/net/fddi/skfp/h/skfbi.h +++ b/drivers/net/fddi/skfp/h/skfbi.h @@ -34,7 +34,7 @@ #define I2C_ADDR_VPD 0xA0 /* I2C address for the VPD EEPROM */ -#define PCI_ERRBITS (PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_SIG_TARGET_ABORT | PCI_STATUS_PARITY) +#define PCI_ERRBITS (PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_SIG_TARGET_ABORT | PCI_STATUS_PARITY) From patchwork Sat Feb 29 22:22:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=TwswjIcV; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLh8083Yz9sPk for ; Sun, 1 Mar 2020 09:30:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727170AbgB2W33 (ORCPT ); Sat, 29 Feb 2020 17:29:29 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:51463 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727180AbgB2W32 (ORCPT ); Sat, 29 Feb 2020 17:29:28 -0500 Received: by mail-wm1-f66.google.com with SMTP id 9so1046947wmo.1; Sat, 29 Feb 2020 14:29:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=myR4RAc//3dCnqTEQ8pVmIEQ+AFWBKpyKIszlN9NwYU=; b=TwswjIcVZfUuOsVFnI9BtvkCoHfapq371Mt/CK9szBaoH6IFLmYziO8L+680Rg92ED +Vm6sjrJouR9p+j0N5dHKxzO40ggdAk3Kr5NN5d0ziTbRBZLBLl1KppyAqib1Um/0KqF ze4il5mlV+BBZzqXnVweEiTSXNUncqab8lzYeEqCzIyFtdT83qm8mXoxLG700dedhDIi umHEytNJVYXGykkrSnpqbAmPEkOk0tLmG70U8i8RsXoSL/lTEJNzUoqucXTw8KO2N5Og 79sqct9fphheiXzt9xZF6upl8dU/M7Pbkz4uYhe44K21rDVF+ZR33uQ53qMEWhxkGn6L wXiQ== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=myR4RAc//3dCnqTEQ8pVmIEQ+AFWBKpyKIszlN9NwYU=; b=WJ7f+fv33mPyz00lm6E2l/C1WhYMuAupKF38I5Kj+T4xgmhFpjL1Y6tO+YrydMwht2 Y2GOx818AE+3BGh/hhx+ro06cLklrj0SHscGvOzn/S8bfbPnjlGhSYh30GYFO2qyahww 5gTVz1Kes/BQObfiWdIxNUrWmBzMYT+QiE+QQ/6vTtQ5y71NF9bvSUjiLKjZO2np+xXN 33VOpSwevMYWDLk0posHQxfRQhSvckbbIxxIQ+FEbCCvhWC3Bwinb+UPBhRBVbYinjhL ivs1PHLvcyv1OnFHjI8yNBMn5d/8KEyLMQ1p26yKAPqMUx2liJomWC1wGxpWRUI+kWa6 sJZA== X-Gm-Message-State: APjAAAUwQS3JtbUk2IupxqAyzQrZZzVrdx2nu8YD4oXFwZlKVcCLDO6I h8Bgjkj+4sQMQbBHB8hiEPg= X-Google-Smtp-Source: APXvYqwzs7Zoc9nr2q/NPXFPCKZAB5tA8lu9Kr/BNlJwkZDymFknQXHa2NV02VZ/jB3jqQPfR4jxSQ== X-Received: by 2002:a1c:a70a:: with SMTP id q10mr6956306wme.88.1583015366430; Sat, 29 Feb 2020 14:29:26 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id c9sm7873948wmc.47.2020.02.29.14.29.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:26 -0800 (PST) Subject: [PATCH v4 03/10] r8169: add PCI_STATUS_PARITY to PCI status error bits From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: <94e0dca7-859d-12f6-9316-55fc107dd49d@gmail.com> Date: Sat, 29 Feb 2020 23:22:55 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In preparation of factoring out PCI_STATUS error bit handling let drivers use the same collection of error bits. To facilitate bisecting we do this in a separate patch per affected driver. For the r8169 driver we have to add PCI_STATUS_PARITY to the error bits. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index f081007a2..7c9892a16 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4381,7 +4381,7 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) pci_write_config_word(pdev, PCI_COMMAND, pci_cmd); pci_write_config_word(pdev, PCI_STATUS, - pci_status & (PCI_STATUS_DETECTED_PARITY | + pci_status & (PCI_STATUS_DETECTED_PARITY | PCI_STATUS_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_SIG_TARGET_ABORT)); From patchwork Sat Feb 29 22:23:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=k8NM2x0T; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLh44Z1Jz9sPk for ; Sun, 1 Mar 2020 09:30:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727522AbgB2W3a (ORCPT ); Sat, 29 Feb 2020 17:29:30 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44491 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727445AbgB2W3a (ORCPT ); Sat, 29 Feb 2020 17:29:30 -0500 Received: by mail-wr1-f68.google.com with SMTP id m16so7743606wrx.11; Sat, 29 Feb 2020 14:29:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=s/TnxZL+H4AudblQ9nBvceLmeag+LoDGvX5KJd89j6g=; b=k8NM2x0TbAhJg4p2iYPVeOybSPB6GjF4/79OXHkfiHttd1HJkHa9umOol/v73niymq 2+KLTO6vSaCnlohZ9n1YjRtxlXyEbfZYCeR+bKUR8Y43ICVbX8zeo0XIyw6SNOFfr5NN f9pmdMvKL4ANZfGLXhxgX1nSkNSNCVvQcakC/QsJWuSPIQ0gJJJzfjVmKan9RQgTh5PS PcJm+k9dmt9FcuUBNYmRFCzfe9iI/xTPaOOECHDGHwIgNIrH3KZQ9kw0HG4U6Tp8tgXM crIdibA3AuFjVU0nV6+0YBVZUVdbe9K1iIZuHNh9N38YlFCj7KBbJbcsxr8C0MD89kKR Ev7g== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=s/TnxZL+H4AudblQ9nBvceLmeag+LoDGvX5KJd89j6g=; b=P01FZ2yevJ1Uszo6dYWX1jdxHRBrgdvJobO6YGWj2T1s/Qm7zNQlSOrCCP7fnMzuD1 ypdVJ379+o/bdDEIQWITKnWHWh8gAac1TLT+YH8FVnSljw/V2cJ2J7nVy0a9AuWfMvjI Y+qpEJ9skYGzdcqDg0LMXX6dX5B2ALtXE8ZtoFtAEuqQYg7NLqEHOUR+2Tv6zW5nyCa3 r+SH/xfpqIwr5JNzCUXr5AHm6CujlnNnVtUZzAXgc4pfaxy9JW0r1GciDHTwIojXf2Jj j92ZK7zNLTbUFhbThmdZndTDg0ABfAx8O+akEYNN9ES2sbfmb8yM9Rkst7+r/8wYOxM7 dDqg== X-Gm-Message-State: APjAAAXLf8hVCZtz7QvxuSMr8/lTMiVE2wvyht55iBRiff6dF4aFYoe1 ZZBAXiznQeNf3TycqKbdcyT0/cah X-Google-Smtp-Source: APXvYqxr9ZXt4u/hyNp4CNYuC+q8dPJp4l70xIpHcpRak5opw1aujsXw3FxhTXp3lssPaIJ8cUxSiQ== X-Received: by 2002:adf:fd11:: with SMTP id e17mr6306515wrr.195.1583015367829; Sat, 29 Feb 2020 14:29:27 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id e1sm4129549wrx.90.2020.02.29.14.29.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:27 -0800 (PST) Subject: [PATCH v4 04/10] PCI: Add constant PCI_STATUS_ERROR_BITS From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: <175dca23-c3b1-e297-ef35-4100f1c96879@gmail.com> Date: Sat, 29 Feb 2020 23:23:44 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This collection of PCI error bits is used in more than one driver, so move it to the PCI core. Signed-off-by: Heiner Kallweit Acked-by: Bjorn Helgaas --- v4: - move new constant to include/linux/pci.h - improve commit description --- drivers/net/ethernet/marvell/skge.h | 7 ------- drivers/net/ethernet/marvell/sky2.h | 7 ------- include/linux/pci.h | 7 +++++++ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/marvell/skge.h b/drivers/net/ethernet/marvell/skge.h index e76c03c87..e149bdfe1 100644 --- a/drivers/net/ethernet/marvell/skge.h +++ b/drivers/net/ethernet/marvell/skge.h @@ -15,13 +15,6 @@ #define PCI_VPD_ROM_SZ 7L<<14 /* VPD ROM size 0=256, 1=512, ... */ #define PCI_REV_DESC 1<<2 /* Reverse Descriptor bytes */ -#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ - PCI_STATUS_SIG_SYSTEM_ERROR | \ - PCI_STATUS_REC_MASTER_ABORT | \ - PCI_STATUS_REC_TARGET_ABORT | \ - PCI_STATUS_SIG_TARGET_ABORT | \ - PCI_STATUS_PARITY) - enum csr_regs { B0_RAP = 0x0000, B0_CTST = 0x0004, diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h index aee87f838..851d8ed34 100644 --- a/drivers/net/ethernet/marvell/sky2.h +++ b/drivers/net/ethernet/marvell/sky2.h @@ -252,13 +252,6 @@ enum { }; -#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ - PCI_STATUS_SIG_SYSTEM_ERROR | \ - PCI_STATUS_REC_MASTER_ABORT | \ - PCI_STATUS_REC_TARGET_ABORT | \ - PCI_STATUS_SIG_TARGET_ABORT | \ - PCI_STATUS_PARITY) - enum csr_regs { B0_RAP = 0x0000, B0_CTST = 0x0004, diff --git a/include/linux/pci.h b/include/linux/pci.h index 3840a541a..101d71e0a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -42,6 +42,13 @@ #include +#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ + PCI_STATUS_SIG_SYSTEM_ERROR | \ + PCI_STATUS_REC_MASTER_ABORT | \ + PCI_STATUS_REC_TARGET_ABORT | \ + PCI_STATUS_SIG_TARGET_ABORT | \ + PCI_STATUS_PARITY) + /* * The PCI interface treats multi-function devices as independent * devices. The slot/function address of each device is encoded From patchwork Sat Feb 29 22:24:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=RQ2Lpktt; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLh14JCsz9sPk for ; Sun, 1 Mar 2020 09:30:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727562AbgB2W3b (ORCPT ); Sat, 29 Feb 2020 17:29:31 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:40477 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727518AbgB2W3b (ORCPT ); Sat, 29 Feb 2020 17:29:31 -0500 Received: by mail-wm1-f66.google.com with SMTP id e26so1600565wme.5; Sat, 29 Feb 2020 14:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=jnuDTYj9lUlehqsBH2n0F57ZiFU3IVBaej0e8OE23bM=; b=RQ2LpkttKbS8cs24JMeBKn32qIaxneyzbEMRLIrtE/fzLtZPHt/75IEPf+N/lJTKt8 169s9nLEnk4zg5DjB7iei2/Op5P5q/FlUz+y9/WuD2D96FoI5+bE08wfLWbmdkeGFvZW /+Jq8Y1Ny44UEy5gHYVrfvk4hGZKs1Xv8dbJZAUnabJc1czQWorxkOwMN8RfeerLAa/Z IYcYYbjEqlfXE64NVURam/aZT0eUl0kwk3tckYMpzAOaMkKWngMb8+xWru9cwSYxeytz uHjxDeIhlUERmxKqwgUg7hjWXOQUOgyr+55r4JhEgwUYKExL/jjfA13CobF4JZ3j9lrT UgOA== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=jnuDTYj9lUlehqsBH2n0F57ZiFU3IVBaej0e8OE23bM=; b=HQi4LlQ7gzKkL8PnXT4Gj5vQPjhDoN6E7KjRvT33GEYK1Tnp9U1QAl3C6xQTFh0KdL i0LRa9vr0+vAXQ98Jf76ZkjRNUG+mq/qhEBg1wGJyRSqQOP7Dc52wS7xsP1KTbf3K1pE nFBJ/LMi3819JzT8Gw5W/ZKqR66CbECq/usVxE7DFmd0qkphRVbN88oTDhzL3j5i0Oxy AToSHXJFykncpMHW48Hlf6SHejefQjasd0nnW8uEsxW5lk/ME6Vt9XeAN/NEB1dxc/xC clTVLORbvFxwXcr5ONr0jy3u+4VYnHAxQXi5qWBEo4bYBWiAtumKyHnVuY9kfr4WRTXh msNQ== X-Gm-Message-State: APjAAAU4G9ZOBBzABPPTPxlbIpDkX0bvaSGBl5MnWCFdoPmMVH/RloGq Kk+hlwV7DeqOdInXliIgTa4= X-Google-Smtp-Source: APXvYqzXO1TqpbaM9Fj6cDDlASNAwTaZ6t7s1GA3ldX6bahXJCDNJZCdyHUYjavqs+wiunrbffUlkw== X-Received: by 2002:a1c:7419:: with SMTP id p25mr11789810wmc.159.1583015368922; Sat, 29 Feb 2020 14:29:28 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id a26sm8442899wmm.18.2020.02.29.14.29.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:28 -0800 (PST) Subject: [PATCH v4 05/10] PCI: Add pci_status_get_and_clear_errors From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: Date: Sat, 29 Feb 2020 23:24:23 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Several drivers use the following code sequence: 1. Read PCI_STATUS 2. Mask out non-error bits 3. Action based on error bits set 4. Write back set error bits to clear them As this is a repeated pattern, add a helper to the PCI core. Signed-off-by: Heiner Kallweit Acked-by: Bjorn Helgaas --- v4: - improve commit description --- drivers/pci/pci.c | 23 +++++++++++++++++++++++ include/linux/pci.h | 1 + 2 files changed, 24 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index d828ca835..c16b0ba2a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -173,6 +173,29 @@ unsigned char pci_bus_max_busnr(struct pci_bus *bus) } EXPORT_SYMBOL_GPL(pci_bus_max_busnr); +/** + * pci_status_get_and_clear_errors - return and clear error bits in PCI_STATUS + * @pdev: the PCI device + * + * Returns error bits set in PCI_STATUS and clears them. + */ +int pci_status_get_and_clear_errors(struct pci_dev *pdev) +{ + u16 status; + int ret; + + ret = pci_read_config_word(pdev, PCI_STATUS, &status); + if (ret != PCIBIOS_SUCCESSFUL) + return -EIO; + + status &= PCI_STATUS_ERROR_BITS; + if (status) + pci_write_config_word(pdev, PCI_STATUS, status); + + return status; +} +EXPORT_SYMBOL_GPL(pci_status_get_and_clear_errors); + #ifdef CONFIG_HAS_IOMEM void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar) { diff --git a/include/linux/pci.h b/include/linux/pci.h index 101d71e0a..7beaf51e9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1210,6 +1210,7 @@ int pci_select_bars(struct pci_dev *dev, unsigned long flags); bool pci_device_is_present(struct pci_dev *pdev); void pci_ignore_hotplug(struct pci_dev *dev); struct pci_dev *pci_real_dma_dev(struct pci_dev *dev); +int pci_status_get_and_clear_errors(struct pci_dev *pdev); int __printf(6, 7) pci_request_irq(struct pci_dev *dev, unsigned int nr, irq_handler_t handler, irq_handler_t thread_fn, void *dev_id, From patchwork Sat Feb 29 22:25:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247162 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=ryn3luSm; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLgd5Khpz9sSb for ; Sun, 1 Mar 2020 09:29:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727598AbgB2W3c (ORCPT ); Sat, 29 Feb 2020 17:29:32 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38797 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727445AbgB2W3c (ORCPT ); Sat, 29 Feb 2020 17:29:32 -0500 Received: by mail-wm1-f67.google.com with SMTP id u9so1307283wml.3; Sat, 29 Feb 2020 14:29:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=5ecRrf1/V6B1CB3S5yVtFNvzXeyCocerP3hSIfKLkMA=; b=ryn3luSmm8QmTP8w9thNRNUH22Ta29tZvFO3g8hkxwVjbp1M3OrDLGa3BeiPequhMC sqf+ekkMQSvwm++PMD5RcWrtnTugbshuqFMJRb3A4Oa2JOddZkCArCG4CWn2KHkQvxQC gQiJAfnQJwX7B7WaEMK891vIeoOcSbnTuNOrBvQXC4AJACvQj2Nu2j4KpcUR9oZUUT0a drAu3UND2LhLXP+jPDovdbbgQZdOXA1N+dm4hu65nA6rJ9c3wXAnbfbeIH3lxlRRpQAM KxXmSF1RUeQytEiAnlG95vik+2hl0c4gabr07zRJXdGgPu0giWaEv7nRHb6sH1gQlpZq vWHw== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=5ecRrf1/V6B1CB3S5yVtFNvzXeyCocerP3hSIfKLkMA=; b=IFyK23UOG5DjYerd3S750zsY6+79U9ppR0x1zuIm6jmA3tzmCZLpyKgGXfukgNeejw S+EvxTnrW2Duy7NKAhO8vmbwi9QF7ZXNybKaYCDHGLG2uMnFVNsva+++7NGainTBGVBC +OJwa2rp8aSBbKRi3it6+MxV8Z2503Dd9+oHsKthMvbKYynEggXMVJLmlZQZoymPLgpn lH3s11AS53xvbJKBdxlYPVycjg0MbIClGkS8upCy9+mwG07jAZVGQ3kQgtvRv2UJL7Xe helQzZffq0nAqK45vjJf91+Mro+P79NaULV4HIZa2Kr84UeFtCdLkpuGOuQiyN2LXjfK ojTg== X-Gm-Message-State: APjAAAXb1VXNbjxJMPgCj+GH0QmaXRsTuFrUiOpcWk5kamzk+ZstvLof vgN9tuuDvYAxe/9GbK/hUbfiLjzc X-Google-Smtp-Source: APXvYqx3ZAaL08Q5gur34JZGBFCqs6CgMQ4PCsqEDX+qNrcrsXclX+kybkTR9nKILr5gkKEoHBCEIQ== X-Received: by 2002:a05:600c:2104:: with SMTP id u4mr11363395wml.93.1583015370047; Sat, 29 Feb 2020 14:29:30 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id a26sm8442970wmm.18.2020.02.29.14.29.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:29 -0800 (PST) Subject: [PATCH v4 06/10] r8169: use pci_status_get_and_clear_errors From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: <823d89ad-7161-fd62-0933-f3e52f32ff95@gmail.com> Date: Sat, 29 Feb 2020 23:25:05 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Use new helper pci_status_get_and_clear_errors() to simplify the code. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 7c9892a16..4495a3cf9 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4357,13 +4357,15 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) { struct rtl8169_private *tp = netdev_priv(dev); struct pci_dev *pdev = tp->pci_dev; - u16 pci_status, pci_cmd; + int pci_status_errs; + u16 pci_cmd; pci_read_config_word(pdev, PCI_COMMAND, &pci_cmd); - pci_read_config_word(pdev, PCI_STATUS, &pci_status); - netif_err(tp, intr, dev, "PCI error (cmd = 0x%04x, status = 0x%04x)\n", - pci_cmd, pci_status); + pci_status_errs = pci_status_get_and_clear_errors(pdev); + + netif_err(tp, intr, dev, "PCI error (cmd = 0x%04x, status_errs = 0x%04x)\n", + pci_cmd, pci_status_errs); /* * The recovery sequence below admits a very elaborated explanation: @@ -4380,11 +4382,6 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) pci_write_config_word(pdev, PCI_COMMAND, pci_cmd); - pci_write_config_word(pdev, PCI_STATUS, - pci_status & (PCI_STATUS_DETECTED_PARITY | PCI_STATUS_PARITY | - PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_REC_MASTER_ABORT | - PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_SIG_TARGET_ABORT)); - rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING); } From patchwork Sat Feb 29 22:26:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=OaATaKOf; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLgt2bdrz9sPk for ; Sun, 1 Mar 2020 09:30:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727647AbgB2W3f (ORCPT ); Sat, 29 Feb 2020 17:29:35 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:36883 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727518AbgB2W3e (ORCPT ); Sat, 29 Feb 2020 17:29:34 -0500 Received: by mail-wr1-f65.google.com with SMTP id l5so7805651wrx.4; Sat, 29 Feb 2020 14:29:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=jVYqGE3zFQNBfIcS/dkWQZWOWyucD3CajAp6Ynd+Hzk=; b=OaATaKOfIaajcpbpgibKbkpwskhmu50Vjjtlx2EirgUo5PV1p5HL+/rxdUohgs5iZY A8oIht778UYbAlaUXkTCmf//DoQnHtIepIR3OvL9Jirl/sXhOgqtAk09MGrtxgbUsUiK b4BpBIqXGvtrb+5Bt0mz24l5kOqniJIzXCwrR/sIlUgInT9DImbycfK3K6nNJIdUB59n gzkNJ5KejFTsGlpy3Pp4nM3xZF/OhO5wZCg7S6vt+RNkuOkZllGWGCaIrvmtimXxfu7s jkO+ccPv8WUy4Gho96D33awi8wM+ejiuuilJcsjlYp3uPQEOx4lFku456WeLbKWGx5QM vjHg== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=jVYqGE3zFQNBfIcS/dkWQZWOWyucD3CajAp6Ynd+Hzk=; b=fmMxIzUFdziyLo9WcJrCrFoV8g6RX2P7Q2A4GxaOQvOd+iCb78gQNS+BWJQ0QU+e1i LjdD5HA9yIp3eUTNPoDbHd25fA8CRYjAP6yh5J3Ir+vwhRQkJEqxV2yNa/aV6EzRWuID qIMvSr7eycMItoNFPCOgnLX+dS37j0J/L3IWOS2J7MYzIKSU36c/DcBk418lAfqv5pHi h1p4pPqELPR7jOZxn1likHxIsqfqDexRDbsvj9eOkI7lgbGb+sKpUBSr6NnusjVSIqkg IXOf7QDg2oNcoz1hvGBvDNmUmUuJtVSTzKW3KqiU7tE6Z2G9kHtHPPgbxZAUYey7ih2o p+2w== X-Gm-Message-State: APjAAAU+14ClTHNuP1drys5lsBaWZbljK74RPR7z6eGrBJwP/pEzyHyq VfMvZ3lV9nX/kmepBkQ32aI= X-Google-Smtp-Source: APXvYqzl/hXV0qSgKwkh/YikHZvhUeSMY6k/AO3khueq4Xn4PyW7j2eWXvjgOcfRyRaKxbbmWmPRXA== X-Received: by 2002:adf:ff84:: with SMTP id j4mr7958780wrr.426.1583015371300; Sat, 29 Feb 2020 14:29:31 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id b21sm8012210wmd.37.2020.02.29.14.29.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:30 -0800 (PST) Subject: [PATCH v4 07/10] net: sun: use pci_status_get_and_clear_errors From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: Date: Sat, 29 Feb 2020 23:26:49 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Use new helper pci_status_get_and_clear_errors() to simplify the code. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/sun/cassini.c | 28 ++++++++++------------------ drivers/net/ethernet/sun/sungem.c | 30 +++++++++--------------------- 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index 6ec9163e2..e6d1aa882 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -1716,34 +1716,26 @@ static int cas_pci_interrupt(struct net_device *dev, struct cas *cp, pr_cont("\n"); if (stat & PCI_ERR_OTHER) { - u16 cfg; + int pci_errs; /* Interrogate PCI config space for the * true cause. */ - pci_read_config_word(cp->pdev, PCI_STATUS, &cfg); - netdev_err(dev, "Read PCI cfg space status [%04x]\n", cfg); - if (cfg & PCI_STATUS_PARITY) + pci_errs = pci_status_get_and_clear_errors(cp->pdev); + + netdev_err(dev, "PCI status errors[%04x]\n", pci_errs); + if (pci_errs & PCI_STATUS_PARITY) netdev_err(dev, "PCI parity error detected\n"); - if (cfg & PCI_STATUS_SIG_TARGET_ABORT) + if (pci_errs & PCI_STATUS_SIG_TARGET_ABORT) netdev_err(dev, "PCI target abort\n"); - if (cfg & PCI_STATUS_REC_TARGET_ABORT) + if (pci_errs & PCI_STATUS_REC_TARGET_ABORT) netdev_err(dev, "PCI master acks target abort\n"); - if (cfg & PCI_STATUS_REC_MASTER_ABORT) + if (pci_errs & PCI_STATUS_REC_MASTER_ABORT) netdev_err(dev, "PCI master abort\n"); - if (cfg & PCI_STATUS_SIG_SYSTEM_ERROR) + if (pci_errs & PCI_STATUS_SIG_SYSTEM_ERROR) netdev_err(dev, "PCI system error SERR#\n"); - if (cfg & PCI_STATUS_DETECTED_PARITY) + if (pci_errs & PCI_STATUS_DETECTED_PARITY) netdev_err(dev, "PCI parity error\n"); - - /* Write the error bits back to clear them. */ - cfg &= (PCI_STATUS_PARITY | - PCI_STATUS_SIG_TARGET_ABORT | - PCI_STATUS_REC_TARGET_ABORT | - PCI_STATUS_REC_MASTER_ABORT | - PCI_STATUS_SIG_SYSTEM_ERROR | - PCI_STATUS_DETECTED_PARITY); - pci_write_config_word(cp->pdev, PCI_STATUS, cfg); } /* For all PCI errors, we should reset the chip. */ diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index 8358064fb..2d392a7b1 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c @@ -545,37 +545,25 @@ static int gem_pci_interrupt(struct net_device *dev, struct gem *gp, u32 gem_sta } if (pci_estat & GREG_PCIESTAT_OTHER) { - u16 pci_cfg_stat; + int pci_errs; /* Interrogate PCI config space for the * true cause. */ - pci_read_config_word(gp->pdev, PCI_STATUS, - &pci_cfg_stat); - netdev_err(dev, "Read PCI cfg space status [%04x]\n", - pci_cfg_stat); - if (pci_cfg_stat & PCI_STATUS_PARITY) + pci_errs = pci_status_get_and_clear_errors(gp->pdev); + netdev_err(dev, "PCI status errors[%04x]\n", pci_errs); + if (pci_errs & PCI_STATUS_PARITY) netdev_err(dev, "PCI parity error detected\n"); - if (pci_cfg_stat & PCI_STATUS_SIG_TARGET_ABORT) + if (pci_errs & PCI_STATUS_SIG_TARGET_ABORT) netdev_err(dev, "PCI target abort\n"); - if (pci_cfg_stat & PCI_STATUS_REC_TARGET_ABORT) + if (pci_errs & PCI_STATUS_REC_TARGET_ABORT) netdev_err(dev, "PCI master acks target abort\n"); - if (pci_cfg_stat & PCI_STATUS_REC_MASTER_ABORT) + if (pci_errs & PCI_STATUS_REC_MASTER_ABORT) netdev_err(dev, "PCI master abort\n"); - if (pci_cfg_stat & PCI_STATUS_SIG_SYSTEM_ERROR) + if (pci_errs & PCI_STATUS_SIG_SYSTEM_ERROR) netdev_err(dev, "PCI system error SERR#\n"); - if (pci_cfg_stat & PCI_STATUS_DETECTED_PARITY) + if (pci_errs & PCI_STATUS_DETECTED_PARITY) netdev_err(dev, "PCI parity error\n"); - - /* Write the error bits back to clear them. */ - pci_cfg_stat &= (PCI_STATUS_PARITY | - PCI_STATUS_SIG_TARGET_ABORT | - PCI_STATUS_REC_TARGET_ABORT | - PCI_STATUS_REC_MASTER_ABORT | - PCI_STATUS_SIG_SYSTEM_ERROR | - PCI_STATUS_DETECTED_PARITY); - pci_write_config_word(gp->pdev, - PCI_STATUS, pci_cfg_stat); } /* For all PCI errors, we should reset the chip. */ From patchwork Sat Feb 29 22:27:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247163 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=XeT3zQv8; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLgf165Jz9sSd for ; Sun, 1 Mar 2020 09:29:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727644AbgB2W3e (ORCPT ); Sat, 29 Feb 2020 17:29:34 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39612 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727445AbgB2W3e (ORCPT ); Sat, 29 Feb 2020 17:29:34 -0500 Received: by mail-wr1-f68.google.com with SMTP id y17so7803871wrn.6; Sat, 29 Feb 2020 14:29:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=3oxaHy7GUp3VvIUdefqSTFgeBUI+Ntzm5rsd6wjLj2E=; b=XeT3zQv8D4p9/s7KFaC2XLvJIa0Y4bgNxvat+uiOPGGcra6jfHBmxfPbJeQOwtxl/T VBoYIZUDJsR/XrnZcFYYGbKNo76X8n8p3yUsPpyF8MEfvLeL6eUWRHiaSL/HsDv5EZDo ZXWTAq4le1YCxxzPz0mbC6JUB/Y/W8mELLXy672tU/vI7ASLGohQeHxbCKGv/kErMkzo 5O6ELKUlcs15++amA5vkc2bCkUftYfRJa/iWc42t5WN66u8OiYMpiR3Q0lApQ/a36eAj HcJVUsBFomdYIGEqQzMr/v8iRP2D63UBloX+zJMQjGRbQyTYDSJGl0QcF7se85Fw+pcW VEEA== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=3oxaHy7GUp3VvIUdefqSTFgeBUI+Ntzm5rsd6wjLj2E=; b=dq7oyKwE2IbcMLozP4XOm7kP5nii9eTstNEhZqlihMFCz0nky7sJLMGDAeTUW6Dgh3 8mNIY0UmOTODcSxddkDK8KldRdIuhI67j/HxllPfr+cbSIEoBZQ3NTtFEzvcPK7D2/tZ JoNTrmNMAM6S1Y8mGRw6HqbQo9iKoHsVmVCe8uLdU16mhx4gnn3ctOgkmVCmsd/ckchy Lejhz4wDgZrJRog3ad5VV1nx7x3bvOzr8lhj1KqvBszjtfXuvFDPuGOTneVr45pn0YHB QN17ziIqOSsOmT1OqwV1kZf7mzdoNLOKHv9aiggpkABi8w5gFKDbA4kSwA2LnDnE2fMD mzJA== X-Gm-Message-State: APjAAAVKSYZxECil6O2/jgrbQ3gjPO5PBXR6pQRisuR0wXLcBQJUeaob 5PPeYqPOMTyOKGEwaVbvP2U= X-Google-Smtp-Source: APXvYqzk7VrcL96l5dY+NPmzgSag4xUmdFPBQ59DKdg5xfhQIEdG89bjaM6n1y0fvBLJqx46WzfhCw== X-Received: by 2002:adf:edd0:: with SMTP id v16mr12853225wro.357.1583015372768; Sat, 29 Feb 2020 14:29:32 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id c11sm18770976wrp.51.2020.02.29.14.29.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:32 -0800 (PST) Subject: [PATCH v4 08/10] net: skfp: use new constant PCI_STATUS_ERROR_BITS From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: Date: Sat, 29 Feb 2020 23:27:34 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Use new PCI core constant PCI_STATUS_ERROR_BITS to simplify the code. Signed-off-by: Heiner Kallweit --- drivers/net/fddi/skfp/drvfbi.c | 4 ++-- drivers/net/fddi/skfp/h/skfbi.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/fddi/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c index 9c8aa3a95..cc9ac5724 100644 --- a/drivers/net/fddi/skfp/drvfbi.c +++ b/drivers/net/fddi/skfp/drvfbi.c @@ -20,7 +20,7 @@ #include "h/supern_2.h" #include "h/skfbiinc.h" #include -#include +#include #ifndef lint static const char ID_sccs[] = "@(#)drvfbi.c 1.63 99/02/11 (C) SK " ; @@ -112,7 +112,7 @@ static void card_start(struct s_smc *smc) */ outp(ADDR(B0_TST_CTRL), TST_CFG_WRITE_ON) ; /* enable for writes */ word = inpw(PCI_C(PCI_STATUS)) ; - outpw(PCI_C(PCI_STATUS), word | PCI_ERRBITS) ; + outpw(PCI_C(PCI_STATUS), word | PCI_STATUS_ERROR_BITS); outp(ADDR(B0_TST_CTRL), TST_CFG_WRITE_OFF) ; /* disable writes */ /* diff --git a/drivers/net/fddi/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h index 36e20a514..ccee00b71 100644 --- a/drivers/net/fddi/skfp/h/skfbi.h +++ b/drivers/net/fddi/skfp/h/skfbi.h @@ -33,11 +33,6 @@ */ #define I2C_ADDR_VPD 0xA0 /* I2C address for the VPD EEPROM */ - -#define PCI_ERRBITS (PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_SIG_TARGET_ABORT | PCI_STATUS_PARITY) - - - /* * Control Register File: * Bank 0 From patchwork Sat Feb 29 22:28:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=OgxTpXc/; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLgq5THfz9sPk for ; Sun, 1 Mar 2020 09:29:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727729AbgB2W3w (ORCPT ); Sat, 29 Feb 2020 17:29:52 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45204 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727637AbgB2W3g (ORCPT ); Sat, 29 Feb 2020 17:29:36 -0500 Received: by mail-wr1-f65.google.com with SMTP id v2so7723233wrp.12; Sat, 29 Feb 2020 14:29:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=HnjyZ2rP4r4R9QdkadbJqDIvo+cFcKMufZXST9ow+bc=; b=OgxTpXc/q+X92Qj3X1cZMo0lx5igTtCtGdTurqDnTiaf1QFOKRRZOXyFXe2KFVyKhZ 2bR4To+kT3lsL3jev58Bj2lD2AJ3aAlFyNLELlArikgum1jVu5GomwH3es4sc/PA1NBi /M40QJo7vPEGCs+9qjDxlnC1KVs6eNZ21+m3dx4zrebZOTa6/ORltkwWk4qVhxZsSw0T 1m7kFTQxzZUG6woTqAUMWue2voMASzwfGc4N3Je3yXAkMBorKSbVHFhwBPhnVD5laBYN GiRSuXZC0i7pq9Oi0a+Wt6tmfOGcMvFNJ2WvxVjN7pyLucmUUHmX7tqklShFcK3UeKiq 6tHQ== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=HnjyZ2rP4r4R9QdkadbJqDIvo+cFcKMufZXST9ow+bc=; b=YbM3w8D47X12/Q4tSPYDShqqcK6JXbdLtIwXrhE+XoRoGFBOQqfNFS/Iq+zXCCOW1C /ozyv5j8ajx8ocCY5177IWZyxMAh2fOuZ2BI9gGhRNW6iewDYgro10D9CsumoP6zLxHg 2YVyRHzXsliibYE7tem406b4UWss+i6Ov1qAGmpWAu3QfpzMdqeAKhyqt45fCNo93/w6 UFqZjaqq4HZ+J4OJonVVgAV5tk/28mjM39jFCkX5OrPHPrG8bHPiIYAwrcHtRSUUXU7B OkEtiPfQsn90G01lQuEuN5bJotU3L2x/uGYYp8TyS/0GLe/wQPDmSJj/ii3FelJPa4jk 5b6w== X-Gm-Message-State: ANhLgQ3mrHBdxN3WqOunMzzqig4+b1SKgK52plwhL0PVOjV6mB1J44Ds JMXuaQQJ4bP3h5Q7CYS2nZk= X-Google-Smtp-Source: ADFU+vvnu0rLKBCTigw0gSq5LRERDVrun/+wOc0XCFZmlFglPZdGaovMBe8s6lwAq8kH1D8kB4DHFA== X-Received: by 2002:a5d:4d10:: with SMTP id z16mr2936727wrt.271.1583015374193; Sat, 29 Feb 2020 14:29:34 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id j4sm7354174wrr.0.2020.02.29.14.29.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:33 -0800 (PST) Subject: [PATCH v4 09/10] PCI: pci-bridge-emul: Use new constant PCI_STATUS_ERROR_BITS From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: <04851614-b906-2b1b-f937-189c3c210880@gmail.com> Date: Sat, 29 Feb 2020 23:28:18 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Use new constant PCI_STATUS_ERROR_BITS to simplify the code. Signed-off-by: Heiner Kallweit Acked-by: Bjorn Helgaas --- drivers/pci/pci-bridge-emul.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/pci/pci-bridge-emul.c b/drivers/pci/pci-bridge-emul.c index fffa77093..4f4f54bc7 100644 --- a/drivers/pci/pci-bridge-emul.c +++ b/drivers/pci/pci-bridge-emul.c @@ -50,12 +50,7 @@ static const struct pci_bridge_reg_behavior pci_regs_behavior[] = { (PCI_STATUS_CAP_LIST | PCI_STATUS_66MHZ | PCI_STATUS_FAST_BACK | PCI_STATUS_DEVSEL_MASK) << 16), .rsvd = GENMASK(15, 10) | ((BIT(6) | GENMASK(3, 0)) << 16), - .w1c = (PCI_STATUS_PARITY | - PCI_STATUS_SIG_TARGET_ABORT | - PCI_STATUS_REC_TARGET_ABORT | - PCI_STATUS_REC_MASTER_ABORT | - PCI_STATUS_SIG_SYSTEM_ERROR | - PCI_STATUS_DETECTED_PARITY) << 16, + .w1c = PCI_STATUS_ERROR_BITS << 16, }, [PCI_CLASS_REVISION / 4] = { .ro = ~0 }, @@ -100,12 +95,7 @@ static const struct pci_bridge_reg_behavior pci_regs_behavior[] = { PCI_STATUS_DEVSEL_MASK) << 16) | GENMASK(11, 8) | GENMASK(3, 0)), - .w1c = (PCI_STATUS_PARITY | - PCI_STATUS_SIG_TARGET_ABORT | - PCI_STATUS_REC_TARGET_ABORT | - PCI_STATUS_REC_MASTER_ABORT | - PCI_STATUS_SIG_SYSTEM_ERROR | - PCI_STATUS_DETECTED_PARITY) << 16, + .w1c = PCI_STATUS_ERROR_BITS << 16, .rsvd = ((BIT(6) | GENMASK(4, 0)) << 16), }, From patchwork Sat Feb 29 22:29:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1247164 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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.a=rsa-sha256 header.s=20161025 header.b=KTjP3MnX; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48VLgh1yshz9sSb for ; Sun, 1 Mar 2020 09:29:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727695AbgB2W3i (ORCPT ); Sat, 29 Feb 2020 17:29:38 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:36282 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727683AbgB2W3h (ORCPT ); Sat, 29 Feb 2020 17:29:37 -0500 Received: by mail-wm1-f68.google.com with SMTP id g83so4986254wme.1; Sat, 29 Feb 2020 14:29:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=ArTAv9akc7/LkDwjVGNvRKjk3sNTR9LtjKLQSrks0NI=; b=KTjP3MnXb3IuC17bTkl0ejBvKT9Av9U/SFFskEbtdMsCVKLvXyFvSi+aOCBLj+zIDQ q14C0rai6OSDkiCQCFm4nXrbLC4MNqQM4H59v2hZm7cU99aKVP11LSRCoHb8gc4df5JV NZSt4dtNMS5U5j62NRFBH6+e14MEdEIRy0y3F28lNynncr8/IRqBabT0YYv03Zx8vG5Q aJxCPgm89P4xXot19eR0FapPagr9vdMjBgoqHMub62EA4OCUX5dp5JWz9qUmm/ZELYlO B10fGE+Vmz2OuMbEwwyMUwTiP82wOnK+I9DtyfIrtbxPVSEAHRiAkYWbGF2xIl3HS+i6 Syug== 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:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ArTAv9akc7/LkDwjVGNvRKjk3sNTR9LtjKLQSrks0NI=; b=E6mWfZMV2E9kFuJ8aBl923jS5c6LMo12S0qKtur2zIFtMNR/egANVZEiwERytWikvT vz2jp+25l/v1nBVvoYfyy+3UzKMMXcMC0bWW4uXSF5Dv+FAR2OKkNX9wR1LzhWlhj2pR o4NmBGBREyLsbCWflNhLi4rmN0B4u50Gg05yBqJqrcF3wU5EGJjwUySaIWSr1IkcuBHQ eUipDqj4ajJyycZDQZYmh6LRSTBRl2tclDCN0dFSDWEOBnmH06MRANcohy41W1dA9bEK 8xgK6twmLQZKFw3vLyQWdf5ObN2SaiFurND3CJrvZ2LdR+zgcd4QFoBajaPGDTvA0k9r Z/LA== X-Gm-Message-State: APjAAAX178ymRNX+c9Je9i/6wbrRMV4t4CC44jebkQ30KzlaNfcmZame y3kG9F3pYanO3fLvh1mbhxM= X-Google-Smtp-Source: APXvYqz8zstsmbCwyCSgdDGDvjCyOgoD6VFSBh/oElf4FvZFQ/a9OG+ckjo41iEPN8XCm++cEHZ2Fg== X-Received: by 2002:a7b:cb46:: with SMTP id v6mr4613642wmj.0.1583015375725; Sat, 29 Feb 2020 14:29:35 -0800 (PST) Received: from ?IPv6:2003:ea:8f29:6000:7150:76fe:91ca:7ab5? (p200300EA8F296000715076FE91CA7AB5.dip0.t-ipconnect.de. [2003:ea:8f29:6000:7150:76fe:91ca:7ab5]) by smtp.googlemail.com with ESMTPSA id e11sm18699606wrm.80.2020.02.29.14.29.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Feb 2020 14:29:35 -0800 (PST) Subject: [PATCH v4 10/10] sound: bt87x: use pci_status_get_and_clear_errors From: Heiner Kallweit To: Bjorn Helgaas , Realtek linux nic maintainers , David Miller , Mirko Lindner , Stephen Hemminger , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai Cc: "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "netdev@vger.kernel.org" , alsa-devel@alsa-project.org References: Message-ID: <6362e866-9ce3-31f5-3357-9f086eedf11e@gmail.com> Date: Sat, 29 Feb 2020 23:29:07 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Use new helper pci_status_get_and_clear_errors() to simplify the code. Signed-off-by: Heiner Kallweit Acked-by: Takashi Iwai --- sound/pci/bt87x.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 8c48864c8..656750466 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c @@ -271,13 +271,8 @@ static void snd_bt87x_free_risc(struct snd_bt87x *chip) static void snd_bt87x_pci_error(struct snd_bt87x *chip, unsigned int status) { - u16 pci_status; + int pci_status = pci_status_get_and_clear_errors(chip->pci); - pci_read_config_word(chip->pci, PCI_STATUS, &pci_status); - pci_status &= PCI_STATUS_PARITY | PCI_STATUS_SIG_TARGET_ABORT | - PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_REC_MASTER_ABORT | - PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY; - pci_write_config_word(chip->pci, PCI_STATUS, pci_status); if (pci_status != PCI_STATUS_DETECTED_PARITY) dev_err(chip->card->dev, "Aieee - PCI error! status %#08x, PCI status %#04x\n",