From patchwork Mon Jun 15 07:32:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saheed O. Bolarinwa" X-Patchwork-Id: 1309334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=iAth882o; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ll1y0svfz9sRh for ; Mon, 15 Jun 2020 18:32:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728570AbgFOIcR (ORCPT ); Mon, 15 Jun 2020 04:32:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728162AbgFOIcN (ORCPT ); Mon, 15 Jun 2020 04:32:13 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41F75C061A0E; Mon, 15 Jun 2020 01:32:13 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id c3so16090319wru.12; Mon, 15 Jun 2020 01:32:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LhYq3ErTARnN8M2y3YfDyaUAiF9DdChbWeaq0FOKRSE=; b=iAth882ot48k+1hVxs2N7dKisLYLFY15sfEjKljaix/MP7NhyZkJnNqvQIQdA/RFHN xoasva4/H9ZHoHRiTydzkdZfExNxJrgbe4KXfoIiPl+5y7jGS4fxWHtd3pdsDayb1NVk phF1qbUyyV7Cv1Wa9Taqnjee2Un2UqqOnXyieCToPVOxYJgESkzIuHyTyXLZBsi//ZPJ etNN5douj8ntVKOi9ac6mOTUSz8cpJH7JQCErUoIxMi1Vaq1io+Il8Up5OkPHweBWcck Hg6EehHHD8Gq377nepRnWrXzLjE1ireVXu3V1RWbHdTWShK3adK6VVBeaDuhnPJz3V/a mhdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LhYq3ErTARnN8M2y3YfDyaUAiF9DdChbWeaq0FOKRSE=; b=sirZBdp5upWY7EFS92Tn92ZH42VMlQ+q0rd5h4rO8C45+8ZaGI+P+KlU2ZNLeiqKoS mK9qkszVduIYATlN0d+c5bsAeZEOtmCq1wB16r2Z+2RskfkygstFQtd3SdwEiC3sqvJd RCuu/KyUCJwa8OARd1Fpri5WrXP9qItITEhwbz9yaRoNGeZ+ANfIKrrCI4mxxNee6+wT eg2BgEV9W+vRDZqoKjZIq8d8yNz2yAdXQrSo6VlctaMWs3xCSk4Yqt9lXxHXuttQvl7F CyMOhtksxtEJZFVAjiLOSVoYUNUcldsCIBd3QfKFD6/dIu7WBwT03ekJKNlJhzgoE6eK kL9Q== X-Gm-Message-State: AOAM533WHtOldtZ8r2T4g0NUSoALed90EPVMEvlGcYMwRobHuG4bx7iZ g4eP0ybq/OrkSoCLqqDM+is= X-Google-Smtp-Source: ABdhPJyVpcmhLb92L22CTkhQXirzPyFYPKxH7q0JUBoAhTgmjAwOEGO/IzLwbRaAtJ7n5HAteFfw7g== X-Received: by 2002:adf:f205:: with SMTP id p5mr29480211wro.302.1592209931903; Mon, 15 Jun 2020 01:32:11 -0700 (PDT) Received: from net.saheed (54006BB0.dsl.pool.telekom.hu. [84.0.107.176]) by smtp.gmail.com with ESMTPSA id z206sm21954745wmg.30.2020.06.15.01.32.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 01:32:11 -0700 (PDT) From: refactormyself@gmail.com To: helgaas@kernel.org Cc: Bolarinwa Olayemi Saheed , bjorn@helgaas.com, linux-pci@vger.kernel.org, skhan@linuxfoundation.org, Vinod Koul , dmaengine@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/8] dmaengine: ioatdma: Convert PCIBIOS_* errors to generic -E* errors Date: Mon, 15 Jun 2020 09:32:18 +0200 Message-Id: <20200615073225.24061-2-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com> References: <20200615073225.24061-1-refactormyself@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bolarinwa Olayemi Saheed ioat3_dma_probe() returns PCIBIOS_ error codes from PCIe capability accessors. PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure. Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values. Suggested-by: Bjorn Helgaas Signed-off-by: Bolarinwa Olayemi Saheed --- drivers/dma/ioat/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c index 60e9afbb896c..fc8889c2a88f 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c @@ -1195,13 +1195,13 @@ static int ioat3_dma_probe(struct ioatdma_device *ioat_dma, int dca) /* disable relaxed ordering */ err = pcie_capability_read_word(pdev, IOAT_DEVCTRL_OFFSET, &val16); if (err) - return err; + return pcibios_err_to_errno(err); /* clear relaxed ordering enable */ val16 &= ~IOAT_DEVCTRL_ROE; err = pcie_capability_write_word(pdev, IOAT_DEVCTRL_OFFSET, val16); if (err) - return err; + return pcibios_err_to_errno(err); if (ioat_dma->cap & IOAT_CAP_DPS) writeb(ioat_pending_level + 1, From patchwork Mon Jun 15 07:32:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saheed O. Bolarinwa" X-Patchwork-Id: 1309336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=RAHhr86L; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ll220Qh2z9sRN for ; Mon, 15 Jun 2020 18:32:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728825AbgFOIcY (ORCPT ); Mon, 15 Jun 2020 04:32:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728162AbgFOIcX (ORCPT ); Mon, 15 Jun 2020 04:32:23 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9AEEC061A0E; Mon, 15 Jun 2020 01:32:22 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id e1so16157333wrt.5; Mon, 15 Jun 2020 01:32:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=E7c3us/Xdo7gpPBkK7+mW2slrEL0thvCYN6BbFEa5oU=; b=RAHhr86L5TxO7qa82JTPVxEl0mGBrpvxFjlmM+EiQBZhgH8Nw+TSXs48wV3k2C82Hh BczCJeydJaFzprQ/NO832n8R5X8noWsFYYXOzXlZ84QG/GqRYDEjiNT7QQ6FUq5FHWsV HtDu0Vioe3hbYRYGV59vkpy83ObtztOEPSk3z5f6OJjW+UJS/v4ukLWGsMKO2drC7afQ cVCG7WZPaeJ6p9V4NJ2xZiHwzaCkGt9C5EZu1PWjn4mZWeOP+wYD+BFoMFkt0FWIG0TT bkN8+cgiXoLZaG+KLmISc0zVjoAs14x8B9AKHJgTwj/sj38ohGe6QyuU4z9Ugx3Qtvy3 Lo8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=E7c3us/Xdo7gpPBkK7+mW2slrEL0thvCYN6BbFEa5oU=; b=byHb+p2Ae/9CLZPz9pn+MUPfyhhMVRrXltbWSF9ZJvZYYP2YP7y30oFMPBCXCZ33W1 stk8PKYQwxMXWNBoYIwKhqmBR6LvsI3Z3NLcvNOukCBxt+jOJ/OCOXT7hxFRGBda3QEB V6Ba3lCgCizfv5wZ3TFZNNtKrr0845pm7dBw7CIiGNx2gA0ZrRUjL9SElsEggFBocnED 0qYCjyL+btdUoHhZ4+UO0IX/oFz81eb0NbsDSA91mRO0KmXfnIAaDnwLVNOk1JC9EPq+ xDvBtN39Gq+Rkn54QyixzhuSoLo1pyX43iECM6vWxeGFE85EKDlOWM7gFdekY/HG3G0p Ec6g== X-Gm-Message-State: AOAM531AYvbEuYDFBqUBB1E8R126CXhl630TuKvY9hn6hkbafK4t/7vH o4Zaakzp+o7KZFkp6D96leE= X-Google-Smtp-Source: ABdhPJyC/eAZEu3qZ+O+V+6SdJaepuhbRuoOUAqjH0NTA1yqfiGMIBoQbTQ/8Q8bouEQaYl+z8yCpw== X-Received: by 2002:a5d:4f81:: with SMTP id d1mr29018002wru.95.1592209941717; Mon, 15 Jun 2020 01:32:21 -0700 (PDT) Received: from net.saheed (54006BB0.dsl.pool.telekom.hu. [84.0.107.176]) by smtp.gmail.com with ESMTPSA id z206sm21954745wmg.30.2020.06.15.01.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 01:32:21 -0700 (PDT) From: refactormyself@gmail.com To: helgaas@kernel.org Cc: Bolarinwa Olayemi Saheed , bjorn@helgaas.com, linux-pci@vger.kernel.org, skhan@linuxfoundation.org, Mike Marciniszyn , Dennis Dalessandro , Doug Ledford , Jason Gunthorpe , linux-rdma@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/8] IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors Date: Mon, 15 Jun 2020 09:32:19 +0200 Message-Id: <20200615073225.24061-3-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com> References: <20200615073225.24061-1-refactormyself@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bolarinwa Olayemi Saheed pcie_speeds() returns PCIBIOS_ error codes from PCIe capability accessors. PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure. Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values. Suggested-by: Bjorn Helgaas Signed-off-by: Bolarinwa Olayemi Saheed Reviewed-by: Dennis Dalessandro --- drivers/infiniband/hw/hfi1/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c index 1a6268d61977..eb53781d0c6a 100644 --- a/drivers/infiniband/hw/hfi1/pcie.c +++ b/drivers/infiniband/hw/hfi1/pcie.c @@ -306,7 +306,7 @@ int pcie_speeds(struct hfi1_devdata *dd) ret = pcie_capability_read_dword(dd->pcidev, PCI_EXP_LNKCAP, &linkcap); if (ret) { dd_dev_err(dd, "Unable to read from PCI config\n"); - return ret; + return pcibios_err_to_errno(ret); } if ((linkcap & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_8_0GB) { From patchwork Mon Jun 15 07:32:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saheed O. Bolarinwa" X-Patchwork-Id: 1309337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=aWZbMGLU; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ll27036cz9sRf for ; Mon, 15 Jun 2020 18:32:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729124AbgFOIc1 (ORCPT ); Mon, 15 Jun 2020 04:32:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729120AbgFOIc0 (ORCPT ); Mon, 15 Jun 2020 04:32:26 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 408AAC061A0E; Mon, 15 Jun 2020 01:32:26 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id l10so16111718wrr.10; Mon, 15 Jun 2020 01:32:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d3aQ/PgWjHRbwdP69pQYwDMstdmD8+pp4wlXRjxHodA=; b=aWZbMGLUyNSKzVZstBGG6z7eZvsz5piuZ/f5umAvnUxKhZ6nIDYzliFDXW/+/OTPeI 2M3ceHFBb6iwy4Sy6pX/0g9ulNbfXBurcKzZnP2EzOdN1Dn/M0gl05Jwr4kfI3J+2N2k deCpdOEVmzl1DNjiIVxxMtdJ/kW+mTuwyMAV4FOueKp6VcLLqdPksLhluyTT/s+/LZsw kIRVCtVMPiyev+RINHxAAsDQn19VURIjwvOTVHxJDIEqGWHjIWUAMFigBMy37F7RtNHO jWhOzopPPl5yj/BSsC+uj1YQCvrEpgc9GztXPO4j48eCM5ZGmcxcUVtCZgmu6y4QQZd2 eIdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=d3aQ/PgWjHRbwdP69pQYwDMstdmD8+pp4wlXRjxHodA=; b=icuYWSnmJI5MhiCLUPk2ZYMJpdXQLBS+iWb/w/iuJrv/BSOqyShEK5q4LTuS6cpftl KYXr3J/J2+guEnOxl7UIzDB9TfX7xOREmgxM6XPBg1haa4cLu/nPxm/Zucbyw5VJi0W3 XK8UfY7M6Z29Qx0GZ/P2+txOA3QV5MHivxPM8js544TtJ5IzBl5mMuYHCIA/kJPU7ohC 4Lk3jTLFDh7GAOi/O7OV3B4Qoddc0hdMCisvnsbxbQhnPm6wEtWhdw7GeNtqZz0921Nt +HLADuo4cdk2XGHoEheIfNgeCZg7eR5l/hBslLlu869JAgFmpz3MyVpXMSFIFosiL6N7 Le1g== X-Gm-Message-State: AOAM532L8M/62CQNn+Ja1ua1OnSEuM0Jz8tGnhzZxMyeINftUByilZMK ADcy7TiGlsCtSBOoFfxqbrY= X-Google-Smtp-Source: ABdhPJw3IaYVJt7P8aT+wywoWLCu1BN+hwGNrjLmTa8ClloFJ7Il32qviKwMUw1SM4b7jQFKmJZSzw== X-Received: by 2002:adf:fec3:: with SMTP id q3mr27238053wrs.123.1592209945027; Mon, 15 Jun 2020 01:32:25 -0700 (PDT) Received: from net.saheed (54006BB0.dsl.pool.telekom.hu. [84.0.107.176]) by smtp.gmail.com with ESMTPSA id z206sm21954745wmg.30.2020.06.15.01.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 01:32:24 -0700 (PDT) From: refactormyself@gmail.com To: helgaas@kernel.org Cc: Bolarinwa Olayemi Saheed , bjorn@helgaas.com, linux-pci@vger.kernel.org, skhan@linuxfoundation.org, Mike Marciniszyn , Dennis Dalessandro , Doug Ledford , Jason Gunthorpe , linux-rdma@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/8] IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors Date: Mon, 15 Jun 2020 09:32:20 +0200 Message-Id: <20200615073225.24061-4-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com> References: <20200615073225.24061-1-refactormyself@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bolarinwa Olayemi Saheed restore_pci_variables() and save_pci_variables() return PCIBIOS_ error codes from PCIe capability accessors. PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure. Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values. Fix redundant initialisation. Suggested-by: Bjorn Helgaas Signed-off-by: Bolarinwa Olayemi Saheed Reviewed-by: Dennis Dalessandro --- drivers/infiniband/hw/hfi1/pcie.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c index 1a6268d61977..2a45f34ac6c8 100644 --- a/drivers/infiniband/hw/hfi1/pcie.c +++ b/drivers/infiniband/hw/hfi1/pcie.c @@ -334,10 +334,14 @@ int pcie_speeds(struct hfi1_devdata *dd) return 0; } -/* restore command and BARs after a reset has wiped them out */ +/** + * Restore command and BARs after a reset has wiped them out + * + * Returns 0 on success, otherwise a negative error value + */ int restore_pci_variables(struct hfi1_devdata *dd) { - int ret = 0; + int ret; ret = pci_write_config_word(dd->pcidev, PCI_COMMAND, dd->pci_command); if (ret) @@ -386,13 +390,17 @@ int restore_pci_variables(struct hfi1_devdata *dd) error: dd_dev_err(dd, "Unable to write to PCI config\n"); - return ret; + return pcibios_err_to_errno(ret); } -/* Save BARs and command to rewrite after device reset */ +/** + * Save BARs and command to rewrite after device reset + * + * Returns 0 on success, otherwise a negative error value + */ int save_pci_variables(struct hfi1_devdata *dd) { - int ret = 0; + int ret; ret = pci_read_config_dword(dd->pcidev, PCI_BASE_ADDRESS_0, &dd->pcibar0); @@ -441,7 +449,7 @@ int save_pci_variables(struct hfi1_devdata *dd) error: dd_dev_err(dd, "Unable to read from PCI config\n"); - return ret; + return pcibios_err_to_errno(ret); } /* From patchwork Mon Jun 15 07:32:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saheed O. Bolarinwa" X-Patchwork-Id: 1309338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mZllkfQG; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ll2G4tZtz9sRN for ; Mon, 15 Jun 2020 18:32:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729137AbgFOIcd (ORCPT ); Mon, 15 Jun 2020 04:32:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729120AbgFOIcc (ORCPT ); Mon, 15 Jun 2020 04:32:32 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C36A1C061A0E; Mon, 15 Jun 2020 01:32:31 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id x13so16134917wrv.4; Mon, 15 Jun 2020 01:32:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M/dNY835TBbenopXfANftVUfONbLdxGaDwu4O0ya0Io=; b=mZllkfQGCwng8pRlqCnDf1668UeZ3bMTYHMKIP1Ey/wcpSqEZsDsvc7IQuOWTiZx7F 6AEeHI7shVdh/ZBeG6h76mJYyVZ7gQofX0LMdP/CHdTAYElLgnEZIzWPXqn6HpvsiHep yKHDK91VHXk/xk0deKCtGYxo1eB+z5rnWqAswblhV6RXclciYmvA7gmjvL+IBaNdWKJD 0UyCoDhbM29Vz3Rnu0G4+KppoCb63hhPn4SJe2yTCG7cvX5AMHEJNXZUu8L2LZIdsuK0 srsTKxYCBTms6qEOeWBK7ogXPJPekbNkgs+YGmZYJOHYo8daqDqHq1VodYYjvgWmDIeD QpbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M/dNY835TBbenopXfANftVUfONbLdxGaDwu4O0ya0Io=; b=DJl+2BuPqgsOXoPP8XxFPqcOw1voXKP4Uh8FwFojeNZMBCovdjaVgGjupMUDgI0Ei1 TLHYpuck7wpWMeGTshyuyeppP1NbkaOOBTPC4ufX26OJpGLsMgBoNVYJPEcNpG5LjnYC XqRW0vpepAbrAaTa1gvrzG0EytE/ci5T84eFmObgcRH+M5sre8v92AeyEJkgY5frElyO Ce6KZ1Cluq9sr/yPzi65tCeGapfqmpDogiV+zhrLHgn5SMrifueCD4O5CDEPNb0Gpgym bi8GsMKgm0/29CDqfzeGFFlUcNAu1lTbJPhHnAQo/qlGrMWGI/OExLoJaVTTm5Y1Alxk FsUQ== X-Gm-Message-State: AOAM53122FJ1BK9Brq+hN/6LAk86x9F9xsXPu8RXf7NSKb25twNHtqCZ vgie9mwfj675ILHF2v/9bcA= X-Google-Smtp-Source: ABdhPJz4V9C1ENgGVqIPkvgCoJkdJ+A5hU166ZOZGB29u4rYCMNZZqZpD7b2MruwA13RR6eraLoO8Q== X-Received: by 2002:a05:6000:90:: with SMTP id m16mr28561490wrx.191.1592209950561; Mon, 15 Jun 2020 01:32:30 -0700 (PDT) Received: from net.saheed (54006BB0.dsl.pool.telekom.hu. [84.0.107.176]) by smtp.gmail.com with ESMTPSA id z206sm21954745wmg.30.2020.06.15.01.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 01:32:29 -0700 (PDT) From: refactormyself@gmail.com To: helgaas@kernel.org Cc: Bolarinwa Olayemi Saheed , bjorn@helgaas.com, linux-pci@vger.kernel.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/8] PCI: Convert PCIBIOS_* errors to generic -E* errors Date: Mon, 15 Jun 2020 09:32:21 +0200 Message-Id: <20200615073225.24061-5-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com> References: <20200615073225.24061-1-refactormyself@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bolarinwa Olayemi Saheed Both pcie_set_readrq() and pcie_set_readrq() return PCIBIOS_ error codes which were passed down the call heirarchy from PCIe capability accessors. PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure. Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values. Suggested-by: Bjorn Helgaas Signed-off-by: Bolarinwa Olayemi Saheed --- drivers/pci/pci.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 595fcf59843f..fa49e5f9e4d1 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5698,6 +5698,7 @@ EXPORT_SYMBOL(pcie_get_readrq); int pcie_set_readrq(struct pci_dev *dev, int rq) { u16 v; + int ret; if (rq < 128 || rq > 4096 || !is_power_of_2(rq)) return -EINVAL; @@ -5716,8 +5717,10 @@ int pcie_set_readrq(struct pci_dev *dev, int rq) v = (ffs(rq) - 8) << 12; - return pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL, + ret = pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_READRQ, v); + + return pcibios_err_to_errno(ret); } EXPORT_SYMBOL(pcie_set_readrq); @@ -5748,6 +5751,7 @@ EXPORT_SYMBOL(pcie_get_mps); int pcie_set_mps(struct pci_dev *dev, int mps) { u16 v; + int ret; if (mps < 128 || mps > 4096 || !is_power_of_2(mps)) return -EINVAL; @@ -5757,8 +5761,10 @@ int pcie_set_mps(struct pci_dev *dev, int mps) return -EINVAL; v <<= 5; - return pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL, + ret = pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_PAYLOAD, v); + + return pcibios_err_to_errno(ret); } EXPORT_SYMBOL(pcie_set_mps); From patchwork Mon Jun 15 07:32:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saheed O. Bolarinwa" X-Patchwork-Id: 1309339 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mcFzzO7P; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ll2M4FFXz9sRN for ; Mon, 15 Jun 2020 18:32:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729139AbgFOIcm (ORCPT ); Mon, 15 Jun 2020 04:32:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729120AbgFOIcl (ORCPT ); Mon, 15 Jun 2020 04:32:41 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A19CC061A0E; Mon, 15 Jun 2020 01:32:41 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id u26so13549304wmn.1; Mon, 15 Jun 2020 01:32:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=molslPGG/aVq7Tfl0f7ZnD8L5065Z3YOyyGkcmzBtPg=; b=mcFzzO7Pllm4E56KkbBug35zu55xy4h9QMjx4nGIEedTIsThHAkIZxHdXpzMw25o/x gmU8d7ik0iCbkoGpssPVodzU2ZARBf/zwQANvWVcZAYRaA5FuNqYlqCoLRVsudaSVRP8 y9IhiJFF/IeT6/0QgacbophbcKVLQigsSZZWBac/JmDGEhX+367nM36EVtRPwGrc08Qw hf/ya4oLDiXmDv9aNX24WLVi+e1eNkp+jJ/KosE87xKBSIVWF3t8LEDZTJhOwcI0SK5z y2koNtgG18IDcfHGZdsi+UPJT1GCUdq+3eAwkv5FANQRY7UQxx1lJzl5pr0xbYau3Z2f xQNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=molslPGG/aVq7Tfl0f7ZnD8L5065Z3YOyyGkcmzBtPg=; b=GZo1jq8+toD8VHVVx4vyL+JBYYjzhpKXJk1OAaqRFSecg9k+EJL/wnjnzOqqUCSft6 b3+xl1v/yCtVsyguK9+QGkKseKfCgDwWwqZ5g60KHsai74rmRy12rRH2CFn+OaKvZB0s Hdzmzp/s/9GGxa3o9Ff3evD4HvJFzmyClRBNVQspPoe0LMTGpXfTzH5XrH2Jk6GLeJ+e oIrg27RMmtpAJyPdGxyFWL9dyj7gQb2d+5QyKK1mUokvaALWonlmt76ozy/bkS9BOk5P UW3JhW7Hta9geHuEy7U1ofsW7oETkboHIKrPkzJoWervZHL64KzXhXwZDQxEoFCLC3lb AUWA== X-Gm-Message-State: AOAM533fH3wvx/sO7J8SrFZ4WgwxYopd400qi8wOTTc0vWG3N94o/Rg6 nwXPsVKMHD6jTpGDS7nTdFo= X-Google-Smtp-Source: ABdhPJxFI+cJIQtaQrIgx1Ql/SDePLvWciNxuTw06tHHD+aaiAagUpk2mRdOa+0wrERqwjqlFRpn8w== X-Received: by 2002:a7b:c186:: with SMTP id y6mr12602543wmi.82.1592209960130; Mon, 15 Jun 2020 01:32:40 -0700 (PDT) Received: from net.saheed (54006BB0.dsl.pool.telekom.hu. [84.0.107.176]) by smtp.gmail.com with ESMTPSA id z206sm21954745wmg.30.2020.06.15.01.32.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 01:32:39 -0700 (PDT) From: refactormyself@gmail.com To: helgaas@kernel.org Cc: Bolarinwa Olayemi Saheed , bjorn@helgaas.com, linux-pci@vger.kernel.org, skhan@linuxfoundation.org, Don Brace , "James E.J. Bottomley" , "Martin K. Petersen" , esc.storagedev@microsemi.com, linux-scsi@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/8] scsi: smartpqi: Convert PCIBIOS_* errors to generic -E* errors Date: Mon, 15 Jun 2020 09:32:22 +0200 Message-Id: <20200615073225.24061-6-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com> References: <20200615073225.24061-1-refactormyself@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bolarinwa Olayemi Saheed pqi_set_pcie_completion_timeout() return PCIBIOS_ error codes which were passed on down the call heirarchy from PCIe capability accessors. PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure. Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values. Suggested-by: Bjorn Helgaas Signed-off-by: Bolarinwa Olayemi Saheed --- drivers/scsi/smartpqi/smartpqi_init.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index cd157f11eb22..bd38c8cea56e 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -7423,8 +7423,12 @@ static int pqi_ctrl_init_resume(struct pqi_ctrl_info *ctrl_info) static inline int pqi_set_pcie_completion_timeout(struct pci_dev *pci_dev, u16 timeout) { - return pcie_capability_clear_and_set_word(pci_dev, PCI_EXP_DEVCTL2, + int rc; + + rc = pcie_capability_clear_and_set_word(pci_dev, PCI_EXP_DEVCTL2, PCI_EXP_DEVCTL2_COMP_TIMEOUT, timeout); + + return pcibios_err_to_errno(rc); } static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info) From patchwork Mon Jun 15 07:32:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saheed O. Bolarinwa" X-Patchwork-Id: 1309340 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=LROVgM3U; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ll2S28bXz9sRf for ; Mon, 15 Jun 2020 18:32:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729166AbgFOIcp (ORCPT ); Mon, 15 Jun 2020 04:32:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729158AbgFOIcn (ORCPT ); Mon, 15 Jun 2020 04:32:43 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6324C061A0E; Mon, 15 Jun 2020 01:32:42 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id l17so13725481wmj.0; Mon, 15 Jun 2020 01:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LITx0hRUIi2s0zyE1t9RreKX12TROzF0jbPsYEw7a6g=; b=LROVgM3UbJsunBVTDQc6YnuCBFFfAkZvrZXlxcwnUE8Y5GVCb7hTTl/WDNhOZy+6Xu EaGowoNKFFiyujkvYmfaAGxdQPKziOwvy+LQzF3eBQb9l96HzHbmpfaVgHHnPADSWE2H I6Cet/NvMy8f/JfrVkwqIR5JbuOgl4gJBb48gK/f/Tgn/4rImbWs36a2vJtRYiuQ5S4C hj9jr1We9pK/qchTQGJYh/Y7VJKlyohhmh3H1wobfz8Pa80zCSQppsxmZdoatZCQSPMX 1HLURZqPWoo+gKsZ6+ptU30rJmOO6mBKLhB7E8fSt7K5HOMQ+cddKgmHu8dtWVYLduFz 3x5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LITx0hRUIi2s0zyE1t9RreKX12TROzF0jbPsYEw7a6g=; b=SCDnVygK4+H0ycjzcuEbQ+JUbUNsBi8PucWPYgYTbk1JBLqNTIXwB5/bR95FZLpvXA JDlOG2HFX1L1JODtdndnYI1+IgRVVH1gql645+NXUbuOWyWKhWwswr8sDH9UNORB5BYJ 0oHlbATS2TwkETfyBTZmRN3lkg0SjtJPiak76r0Kmy3noMdoA7NyHYt8QVAjgWmw9dKK RsevCVyPfxVRLggmD+IEGbOn9AU7CP6l48M7WUH7EEZckpWdb5C43OG+KIRERlevOIb2 4iPKQt/0GN3+aRT6K0nJp2RStzeL6GUXhSzvVX10wL/lnABLWLDmBIU680O9thaxp9ps SoDg== X-Gm-Message-State: AOAM532mYYM3zQP/7J9koXZuH7Cu8odRPOOFJfciF3SHdl+SwZpwuty9 UfESXpxgxPombrT0/h5xXlY= X-Google-Smtp-Source: ABdhPJw04FZmglvBQAYa1v3ByqfYKXiOGDZXpDs1UTQSt8C8BmZt7jyni4XR4+j0NGd7DZy+4KCTMw== X-Received: by 2002:a1c:678a:: with SMTP id b132mr11656022wmc.122.1592209961579; Mon, 15 Jun 2020 01:32:41 -0700 (PDT) Received: from net.saheed (54006BB0.dsl.pool.telekom.hu. [84.0.107.176]) by smtp.gmail.com with ESMTPSA id z206sm21954745wmg.30.2020.06.15.01.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 01:32:41 -0700 (PDT) From: refactormyself@gmail.com To: helgaas@kernel.org Cc: Bolarinwa Olayemi Saheed , bjorn@helgaas.com, linux-pci@vger.kernel.org, skhan@linuxfoundation.org, Russell Currey , Sam Bobroff , "Oliver O'Halloran" , linuxppc-dev@lists.ozlabs.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/8] PCI/AER: Convert PCIBIOS_* errors to generic -E* errors Date: Mon, 15 Jun 2020 09:32:23 +0200 Message-Id: <20200615073225.24061-7-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com> References: <20200615073225.24061-1-refactormyself@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bolarinwa Olayemi Saheed pci_enable_pcie_error_reporting() return PCIBIOS_ error codes which were passed on down the call heirarchy from PCIe capability accessors. PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure. Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values. Suggested-by: Bjorn Helgaas Signed-off-by: Bolarinwa Olayemi Saheed --- drivers/pci/pcie/aer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index f4274d301235..95d480a52078 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -349,13 +349,17 @@ bool aer_acpi_firmware_first(void) int pci_enable_pcie_error_reporting(struct pci_dev *dev) { + int rc; + if (pcie_aer_get_firmware_first(dev)) return -EIO; if (!dev->aer_cap) return -EIO; - return pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_AER_FLAGS); + rc = pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_AER_FLAGS); + + return pcibios_err_to_errno(rc); } EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting); From patchwork Mon Jun 15 07:32:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saheed O. Bolarinwa" X-Patchwork-Id: 1309341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=GmX+599K; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ll2d6Lkzz9sT6 for ; Mon, 15 Jun 2020 18:32:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729178AbgFOIcu (ORCPT ); Mon, 15 Jun 2020 04:32:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729031AbgFOIcp (ORCPT ); Mon, 15 Jun 2020 04:32:45 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35817C061A0E; Mon, 15 Jun 2020 01:32:44 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id o8so4266515wmh.4; Mon, 15 Jun 2020 01:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XDfq5bojR6b05CC1Lwj10IkyAFKBu8BIbutGTPyHRj0=; b=GmX+599KgK3+4CQD4ut6Unl0dQe37gJnaQMa7HXIKFLnkM36mjZce93Qnal55lQXme DPXNferZ2/2tadOcdmNTCDJ2fFb4JhxDbYnUVRlKL8lwVO9L5c+u+5XKNcLMEK6tfIt0 QkCoHNi2Owqh2Z1Eob2bkqXIlxe1ufktC98YZwFTXudBA47isWtl0Umv8NBacCLFgSHp h8YK5ujbYfa1WKMnCT6t/nA3KdDJ/IpwmYI7Hh4ey8SWAv890eL1ce7gENW5nY6Ca9Aq bk3N+kQixJyXij2ldZTm51qFtu5ZtspA8ZS3OfDfwFsBNfO4puqm94RtgR+RhP996L+4 ehhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XDfq5bojR6b05CC1Lwj10IkyAFKBu8BIbutGTPyHRj0=; b=iC+yTTzhATE0b9p7/zNxswf6q6rK0vKY/SRTaLV4u0Ztk3aMXqaCvunp45/BDy4FaY Z+h1w4tPnqKNMLioIjeggylQL8KDm7UmhL/DpTjV+ZedKqCskv2WsaPXSxzBSe4/oAUF nt/1H0I/HioUuUkpcE7Pd1PmxegjhC89sST+Srh0lK5baM9GGnyAy68Gmr5BvcB+nUz9 X2c5bndPmp9l0Xncyxfs9wDDmtJS0HGzKU6H6IuidnDxuxkZAsTc8x8j7RXHhmklr3y7 ds3+WqBfCi0SYY8L6JAmun6C4LrCKwzr6UuBGMZ+0Jaa7Jo/RoOnw9U9gL8XzQzh3nw3 v2Qw== X-Gm-Message-State: AOAM533zw9mZD22b2AiwQKzoaCIv1ARQHxfTUFMU/TAnxOZL7um5Xs40 Qll3m44HCfoMYkFz9pMoSHU= X-Google-Smtp-Source: ABdhPJzbGIfVEFGGh/6f5AcJQG40GJvG1GbBmlTLY3eBcSJ95HGy+b4zQLrPxNrp05rwJL+y2MMAeg== X-Received: by 2002:a1c:dc44:: with SMTP id t65mr12783227wmg.128.1592209962974; Mon, 15 Jun 2020 01:32:42 -0700 (PDT) Received: from net.saheed (54006BB0.dsl.pool.telekom.hu. [84.0.107.176]) by smtp.gmail.com with ESMTPSA id z206sm21954745wmg.30.2020.06.15.01.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 01:32:42 -0700 (PDT) From: refactormyself@gmail.com To: helgaas@kernel.org Cc: Bolarinwa Olayemi Saheed , bjorn@helgaas.com, linux-pci@vger.kernel.org, skhan@linuxfoundation.org, Russell Currey , Sam Bobroff , "Oliver O'Halloran" , linuxppc-dev@lists.ozlabs.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/8] PCI/AER: Convert PCIBIOS_* errors to generic -E* errors Date: Mon, 15 Jun 2020 09:32:24 +0200 Message-Id: <20200615073225.24061-8-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com> References: <20200615073225.24061-1-refactormyself@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bolarinwa Olayemi Saheed pci_disable_pcie_error_reporting() returns PCIBIOS_ error code which were passed down the call heirarchy from PCIe capability accessors. PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure. Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative error values. Suggested-by: Bjorn Helgaas Signed-off-by: Bolarinwa Olayemi Saheed --- drivers/pci/pcie/aer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 95d480a52078..53e2ecb64c72 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -365,11 +365,15 @@ EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting); int pci_disable_pcie_error_reporting(struct pci_dev *dev) { + int rc; + if (pcie_aer_get_firmware_first(dev)) return -EIO; - return pcie_capability_clear_word(dev, PCI_EXP_DEVCTL, + rc = pcie_capability_clear_word(dev, PCI_EXP_DEVCTL, PCI_EXP_AER_FLAGS); + + return pcibios_err_to_errno(rc); } EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting); From patchwork Mon Jun 15 07:32:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saheed O. Bolarinwa" X-Patchwork-Id: 1309342 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=W/ldJLhC; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ll2f3n5Kz9sRh for ; Mon, 15 Jun 2020 18:32:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729171AbgFOIcu (ORCPT ); Mon, 15 Jun 2020 04:32:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728773AbgFOIcp (ORCPT ); Mon, 15 Jun 2020 04:32:45 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E687C05BD43; Mon, 15 Jun 2020 01:32:45 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id o8so4266571wmh.4; Mon, 15 Jun 2020 01:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5N7OiTkpW2bbIsUq9FnRk9cirBO+6YwRec/YN067b5E=; b=W/ldJLhCdUJj5d05mtV4pK65pjgE+/YRWMSLx9Ubvv++oDnBBIL5FwSU4I1vbGgwuG S19kPYUbfK+bbLud6LxLvZOc0qwk3cInUEb4d9luu0OT5Yo1sinR3yBNWJ03r3oP/IgL e+KCcuHvL8OqUgoioVPrwkT/CMV3p9DkA+8Nd12c7OI/ntMDv0QsL8hPJnyLTTYfR0Cr ZrTtT/JhkbNzcrB4rt+M5vguZV0YJ6NManuAQmbeZHMQXLPFltrw8ilsv/t46Go6sg+Q 3mUSGrAahLu1bsuV4x8nlY8jsYO7zJtvYxSvk7PXWVqVbgKDgpUb74sxtkeaIxDqkQLH pLZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5N7OiTkpW2bbIsUq9FnRk9cirBO+6YwRec/YN067b5E=; b=i6Q5Xqbtw6L+iKokRrNMG+pvCo3/Yzr9pav1twJyWesHD0A3pz+g9ou2m1EeF5hCCV r0mFRg/eg93yi0gEwlN88jObL7b8kBA6XPYkrpjFdudkTvWj6nbT88yJ8rSIvoD80bA+ 35Vg7H2KVxxFbocUnm5lh7jC9KtaAi4A1La5qSKs4/QfKWO73T73Ly6Bx44O6NfRJORX 8tm8TQShYN6yTe8bMm4zX0EybBUeyvztdfwYlylXuXVsorKe3/qt5MNbLz06AdVPreU0 Udrh9qcVb8MflrO1xigc8OEFKB8m6G3RRl5zSreCmgeADsyfGFxSjf40LdeGrKyUHjet 6fXA== X-Gm-Message-State: AOAM531tXF/eLOmLILduEheR2JVYkVN5vMsT0ntKEt5XEMFDtzcs/rwq eC5KotDRylnsbvm6hItiSXg= X-Google-Smtp-Source: ABdhPJyDOmxsWcHptOCXrlz2DfdRs3ToWlKFmU7sWKf2RWgc6Jg6hrJsDIU8bNUTt2KgGgbCPx8bcA== X-Received: by 2002:a7b:c76a:: with SMTP id x10mr12117201wmk.16.1592209964155; Mon, 15 Jun 2020 01:32:44 -0700 (PDT) Received: from net.saheed (54006BB0.dsl.pool.telekom.hu. [84.0.107.176]) by smtp.gmail.com with ESMTPSA id z206sm21954745wmg.30.2020.06.15.01.32.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 01:32:43 -0700 (PDT) From: refactormyself@gmail.com To: helgaas@kernel.org Cc: Bolarinwa Olayemi Saheed , bjorn@helgaas.com, linux-pci@vger.kernel.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 8/8] PCI: Align return values of PCIe capability and PCI accessors Date: Mon, 15 Jun 2020 09:32:25 +0200 Message-Id: <20200615073225.24061-9-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200615073225.24061-1-refactormyself@gmail.com> References: <20200615073225.24061-1-refactormyself@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Bolarinwa Olayemi Saheed The PCIe capability accessors can return 0, -EINVAL, or any PCIBIOS_ error code. PCIBIOS_ error codes have positive values. The PCI accessor on the other hand can only return 0 or any PCIBIOS_ error code. This inconsistency among these accessor makes it harder for callers to check for errors. Return PCIBIOS_BAD_REGISTER_NUMBER instead of -EINVAL in all PCIe capability accessors. Suggested-by: Bjorn Helgaas Signed-off-by: Bolarinwa Olayemi Saheed --- drivers/pci/access.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/access.c b/drivers/pci/access.c index 79c4a2ef269a..cbb3804903a0 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -409,7 +409,7 @@ int pcie_capability_read_word(struct pci_dev *dev, int pos, u16 *val) *val = 0; if (pos & 1) - return -EINVAL; + return PCIBIOS_BAD_REGISTER_NUMBER; if (pcie_capability_reg_implemented(dev, pos)) { ret = pci_read_config_word(dev, pci_pcie_cap(dev) + pos, val); @@ -444,7 +444,7 @@ int pcie_capability_read_dword(struct pci_dev *dev, int pos, u32 *val) *val = 0; if (pos & 3) - return -EINVAL; + return PCIBIOS_BAD_REGISTER_NUMBER; if (pcie_capability_reg_implemented(dev, pos)) { ret = pci_read_config_dword(dev, pci_pcie_cap(dev) + pos, val); @@ -469,7 +469,7 @@ EXPORT_SYMBOL(pcie_capability_read_dword); int pcie_capability_write_word(struct pci_dev *dev, int pos, u16 val) { if (pos & 1) - return -EINVAL; + return PCIBIOS_BAD_REGISTER_NUMBER; if (!pcie_capability_reg_implemented(dev, pos)) return 0; @@ -481,7 +481,7 @@ EXPORT_SYMBOL(pcie_capability_write_word); int pcie_capability_write_dword(struct pci_dev *dev, int pos, u32 val) { if (pos & 3) - return -EINVAL; + return PCIBIOS_BAD_REGISTER_NUMBER; if (!pcie_capability_reg_implemented(dev, pos)) return 0;