From patchwork Tue Jan 5 09:41:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 11998493 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=-14.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 02F60C433DB for ; Tue, 5 Jan 2021 09:44:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A036322257 for ; Tue, 5 Jan 2021 09:44:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727658AbhAEJot (ORCPT ); Tue, 5 Jan 2021 04:44:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725831AbhAEJos (ORCPT ); Tue, 5 Jan 2021 04:44:48 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF741C061793; Tue, 5 Jan 2021 01:44:07 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id lt17so40411560ejb.3; Tue, 05 Jan 2021 01:44:07 -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=hyCKX7wWLjpBih18O2/1WqNll8TAh0zyeUSpeo505RQ=; b=kh6QFSA4OhPvNC+iVQ74akY1E1jsvkksmE6ZlzNckKaFXdlaiwzRM49r0OjjxHEzJj oTVlxLwpFE1lTHdMa63BqbQpuXqNry3JG38EiNHoWljyDBboXpqgqvw4lxIhbGrtfa05 Cdpg0Ile3MiwhbJ/4jS38Kpnym3h+YPrD/eL97gHT/8j79fIIQp+7GrMajh32ZSINKnA 6jwSKjPIf1JLY8CL3FENNVMfuvP67KoUB8TVVMXNn4gSL2td1G2KBhmeCJZA4cTuTvkh 828JgAgO9lT0S+bNjc+R1LdGUWP23N5XexveP5+R4OjAJK3hDu5h2tIwue38olBoZ/iA eDWA== 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=hyCKX7wWLjpBih18O2/1WqNll8TAh0zyeUSpeo505RQ=; b=Yd7fMoYWpD0RKwNldRMjCpP7YT4g4ZgTn3mQF2iGthdgLVvhJHWt1d4RCi8hV7I1Xy HQSO/YnAAXLJBmX41EeiVcwnCehLnQSxe89GrC/omIN5d4fsAwsrmqEKQNTV5Yh7oZ5g KlUrXoSKpUx/cbg91NDNchr1JEva0y2ltO5lGw+6smJ3eUlBgWF7eektJAK4gfZwmhn0 JVwfhfxzRtxljs2R3pCbBw7kn/rVwq23hT4j6dvYy/f1w93jwcxe/BDbNoFvZk7g6eXn 6lSdmPSKd1Kggh5u5AuL76yLKO9dmTvRf7QbX9ek/gobgavEDy1kCs4yRCTVkzGJrjhu fujg== X-Gm-Message-State: AOAM533R82UPLA5vHvFgQuCBNXeg5KVum3Sm5I78pKv30/ohhBh46N4l VgsUuYAxd3/aVjCl8l/ZIDQRC2q/jMU= X-Google-Smtp-Source: ABdhPJw8qDs2JyPs5xGd0F+p4GgVv9a9tY8Ct2oUsLOVThxQoKo+urq0gbnaNkgh7U72HVE/PUHxVw== X-Received: by 2002:a17:906:eb8d:: with SMTP id mh13mr68391695ejb.299.1609839846413; Tue, 05 Jan 2021 01:44:06 -0800 (PST) Received: from ?IPv6:2003:ea:8f06:5500:5ee:6bfd:b6c9:8fa1? (p200300ea8f06550005ee6bfdb6c98fa1.dip0.t-ipconnect.de. [2003:ea:8f06:5500:5ee:6bfd:b6c9:8fa1]) by smtp.googlemail.com with ESMTPSA id h15sm25235984ejq.29.2021.01.05.01.44.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Jan 2021 01:44:05 -0800 (PST) Subject: [PATCH 1/3] PCI: Disable parity checking if broken_parity_status is set From: Heiner Kallweit To: Bjorn Helgaas , Russell King - ARM Linux , Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "linux-pci@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "netdev@vger.kernel.org" References: Message-ID: Date: Tue, 5 Jan 2021 10:41:26 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If we know that a device has broken parity checking, then disable it. This avoids quirks like in r8169 where on the first parity error interrupt parity checking will be disabled if broken_parity_status is set. Make pci_quirk_broken_parity() public so that it can be used by platform code, e.g. for Thecus N2100. Signed-off-by: Heiner Kallweit Reviewed-by: Leon Romanovsky --- drivers/pci/quirks.c | 17 +++++++++++------ include/linux/pci.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 653660e3b..ab54e26b8 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -205,17 +205,22 @@ static void quirk_mmio_always_on(struct pci_dev *dev) DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on); +void pci_quirk_broken_parity(struct pci_dev *dev) +{ + u16 cmd; + + dev->broken_parity_status = 1; /* This device gives false positives */ + pci_read_config_word(dev, PCI_COMMAND, &cmd); + pci_write_config_word(dev, PCI_COMMAND, cmd & ~PCI_COMMAND_PARITY); +} + /* * The Mellanox Tavor device gives false positive parity errors. Mark this * device with a broken_parity_status to allow PCI scanning code to "skip" * this now blacklisted device. */ -static void quirk_mellanox_tavor(struct pci_dev *dev) -{ - dev->broken_parity_status = 1; /* This device gives false positives */ -} -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR, quirk_mellanox_tavor); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE, quirk_mellanox_tavor); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR, pci_quirk_broken_parity); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE, pci_quirk_broken_parity); /* * Deal with broken BIOSes that neglect to enable passive release, diff --git a/include/linux/pci.h b/include/linux/pci.h index b32126d26..161dcc474 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1916,6 +1916,8 @@ enum pci_fixup_pass { pci_fixup_suspend_late, /* pci_device_suspend_late() */ }; +void pci_quirk_broken_parity(struct pci_dev *dev); + #ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS #define __DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \ class_shift, hook) \ From patchwork Tue Jan 5 09:42:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 11998495 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=-14.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 E3A47C433E0 for ; Tue, 5 Jan 2021 09:44:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABD0D22482 for ; Tue, 5 Jan 2021 09:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727991AbhAEJov (ORCPT ); Tue, 5 Jan 2021 04:44:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725831AbhAEJot (ORCPT ); Tue, 5 Jan 2021 04:44:49 -0500 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4212DC061794; Tue, 5 Jan 2021 01:44:09 -0800 (PST) Received: by mail-ed1-x52d.google.com with SMTP id i24so30366706edj.8; Tue, 05 Jan 2021 01:44:09 -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=XmXaHO6XtlhHHB5hr+caHztCDCfS/3Yl6IO2xbPe16k=; b=gfbZAVluaUqAozdn9jK6zB3yBcuBHNf9CLjz8QKiIYMnz8pEGY+0EylU2s12/mZULU ZAcU1oz+XARDrvcRCl0amZP+GPZV2buPTWzMrgUu3UsrDtwCL3ACyGLKdu3Gz1ByvcA3 nc6E7IQhwmkGPNEK5OiTnOzMXiXj1N4IyMlorzj1X2kg7vG0anr+eCrRVxX5ZxYIPdiV HjQUYDT3RyNMZm/gtcy8XkWe69eZQ++EI7o/g9RIKaidM2OJ4JoZizJIZWrvd1zdBCYe n4Br++yELMy6Mq6TrDWLOoNQsOLh/3VYOh49CrYf64KQa/F3DC//s27wqCsqbtu9ryne mu8Q== 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=XmXaHO6XtlhHHB5hr+caHztCDCfS/3Yl6IO2xbPe16k=; b=DjQQ38Dt3rYdCmNEOYbTcD3da8nB6YUJfKaMZRFkSj+p0ShGHvcevUL++Yqgy0DXYQ zb8+V8unkk5bncdS1bi2N343cFVIdVpjG7maGtkdhFM7lC5/vPD7MPRkBu2aD/JKBXkR PVcv+ypqYC27wxQp6uCWO0OEzDQpuBpt/R0Lgv+Im2Q+cfJuMokjSMTxwgvwcFtM5YIf gsIicCmmCJ5nijW7MXOtz7HYK8KukDxL+/yPP9KTbmGjg2WDc7FwGr4epap4LEWPolK5 kGbRveeYBdoAyUXCjgM2RLdAhK6RsZcUf6mRu4Qu/7ls7julHuGZnauhU9EoGJGxuXFQ o8gg== X-Gm-Message-State: AOAM533gJQolefIf5knhiYcr+C8M2eD0FRjuFrqt9k7ZwyNx2RK2LK6c GK4SqxFQEaLKArYiS6PtIC2m+6aXjP8= X-Google-Smtp-Source: ABdhPJwRYM03xT7yONzoDkBZsabwRjqq8Mork0bii5H2CPRKf8zDK8nIEhGoIt4NVJNNRwLlIt0DwA== X-Received: by 2002:aa7:c444:: with SMTP id n4mr73120970edr.226.1609839847685; Tue, 05 Jan 2021 01:44:07 -0800 (PST) Received: from ?IPv6:2003:ea:8f06:5500:5ee:6bfd:b6c9:8fa1? (p200300ea8f06550005ee6bfdb6c98fa1.dip0.t-ipconnect.de. [2003:ea:8f06:5500:5ee:6bfd:b6c9:8fa1]) by smtp.googlemail.com with ESMTPSA id e25sm22382832edq.24.2021.01.05.01.44.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Jan 2021 01:44:07 -0800 (PST) Subject: [PATCH 2/3] ARM: iop32x: improve N2100 PCI broken parity quirk From: Heiner Kallweit To: Bjorn Helgaas , Russell King - ARM Linux , Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "linux-pci@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "netdev@vger.kernel.org" References: Message-ID: Date: Tue, 5 Jan 2021 10:42:31 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Simplify the quirk by using new PCI core function pci_quirk_broken_parity(). In addition make the quirk more specific, use device id 0x8169 instead of PCI_ANY_ID. Signed-off-by: Heiner Kallweit --- arch/arm/mach-iop32x/n2100.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c index 78b9a5ee4..24c3eec46 100644 --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c @@ -122,12 +122,10 @@ static struct hw_pci n2100_pci __initdata = { */ static void n2100_fixup_r8169(struct pci_dev *dev) { - if (dev->bus->number == 0 && - (dev->devfn == PCI_DEVFN(1, 0) || - dev->devfn == PCI_DEVFN(2, 0))) - dev->broken_parity_status = 1; + if (machine_is_n2100()) + pci_quirk_broken_parity(dev); } -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REALTEK, PCI_ANY_ID, n2100_fixup_r8169); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REALTEK, 0x8169, n2100_fixup_r8169); static int __init n2100_pci_init(void) { From patchwork Tue Jan 5 09:44:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 11998499 X-Patchwork-Delegate: kuba@kernel.org 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=-14.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 B4A89C433E6 for ; Tue, 5 Jan 2021 09:45:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69A6722482 for ; Tue, 5 Jan 2021 09:45:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728173AbhAEJpA (ORCPT ); Tue, 5 Jan 2021 04:45:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727682AbhAEJou (ORCPT ); Tue, 5 Jan 2021 04:44:50 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55B2EC061795; Tue, 5 Jan 2021 01:44:10 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id i24so30366757edj.8; Tue, 05 Jan 2021 01:44:10 -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=zpRBjTwwbttmw1T4jYOjshcbes1jvp4oKN+HYKTlNQQ=; b=F817bh2h/kwTTJY838KD3QDVXnYpZakUnx0VvrVUNsKtvIe0fwdKIVXVXcIo5tqZDm MYTa7PP0iDHkedCRo2UJ/VdX1E3OoBVmbDUivU8sm+T3v0/78hq0A1a7JiJWzBvAGcN+ pkWE5t95lLBFoFT6XN2qiW5XDDkCjyq3sTVFJjnNcfTi0kbq7PPXMG7uyvl2SfCbeJxL 9rk2WBpc64ElEkPUmTSccBNsSYT//2tGliPejz0D0dmFk8kHX0laCMepY/u2JSG9o1Ia HQNIyKFaSUmG5JcVIsBaHDwxYCf+Rr43+psMUa2GGRjWLnv30Y54oPDx44it6u6vobNz Z0Tg== 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=zpRBjTwwbttmw1T4jYOjshcbes1jvp4oKN+HYKTlNQQ=; b=QU17W4LkBFZfSPw4PTswHmwiYgCxYYsWCHFlggmXmflQlKBcbe5sRa5NzIaKqNGvmr UC3rzkqhzoA5GaN9kepyKVQ4N7EpYawuPmJHHM+EA8TSXuzwo9zwWNKwscuj3OnctIv+ UUStFVXyxiyjc85iTKY6q3jQkiN/AUyqt8CXFib52DaPserlxPms/gbkKQsi2RXN44Sa TBTdQO5VdVI8Ib6kf5+gmWPZcmswK9sD68GXU/mMnC45xCoa5I714PbNwsWhPZS3vZLG /O7NTTCftHuEBKc6MX+oDdxnDrkv+MXi8b8mvLYCZUOUpFCCJy3yKlQdUZrmr+jGT21E cGSw== X-Gm-Message-State: AOAM533Q5B8//Vud4fGGRey5QF1wUAEz1o9W8ZVNLM4BT8/dpsElvOJN G7XCnrMt9C1mFthvFQL/vkJPZrG+PFg= X-Google-Smtp-Source: ABdhPJz8/t2oP8zuzYTHR+26DncWBAiGdOujOw9lfva2XU/CVQllvloNkBjbzcR14HhiOPedOj7V+g== X-Received: by 2002:a05:6402:3546:: with SMTP id f6mr50292986edd.242.1609839848892; Tue, 05 Jan 2021 01:44:08 -0800 (PST) Received: from ?IPv6:2003:ea:8f06:5500:5ee:6bfd:b6c9:8fa1? (p200300ea8f06550005ee6bfdb6c98fa1.dip0.t-ipconnect.de. [2003:ea:8f06:5500:5ee:6bfd:b6c9:8fa1]) by smtp.googlemail.com with ESMTPSA id f8sm44959266eds.19.2021.01.05.01.44.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Jan 2021 01:44:08 -0800 (PST) Subject: [PATCH 3/3] r8169: simplify broken parity handling now that PCI core takes care From: Heiner Kallweit To: Bjorn Helgaas , Russell King - ARM Linux , Realtek linux nic maintainers , David Miller , Jakub Kicinski Cc: "linux-pci@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "netdev@vger.kernel.org" References: Message-ID: <0357b4f8-ca14-766c-ba0d-3cd83bdda578@gmail.com> Date: Tue, 5 Jan 2021 10:44:00 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Meanwhile the PCI core disables parity checking for a device that has broken_parity_status set. Therefore we don't need the quirk any longer to disable parity checking on the first parity error interrupt. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index a8284feb4..1e26b47f5 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4329,20 +4329,6 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) if (net_ratelimit()) netdev_err(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: - * - it seems to work; - * - I did not see what else could be done; - * - it makes iop3xx happy. - * - * Feel free to adjust to your needs. - */ - if (pdev->broken_parity_status) - pci_cmd &= ~PCI_COMMAND_PARITY; - else - pci_cmd |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY; - - pci_write_config_word(pdev, PCI_COMMAND, pci_cmd); rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING); }