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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8197DC04A68 for ; Wed, 27 Jul 2022 09:37:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231448AbiG0Jhf (ORCPT ); Wed, 27 Jul 2022 05:37:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231430AbiG0Jhd (ORCPT ); Wed, 27 Jul 2022 05:37:33 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAFC237FBE for ; Wed, 27 Jul 2022 02:37:32 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id e16so15606126pfm.11 for ; Wed, 27 Jul 2022 02:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language :from:to:cc:references:in-reply-to:content-transfer-encoding; bh=vJn+MLWCsk+ei9hsjhMzOKCAi7lwMqHzERz4ilhjRd8=; b=BAhli0xR/K813sba6mxZ6qzpHkBuQ4XWkwcm3SYX26nlD7jupj4lyIm8AZWeSTrPTU uaNdRXX43CRPYE0tkW/2ileR6tI0bBEP3hf1Gb2uTf1dQGypO3EBgYByss0gfOR3mUZv P5/YmzgTICq86WARnnbyd6/1midmJWjkxayGrnR7TaNtYE87DBcqeKyXVMrzn5zQRc9q OoQMm93hby7hlcUQ/FBMFOnGABtmX17n4C4lArmjtRL6pgvbiKX5+vJbaIivq7YiUuHs WAo3aG1YsmNpvTQ7yZ/TmvahbK4tE5hDB+ARbVgHPrPYTVCXpkGHQ3usbGHYgP6NyQRt nDJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:from:to:cc:references:in-reply-to :content-transfer-encoding; bh=vJn+MLWCsk+ei9hsjhMzOKCAi7lwMqHzERz4ilhjRd8=; b=HMDyB9iX7JzVMZkKwWcFzQPVB+eyVD5uEIxyDe4GxQ5s5JG3nAG6fx/dbE2GFlXG1B O1jeVYAZIhbJ3iooHinUx8t+KZSdQcqKNwD4Jn1ESfE7toTXwUDuEEtGv8XcLVToDYdg dZY5RN4BfdTephtXrNOmufPc1P1tVo7hWiIfzkT4vh74jaq0oO7atNTNZ9ayWQ1u9Bjh T+R1JPSRz05UvYt2WlKvAyesPGvOdgzdmRtWXbYUbIbVCXiQ8NTd9WPcDA3JhjqEhm0o PMUiOVVhWL+Xf8I1cm/jrc+RzmEnAd5mrcmkUU7JN012Z7DD2HntJv4xJKYyjMU4sfap 9Lng== X-Gm-Message-State: AJIora8xX6o/xcwg+ETuhzIo02BC92N3NWker5J7LOZAazj8lgIvDZ+5 kirCD2eSXp8fBJxABspeUsFiHg== X-Google-Smtp-Source: AGRyM1vpKLg/coFT9BHg45n8K+BH+qcz7PnJfDmPqrf9RdHbYZUKQkVRHlxrGkdE9u9DBN4Z6IWoXw== X-Received: by 2002:a65:6398:0:b0:415:7d00:c1de with SMTP id h24-20020a656398000000b004157d00c1demr18665628pgv.610.1658914652147; Wed, 27 Jul 2022 02:37:32 -0700 (PDT) Received: from [10.2.192.95] ([61.120.150.78]) by smtp.gmail.com with ESMTPSA id i128-20020a636d86000000b0041a4df3d3e2sm11591867pgc.68.2022.07.27.02.37.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Jul 2022 02:37:31 -0700 (PDT) Message-ID: Date: Wed, 27 Jul 2022 17:37:23 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.0.3 Subject: Re: [PATCH v3] PCI/ERR: Use pcie_aer_is_native() to judge whether OS owns AER Content-Language: en-US From: Zhuo Chen To: Sathyanarayanan Kuppuswamy Cc: ruscur@russell.cc, oohall@gmail.com, bhelgaas@google.com, lukas@wunner.de, jan.kiszka@siemens.com, stuart.w.hayes@gmail.com, linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, chenzhuo.1@bytedance.com References: <20220727035334.9997-1-chenzhuo.1@bytedance.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On 7/26/22 1:35 PM, Zhuo Chen wrote: > > On 7/26/22 9:02 PM, Sathyanarayanan Kuppuswamy wrote: >> >> >> On 7/26/22 8:53 PM, Zhuo Chen wrote: >>> Use pcie_aer_is_native() in place of "host->native_aer || >>> pcie_ports_native" to judge whether OS has native control of AER >>> in pcie_do_recovery(). >>> >>> Replace "dev->aer_cap && (pcie_ports_native || host->native_aer)" in >>> get_port_device_capability() with pcie_aer_is_native(), which has no >>> functional changes. >>> >>> Signed-off-by: Zhuo Chen >>> --- >> >> Patch looks better now. It looks like following two changes >> can also be replaced with pcie_aer_is_native() check. >> >> drivers/pci/pcie/aer.c:1407:    if ((host->native_aer || >> pcie_ports_native) && aer) { >> drivers/pci/pcie/aer.c:1426:    if ((host->native_aer || >> pcie_ports_native) && aer) { > > Good advice. But I wonder is there a scenario that dev->rcec ("root") is > NULL meanwhile dev->aer_cap is not NULL? If so, replace > "(host->native_aer || pcie_ports_native) && aer" with > pcie_aer_is_native() will change original function. > Do you mean changing "if ((host->native_aer || pcie_ports_native) && aer)" into "if (pcie_aer_is_native(dev) && aer)" ? I thought changing into "if (pcie_aer_is_native(dev))" before. One another doubt. Not every pci device support aer. When dev->aer_cap is NULL and root->aer_cap is not NULL in aer_root_reset(), pcie_aer_is_native() will return false and OS cannot operate root register. It's different from just using "(host->native_aer || pcie_ports_native)". Or we can change "if ((host->native_aer || pcie_ports_native) && aer)" into "if (pcie_aer_is_native(root))". But in this way, argument NULL pointer check should be added in pcie_aer_is_native(). >> >> >> >>> Changelog: >>> v3: >>> - Simplify why we use pcie_aer_is_native(). >>> - Revert modification of pci_aer_clear_nonfatal_status() and comments. >>> v2: >>> - Add details and note in commit log. >>> --- >>>   drivers/pci/pcie/err.c          | 3 +-- >>>   drivers/pci/pcie/portdrv_core.c | 3 +-- >>>   2 files changed, 2 insertions(+), 4 deletions(-) >>> >>> diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c >>> index 0c5a143025af..121a53338e44 100644 >>> --- a/drivers/pci/pcie/err.c >>> +++ b/drivers/pci/pcie/err.c >>> @@ -184,7 +184,6 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev >>> *dev, >>>       int type = pci_pcie_type(dev); >>>       struct pci_dev *bridge; >>>       pci_ers_result_t status = PCI_ERS_RESULT_CAN_RECOVER; >>> -    struct pci_host_bridge *host = pci_find_host_bridge(dev->bus); >>>       /* >>>        * If the error was detected by a Root Port, Downstream Port, >>> RCEC, >>> @@ -243,7 +242,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev >>> *dev, >>>        * it is responsible for clearing this status.  In that case, the >>>        * signaling device may not even be visible to the OS. >>>        */ >>> -    if (host->native_aer || pcie_ports_native) { >>> +    if (pcie_aer_is_native(dev)) { >>>           pcie_clear_device_status(dev); >>>           pci_aer_clear_nonfatal_status(dev); >>>       } >>> diff --git a/drivers/pci/pcie/portdrv_core.c >>> b/drivers/pci/pcie/portdrv_core.c >>> index 604feeb84ee4..98c18f4a01b2 100644 >>> --- a/drivers/pci/pcie/portdrv_core.c >>> +++ b/drivers/pci/pcie/portdrv_core.c >>> @@ -221,8 +221,7 @@ static int get_port_device_capability(struct >>> pci_dev *dev) >>>       } >>>   #ifdef CONFIG_PCIEAER >>> -    if (dev->aer_cap && pci_aer_available() && >>> -        (pcie_ports_native || host->native_aer)) { >>> +    if (pcie_aer_is_native(dev) && pci_aer_available()) { >>>           services |= PCIE_PORT_SERVICE_AER; >>>           /* >> > > Thanks, > Zhuo Chen -- Thanks, Zhuo Chen