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: 11998483 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=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 ABEDEC433E0 for ; Tue, 5 Jan 2021 09:45:41 +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 50C5922257 for ; Tue, 5 Jan 2021 09:45:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50C5922257 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=+IaAqVafG6xpnZfFhYhedxh7AFhcggpARCDr8C3m+Gk=; b=qw7yERtmg675n6siuQ0kocXQB PgmAvQslEmRGOgKsCuJQuRUQbz8kj1njgPIpsbMY7YD5ejkLihs7jsjwSxWpVeHFZOuQNev6Ezg+y nsQu2OJ5p/jjxRXXVdHd0K36MQ3XQOR6cDG1cTuixe2g8qtPmCOK2WvzdQhxNk+vQdOKjurrxQ0JP q+NMgT509PqE8YwkMceM9r5CG0u3I2Ud2FvetZn6nNt6uUBxVaz5uPnpcgG+psQ1kamWhOwLYc6nS jiQSXWbvj6Ecl8dBXJW57GvkLCx7P0NPY58lvmsUIsjfj+i0tST4ZqboB7d9LjaeY6RIQDMWrUe/m RxopXZBrw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwisw-00027j-LQ; Tue, 05 Jan 2021 09:44:14 +0000 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwiss-00026I-3r for linux-arm-kernel@lists.infradead.org; Tue, 05 Jan 2021 09:44:11 +0000 Received: by mail-ed1-x532.google.com with SMTP id u19so30399482edx.2 for ; 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=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=eATn9IP9XZ0PmTNVAqnAq6Mmluv5GMgZCNMy+PKlJtLMYNlF+YjCeMBnHrCjmcTWo6 Bfl2DmQS08MkCDN+L7kgz1IqqVHaPhb3nc79D9rsSZzdoBHEzpnYxbc/scv7HEsncfWl YVHiAcOZ05eMZYaum2R/EK1QGkq1YYeiXjkx9VeMQqRuI7BPUN9OWt8CO7dOgh4JfWfP lEDSj0vf9SIv/ryoJCcIIw1yaGqiLnJOE8lL9N9brgIKVnjtaDmAgsaKNVOdgvonNcKq pLJBqOLFv8ylMgAhGzyTqwik2qfeeWmGUDfAS6uVOB1yPwNehQismK1gS3mfIQVOFmIx MZxw== X-Gm-Message-State: AOAM531Ve5WSD9nxnvl5T0TYUBzttBr5gm8LTTPR89MGU+VWL6BYs5KN hG9oeyxvWUhG1vNQhZ1QBwg= 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210105_044410_219617_DBBABF95 X-CRM114-Status: GOOD ( 15.26 ) 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" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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); }