From mboxrd@z Thu Jan 1 00:00:00 1970 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-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 --- 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) \ -- 2.30.0 From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.2 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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=unavailable 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 BD329C433E0 for ; Tue, 5 Jan 2021 09:45:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6265222257 for ; Tue, 5 Jan 2021 09:45:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6265222257 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:References: To:From:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VDjrN6kk9uDL73xdf/HDQx8K3By1t+POtn90DS5h4rE=; b=a2WaSHQ7pC1RJlWM8JKCfv9a3 c0EHLYPHWaNcWr89KyLtbp88np0PA/6nyRXUzK94zDc0JS8dbyXaHUTJ7KGW4vGgr6iXc+/446bam kL80YgqqjTI1zu65ya3u74dWN4U2DPupQH0Bje3M3CyjC8+kS438tG+eyyQ5/vwrqG4WWcVYAT0OT IcI9W9LXx94zVh/54qfKYVCML4CdZtAcq0yUaB2VWcHEAmTYxHuh4cRiV8O4Vv+sYhJjuwxZGM3DG OHDRaVaanbiGRVZn90VWZ5ZEoW6tV6ohnOJZdaX/YSVwPhqo0XZpaprZkaLC7aRF2RuTnAxnrOEZO 7Dym8Ic6w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwist-00026n-5j; Tue, 05 Jan 2021 09:44:11 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwisp-00025Z-Pq for linux-arm-kernel@lists.infradead.org; Tue, 05 Jan 2021 09:44:08 +0000 Received: by mail-ej1-x629.google.com with SMTP id qw4so40381473ejb.12 for ; 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=c6DYsR1e6cup2NfoHTDwPPz7VAnvrLbcdYCU6hGM7ziq/loJqCumcsoNRl+7084fCw c5Epsmd3hehd8X46PrAslZI4swKiGY9c11OewVIhzzCr326nQ6aJDqIxYRG/hfevqmlp sJK7ywhBVeQ1EQNUzRpSBQvFRJfBDbNnbrN/LAhOsLdjycpKOxeK20zTAiIjRqf595Fl 4y5BH1bPA7OUoJSDdAt1RmmYRDUC9t54JqpOkZhKzpm8Ts6G6ghoyjTSQ31J9oLQgj/p E44GVn31DsF+W1myHxc8l/O7AsGM/e/P05h/0D3zjMO9WUUOobj0F5hvdU/K8CUkXXW2 TFrg== X-Gm-Message-State: AOAM533n/mF9ccDMIJEFDL1TckKvskDZ6HA5yHEKZ4B8lGG5oAjWSHvL n8IQlb9Jm11kOwF8M7fDvcg= 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210105_044407_868905_4B8BC788 X-CRM114-Status: GOOD ( 16.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linux-pci@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "netdev@vger.kernel.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 --- 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) \ -- 2.30.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel