From patchwork Wed Jan 6 11:03: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: 358036 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, URIBL_BLOCKED, 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 BFAD0C433E0 for ; Wed, 6 Jan 2021 11:03:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7566222482 for ; Wed, 6 Jan 2021 11:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726051AbhAFLDr (ORCPT ); Wed, 6 Jan 2021 06:03:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725792AbhAFLDr (ORCPT ); Wed, 6 Jan 2021 06:03:47 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99817C06134C; Wed, 6 Jan 2021 03:03:06 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id 6so4486130ejz.5; Wed, 06 Jan 2021 03:03:06 -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=4ghlzx0ngHPmtJ8Qunegeez7cCjaR86UkMnCfsZmtjo=; b=jDTBxuk8u1KOGxA7ihc5vhOEISiXcpoaaMsyFJWcgUPuiLWF+CJLvigEf8XYPkBXSP yJmvSrytcHol8IhMyvSXGTNnuJlU/HmLKFteEUw3VFh6xipYFVUXg5bICRZEa3NyXAIq E30jv2cN5/jfxzZj0rllxDDtNLmEu6XGp06CAKduICikbZEggfT04toCFcMYXNlvWIXX rC/CTJT7Vzq3t+B9xzobs02Y9kDsuhalj0jjJu1X2CVjD2cZU6ZHuHMmaLF3Kuqo+jDr mCJaBPI793MdRwkJhTZKFg4VXbzGJh7lp04YTIsUCwrbv+Ax23V+zjSREqJejceofE3J Fq8w== 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=4ghlzx0ngHPmtJ8Qunegeez7cCjaR86UkMnCfsZmtjo=; b=kslnIrGLk97QxS+2k2bIpCizDz/mcedxfwo9xFan1npGwkaYbuluGoqYyOErDM6xXt TRXweJo56KpBIzkIip5pVqLyo46uO4wuSdHlv2/7QRLYlcZqk/XS0W6IFCXkX5i0+LzM IurfGZF7DlJfO+f6VazWGeaKPauui4q7gYEcY6DFbzlmKiQNEi6SlVPMlRMXcaLgkSul kUobjX4yRXrWv0UL5jegzmqtaBhalhSFA0xZBoS6T2m7C2mNyzmImaGwjDphpjuraPKJ ZmRCrdAlfz79oA43VqZmGB5DLjMoPNqOa97m1hdMJJGF49fsF1f+9AqiMNuQdv8dNcTq NU7A== X-Gm-Message-State: AOAM5331XRe+7ivkhistCmh6UL9thQw0zOmQrbKT/FS5G9J3coDmTmxc 9D5IH/EhMvBldJYF6MAE+LlQjyP8wZA= X-Google-Smtp-Source: ABdhPJyxFiGtR9Ws4sEhjtXSSCtcsOpKSeQJXnWvsImiv4jVFI2dVvQyy8pW9yHANVwlV1wjMO6y/g== X-Received: by 2002:a17:906:4d8d:: with SMTP id s13mr2482699eju.305.1609930984438; Wed, 06 Jan 2021 03:03:04 -0800 (PST) Received: from ?IPv6:2003:ea:8f06:5500:e1db:b990:7e09:f1cf? (p200300ea8f065500e1dbb9907e09f1cf.dip0.t-ipconnect.de. [2003:ea:8f06:5500:e1db:b990:7e09:f1cf]) by smtp.googlemail.com with ESMTPSA id qu21sm1092635ejb.95.2021.01.06.03.03.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 Jan 2021 03:03:03 -0800 (PST) Subject: [PATCH v2 1/3] PCI: Disable parity checking if broken_parity 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: Wed, 6 Jan 2021 12:03: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 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 Wed Jan 6 11:06:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 358035 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 2D3FDC433E6 for ; Wed, 6 Jan 2021 11:07:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0157323110 for ; Wed, 6 Jan 2021 11:07:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726430AbhAFLHV (ORCPT ); Wed, 6 Jan 2021 06:07:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725828AbhAFLHT (ORCPT ); Wed, 6 Jan 2021 06:07:19 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 514CAC06134D; Wed, 6 Jan 2021 03:06:39 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id lt17so4535739ejb.3; Wed, 06 Jan 2021 03:06:39 -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=LMhEikvRUZQaIKyyHYQPd9FehVZ9OCrs1+Guuen9CX0=; b=X4hGYmXPkT7Y/gFWjq2R6usf6mtSbqmYvDxFIVpAsyNrdel18QRQ9NKh0HrcZf2JND KO+7W1KfW/rMUox9uRp4D9cNWB3ft0Sv1vCO9rJaAE8BShbC0aqQncL6yqBAAeGV7sOQ ewL4CpLiRVfd6qelJ0pJlakxNKDC9hSHPvabsHiTeVk3Un7PkdoAqYa3IcPeMHceYJkJ dExoZRtYYyYisFh/1CQTxNUcDVa12tvTPjmRm5pSr3GVzwbMMyntvxAdDLcWKfFsP3nf A7y4eBftUUsxTmgrfKopE8TiCZ0/hEvQOkBu230ZSKKmVUrRglEniQDXLE82Qlu2VEcu +N1A== 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=LMhEikvRUZQaIKyyHYQPd9FehVZ9OCrs1+Guuen9CX0=; b=OMayDP+FFJQ7giIdv/VJtWiOD1K1dN5YTetovhZ+zyD50jZz4v+9FvGhiXU0wrH8W1 rWfGYSYW0g4TemlV5RRwfXUV2nDjd8jeFVOQus5QV+OhtgQ5ci/G2j8jJqKranpm1/+j v382ww3u6tTX4JPpE9zpPh60TxEm/+MlUhjvdcoBPYRLJAFoR7O2HoRXas4P0ZeHf82d HYnAYRXAurN9E7A8wq0ZmtfhsvorlXFa/jZUNMsC3CbglkpK9Ja3nmGPUGQA5SPnTa8n envTzrTANACmFslQRqpnMB7ePvSnmn3G9RDCNuXFtS/nm2o5uBaJAtCUQKzaH91Ahuio 5UBw== X-Gm-Message-State: AOAM530tUjjpIal5+05ibGjPW4G93QeBxOv2JN5BPOuvsww7U7arEGoq 1QFbk7lqwEHnUbALN5tTIGdyGRlnyxg= X-Google-Smtp-Source: ABdhPJxWTZ5/H6x9x1nURlGcN1s3NA5QJ6dGN5bNgAW7aPmczyiNhSd4mzPg43C0epaDGwiI2Xj2vA== X-Received: by 2002:a17:906:cd06:: with SMTP id oz6mr2526596ejb.25.1609931197807; Wed, 06 Jan 2021 03:06:37 -0800 (PST) Received: from ?IPv6:2003:ea:8f06:5500:e1db:b990:7e09:f1cf? (p200300ea8f065500e1dbb9907e09f1cf.dip0.t-ipconnect.de. [2003:ea:8f06:5500:e1db:b990:7e09:f1cf]) by smtp.googlemail.com with ESMTPSA id m7sm1090983ejr.119.2021.01.06.03.06.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 Jan 2021 03:06:37 -0800 (PST) Subject: [PATCH v2 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: Date: Wed, 6 Jan 2021 12:06:29 +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 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 c9abc7ccb..024042f37 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); }