From patchwork Tue Jun 9 15:39:43 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: 1306102 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=PLAd77ol; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49hG6z6q9wz9sSd for ; Wed, 10 Jun 2020 02:39:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731153AbgFIQjj (ORCPT ); Tue, 9 Jun 2020 12:39:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbgFIQji (ORCPT ); Tue, 9 Jun 2020 12:39:38 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65F1FC05BD1E for ; Tue, 9 Jun 2020 09:39:38 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id p18so16884124eds.7 for ; Tue, 09 Jun 2020 09:39:38 -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=9rhbPwp78p7QDimVV/M2bMrQTU8itpq+LDENhux7O1Y=; b=PLAd77ol0yF25+tIk17dV5rWVd/POy2hmwSfg8iMnlA4hyqou8+kNlnl+5oJ9/TyXm RvUO3Vu6/QUmHTVGXEVBO3UeSD12AWtkUSZn2GTQ3fn2PtnuTaWz8yQAJQG/tZyALvXC Awy2IQTbVrKHcx/Yg5yNXJQZMmxrU5UtqoUKb+wAeXuQ+wSCLszoDCOxMwa9+35SuumO R6IHC+zwtovR8FreNDan6hVXGjH/x24OU39PjEop6XubQS1+Fle31fdMOAfE25FSH7/9 RK4i9g3ZJel2j1IjrA402aPHAvuFr+VpeNy0k+2rYEqLerlIIwx4fDvUWGALlhCS+WxJ mnJQ== 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=9rhbPwp78p7QDimVV/M2bMrQTU8itpq+LDENhux7O1Y=; b=PMrq0ykfMEp/ECJ6uQA4gBOK1XBFbL43VbhK9GsBhpRBDblh9yF9kM1+/3AmMopHsW 3fQVAS2KHGqaQtkecZmLcqVUZeTtLrGBj1QVwsVVqTp/JA44Vki/GdRLeLi81E6pZVpI uyk5JWuo6xWXNkipv9a2aNzxX7M0+LkRKvjnQwIaWG73XixrgAjyKXuoE+zudjCABByc fgW8tWRqi1e1hkokV2iPUDOtZySODCRyAOsoNwQRXbYjQ9DIxqvvUELugYY4sdGpMlkn Ak5HQASFZw6VkDJK8gU1f9RCfoQFLgqXLghazvEeJuJboMTSkn6J6TznZgPePV0xIp+i 85XA== X-Gm-Message-State: AOAM532SfOxIeHGs0MIbgaKt0B1PV2TP9veumO60NgohD2aucd6+0Zqh vzh5oA1TgZmDPGf8LOZKXgk= X-Google-Smtp-Source: ABdhPJw9Ap3KlgNPBVi8t1a5KFnBjFwtC3MNaxZeFOC5Jw5HhyPQe27VsCmCneFU5fyIqpEyW8OtIA== X-Received: by 2002:aa7:d6d0:: with SMTP id x16mr28480134edr.175.1591720777186; Tue, 09 Jun 2020 09:39:37 -0700 (PDT) Received: from net.saheed (0526DA6B.dsl.pool.telekom.hu. [5.38.218.107]) by smtp.gmail.com with ESMTPSA id ce25sm8822176edb.45.2020.06.09.09.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 09:39:36 -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 Subject: [PATCH 1/8] PCI: Convert PCIBIOS_ error codes to non-PCI generic error codes Date: Tue, 9 Jun 2020 17:39:43 +0200 Message-Id: <20200609153950.8346-2-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200609153950.8346-1-refactormyself@gmail.com> References: <20200609153950.8346-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 return value of pcie capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative non-PCI generic error values. Signed-off-by: Bolarinwa Olayemi Saheed Suggested-by: Bjorn Helgaas --- 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 Tue Jun 9 15:39:44 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: 1306103 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=rxMbyhfr; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49hG7C0TzKz9sRK for ; Wed, 10 Jun 2020 02:39:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730957AbgFIQju (ORCPT ); Tue, 9 Jun 2020 12:39:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbgFIQjt (ORCPT ); Tue, 9 Jun 2020 12:39:49 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6005CC05BD1E for ; Tue, 9 Jun 2020 09:39:49 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id x1so23095408ejd.8 for ; Tue, 09 Jun 2020 09:39:49 -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=oSb5aBU9dyl4makhOuJApH6Ld5RMddMm66x6daHRsXU=; b=rxMbyhfrJzR4NSTKb2nQBdf8TAnhEJETYndTBI9kHQt+uSHwyhrsCt13jC43q7xENJ B8AkkyuN1Twn8NY4K/iSU1vUVvgJk4HTX/XYBKteJRbDgGylsLBzjT6UDLr64+uCJs17 Wet8mypGGNBijToY9wOONC2DHVCqgP5UylCet5qtR/n6my+a6KpBlDTCUg5+l9/1r5oL RyPPhZ3Q7RSu318+jR1pOnspVLqTnTHrOJww9Y3cDpPLODEd/RPBwYEN8z7feK+seoqN 6Mlno6FmPddT26Ox6T1Pwn5XkDpa8vFR1VLAr+ut/sbODsd5Bc12nzVd3dhmZeWux1nU XpfQ== 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=oSb5aBU9dyl4makhOuJApH6Ld5RMddMm66x6daHRsXU=; b=o5VOISmNo5wPDY2YH08DGWaWVcw2ggs1HlAJUc5vS2fpDfUQzSprn7HhIaNvNKkzEJ 2O0EY8C68OaGObyM7ds3RbX3s81ERnZa+U1KRV5GPB7x+WN+D57T933Z1MV8ebCADwHt sm2VXqk78QauHVg1JshT/uxUR9pQnN8IPOpTBQr7NHYP6f1ZVDMRhYGcOhIskUbhQbL1 i9/cTRdGofw3QS27YO9O1VLBn6PBTZzHOLTYykZZJprdoGFsTFWJFY1MWicszfUtLNeS kLNdnX0Bm46EAq9x4/dw0sNDVzPvP9Vgi5nW8u26qlu8akzoOvIuAD49co/bVBsHGpf3 QmTQ== X-Gm-Message-State: AOAM531nY3f+aADPupZ9QNjHXqCywJsqIgJ7VaFOruI+Pz1ramqAhs7p lUpqq/q6KUZ/xmpVJRjjH8M= X-Google-Smtp-Source: ABdhPJxNrvN+qG5yWUVAVIIZze7pVvUUa8enDwmuHxuPDgrkfDj7je0MF8cVY76uEeWIwrVS8GjYOg== X-Received: by 2002:a17:906:e247:: with SMTP id gq7mr25682979ejb.107.1591720788144; Tue, 09 Jun 2020 09:39:48 -0700 (PDT) Received: from net.saheed (0526DA6B.dsl.pool.telekom.hu. [5.38.218.107]) by smtp.gmail.com with ESMTPSA id ce25sm8822176edb.45.2020.06.09.09.39.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 09:39:46 -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 Subject: [PATCH 2/8] PCI: Convert PCIBIOS_ error codes to non-PCI generic error codes Date: Tue, 9 Jun 2020 17:39:44 +0200 Message-Id: <20200609153950.8346-3-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200609153950.8346-1-refactormyself@gmail.com> References: <20200609153950.8346-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 return value of pcie capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative non-PCI generic error values. Signed-off-by: Bolarinwa Olayemi Saheed Suggested-by: Bjorn Helgaas --- 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 Tue Jun 9 15:39:45 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: 1306104 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=eGpNatfg; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49hG7F4g2Kz9sT6 for ; Wed, 10 Jun 2020 02:39:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731155AbgFIQjw (ORCPT ); Tue, 9 Jun 2020 12:39:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbgFIQjw (ORCPT ); Tue, 9 Jun 2020 12:39:52 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC8A0C05BD1E for ; Tue, 9 Jun 2020 09:39:51 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id l27so23148566ejc.1 for ; Tue, 09 Jun 2020 09:39:51 -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=6UEOEm/EvDhHHYzuc2E1g3P+sP/EaHhjUwuf0sBpPMk=; b=eGpNatfg0JovbusoP5dUVK0AVY1O/HoTV3fAGotU3XwGFxr6v/6E9ebbsf9xD1c7BI m+YnH4hG1wj8vy57MiJJ7RlD60i5D3UoXAdcU84o3Gs3h7eiBQkfWh8zDOcEP130aZwH R+a445jsdG3dFjFxq5gzYSoZqc71qIIiIpiJlkrOuJbmU7O1QNjIgDNbYgmpe2t/wu7p fuNXsfhHgiyojyKR5pOLvpoanuTLa0HCegnkR3RT/R2uNVI7TvMoK6+KsKPYIuuvZh/q ReMVgD1mQtd5tW+/yJ2/zB/xV5tJ1cSO+MfQh26sdpeKiZO7rKg8KRB7EaAvT1d18Do7 moGA== 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=6UEOEm/EvDhHHYzuc2E1g3P+sP/EaHhjUwuf0sBpPMk=; b=OmVoiyIHYvPrKSAP1EvsugcqKmKl40jCAffsMWFzSWhGU/bgMbMwIFj4zDARWaOs7a PonL6HKDUkx8htHKv3Myq7S3UIcbkhCZFbbLB37VZI2aOB5rRaUlv72oxk51y06AtnrJ n6E4TupasueBwNvU9Kxs8REHrgbqXGzJydv1UbEbG3yZQvNKxKMIOapgG7KexULf6LSm IiIZI6mhGWV5oUlAHVIiq3fajpndp8TeK+tYFASr4xuxDDiybUJp5z81LWSsvdp4JBiR 8mtPxYGQsiSw+kCN8h/RinnNEnT4+CblFgjvPUcaHhBnGQkDNTbO8W3qEzJ576/l7LBz dLHg== X-Gm-Message-State: AOAM532Pf3VVr2j11/effGFLC+2L+4C35f5bfoDEtRFjraDfBlvU40No 6LjDAGlK1Bcs1DKZiUJoJ44= X-Google-Smtp-Source: ABdhPJy2PpqvwfpsJIurcvXjXjS9Qi0CVSc/qGSUeMFWhbn9ZQKy8LJFiYbQ/afBS65n108VlOl4tA== X-Received: by 2002:a17:906:e2d5:: with SMTP id gr21mr25418133ejb.219.1591720790485; Tue, 09 Jun 2020 09:39:50 -0700 (PDT) Received: from net.saheed (0526DA6B.dsl.pool.telekom.hu. [5.38.218.107]) by smtp.gmail.com with ESMTPSA id ce25sm8822176edb.45.2020.06.09.09.39.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 09:39:49 -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 Subject: [PATCH 3/8] PCI: Convert PCIBIOS_ error codes to non-PCI generic error codes Date: Tue, 9 Jun 2020 17:39:45 +0200 Message-Id: <20200609153950.8346-4-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200609153950.8346-1-refactormyself@gmail.com> References: <20200609153950.8346-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 return value of pcie capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative non-PCI generic error values. Signed-off-by: Bolarinwa Olayemi Saheed Suggested-by: Bjorn Helgaas --- drivers/infiniband/hw/hfi1/pcie.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c index eb53781d0c6a..eb2790e9db36 100644 --- a/drivers/infiniband/hw/hfi1/pcie.c +++ b/drivers/infiniband/hw/hfi1/pcie.c @@ -334,7 +334,11 @@ 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; @@ -386,10 +390,14 @@ 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; @@ -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 Tue Jun 9 15:39:46 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: 1306105 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=p2V20UMY; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49hG7K4qbZz9sRK for ; Wed, 10 Jun 2020 02:39:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731156AbgFIQj5 (ORCPT ); Tue, 9 Jun 2020 12:39:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbgFIQj4 (ORCPT ); Tue, 9 Jun 2020 12:39:56 -0400 Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7EF9C05BD1E for ; Tue, 9 Jun 2020 09:39:53 -0700 (PDT) Received: by mail-ed1-x541.google.com with SMTP id k8so16895345edq.4 for ; Tue, 09 Jun 2020 09:39:53 -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=4UkRs+ciItBFRCKai6AMkqNzOyLsaBgxRzA9ZJAA16I=; b=p2V20UMY6NOmucm4k/mRfRSoMYsdED10Qcd2PJFwlo/CiOHkcwwJKDaXnqI8UDidr9 1l8UiPYci2ylNhO+QGKdZKVfD6emDrzIl001a8DtskB4Jm2rPdUjjgmZa6kL2G65NSPL 0EA37r423ANOrvM/kkq+hWJcreewBmzmCRSjI5ZGYukX+lYL9Eh8p64ja6K9LtKkQYQC 9J19lHEJQXw+HO/3BJABM0X3yRVRo3TesuPCuCBdV9FCl+8lB4yZjWiEs/uG9qYMjdxv vvFUaj5pIt0SZUkHDPIQ/VtvIQgLk6z+gTQP2w1D7oKYryEIxKqw9RvgYfwon0Cyw0Kv lj2Q== 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=4UkRs+ciItBFRCKai6AMkqNzOyLsaBgxRzA9ZJAA16I=; b=j+vrBeAD1vJL7lxjxnL7+Q82UY3LwyUqUgzMP/PnNQNJpDTnln9fcn9i29+vwTWUfG 1O0PbPHKo+qFSqtvrXsx67dw4++g1v23Ef+D2RUeQA35jhits+Z8S5TatZNu5QT0clIo 0woThv4UPCnQKTCUfWXVzH/d36ITBPAeI3NU9YVg03lv9Xhi/SpraPqNBfsWFDuG4/k5 IETEOhhtwozGpq7uGwhf0aX4RGgNoEyxLuOsrsOsaXFU4bkhfD/QUGpPOnFMf7xLtsFc P9ibf0BSBlEDBQnMVWYeKVLuwajjClmTp9UbSCQmMn8GqX109o1LRtle2OAnV8/uj/cn qZBw== X-Gm-Message-State: AOAM532iaUXhxTcd5albPWtViobB1ErJ7E6wEqWG5HQMDXzzqkJpV5YP NosdOZaccztc3zBAK6BTXU0= X-Google-Smtp-Source: ABdhPJwdx9SSeoqXr+srw+zSu+YKlt90rRWNR6jqgdhuOHKwZa9L6v6o11Ol7bFnshX6w4uESVy8WA== X-Received: by 2002:a50:fd19:: with SMTP id i25mr27408004eds.248.1591720792705; Tue, 09 Jun 2020 09:39:52 -0700 (PDT) Received: from net.saheed (0526DA6B.dsl.pool.telekom.hu. [5.38.218.107]) by smtp.gmail.com with ESMTPSA id ce25sm8822176edb.45.2020.06.09.09.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 09:39:51 -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 Subject: [PATCH 4/8] PCI: Convert PCIBIOS_ error codes to non-PCI generic error codes Date: Tue, 9 Jun 2020 17:39:46 +0200 Message-Id: <20200609153950.8346-5-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200609153950.8346-1-refactormyself@gmail.com> References: <20200609153950.8346-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 return value of pcie capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative non-PCI generic error values. Signed-off-by: Bolarinwa Olayemi Saheed Suggested-by: Bjorn Helgaas --- 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 Tue Jun 9 15:39:47 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: 1306106 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=K9TPrgtE; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49hG7L1LNPz9sRN for ; Wed, 10 Jun 2020 02:39:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727820AbgFIQj5 (ORCPT ); Tue, 9 Jun 2020 12:39:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731076AbgFIQj4 (ORCPT ); Tue, 9 Jun 2020 12:39:56 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABB6DC03E97C for ; Tue, 9 Jun 2020 09:39:55 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id mb16so23124318ejb.4 for ; Tue, 09 Jun 2020 09:39:55 -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=i0OZiuGZLiwe8FM0K4+TyUoQ9PQaKwBmSKhQqyCRuIQ=; b=K9TPrgtEHUN6XUVBMIiZD73BJRllR9e7xajx9ci84oiSjlSrVl03Pfsm0pQGijXTG5 sM6cLRmKdFoUa+QZYJ6SaPtsuDIl+0Nlq86QIbP2WA9rgO3DnLfCPBnZAdCPd5d4kFKD eBqJUm6+eijM2PzCY4NRJn9iUnSchem7UThMWS/GAeFEqdc+Iiqb/eL4UlH/O97emlj0 F9Ade5V9VLOM7/HQxg/xLcHKLSyBBx8ZLSI2zTu0NQ/9WC9BIwtwsM/g/mrXY2uKYYrD tqPJca27o4ja7xl9S07V3u6pQYRBh7gIJ3IGlQBDWpW+Wb0CiRrUe+LRy4pDJImzqC/5 f8MQ== 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=i0OZiuGZLiwe8FM0K4+TyUoQ9PQaKwBmSKhQqyCRuIQ=; b=Klx3Egv6hibI7A1K3bBgsDl7z1GiAfqrwCJw3W6wiTlpmIpTza+zTfKT1vJ0MQz0AY P0doJ6qnmXKfKvtrqLgQjocUCYM/obWW/R6KZ9HWtsWyhiRyUj3v6b4/V4pc1lzCfoPB Ii/ods1oFxA2MN5sdRHwrH7nr3ibmBYPcu0/lBihcaoAMLBpnXqum6Z3K39VyQINDSOU +rZCZ3ff2rcuK7JwAxcGN5fGvfVL+uodVIbiOKmuOfOFISY8KrVkNHh46CNBZx8X3364 DFZ+mP56R6w0dadjtorgb8e8marHQIXeixgLt9J3fE8sZ5FV9NZ6nCfruapyKVZffqAA Dx/A== X-Gm-Message-State: AOAM531D5PSRMWSMcgp92TVRt1okLujTFOzkUOtT9ybHwUevAQ44+RlT eSz4pAhUtGrz8MgbHxijRgI= X-Google-Smtp-Source: ABdhPJwD2uSQ7P+53vCanneVKhMUULLjaB3tjtfTO5P7Ur1vhRF5BiPcT2cW+8C2E/vY25nlRRlhww== X-Received: by 2002:a17:906:9254:: with SMTP id c20mr27468665ejx.540.1591720794345; Tue, 09 Jun 2020 09:39:54 -0700 (PDT) Received: from net.saheed (0526DA6B.dsl.pool.telekom.hu. [5.38.218.107]) by smtp.gmail.com with ESMTPSA id ce25sm8822176edb.45.2020.06.09.09.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 09:39:53 -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 Subject: [PATCH 5/8] PCI: Convert PCIBIOS_ error codes to non-PCI generic error codes Date: Tue, 9 Jun 2020 17:39:47 +0200 Message-Id: <20200609153950.8346-6-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200609153950.8346-1-refactormyself@gmail.com> References: <20200609153950.8346-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 return value of pcie capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative non-PCI generic error values. Signed-off-by: Bolarinwa Olayemi Saheed Suggested-by: Bjorn Helgaas --- 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 Tue Jun 9 15:39:48 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: 1306107 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=fRjX4oo0; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49hG7M0qrxz9sSd for ; Wed, 10 Jun 2020 02:39:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731159AbgFIQj6 (ORCPT ); Tue, 9 Jun 2020 12:39:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731076AbgFIQj5 (ORCPT ); Tue, 9 Jun 2020 12:39:57 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57D66C05BD1E for ; Tue, 9 Jun 2020 09:39:57 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id d15so4403971edm.10 for ; Tue, 09 Jun 2020 09:39:57 -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=sJgZ26pjbMZilbcKLqWWwX96iXERKkWruu1Viz6Y6lo=; b=fRjX4oo0D5HgH+EjyIFmy76jq8erdG7f4aNcTq0izcVH0gCtQAbR8uzZdKd15ozFjL ciyuBW6NahnGUzh3oOtQQ3yqWXixGla4S15GNBf1O5/fs8i+IWj3SBfAwiO+jZgxOGY3 tdz5OkurD89pl+PCRv3VlNWVl/T3EZ51us66FZvr+Iqfc98w4P87Ffj85JB46859F1ar 53+lUxrIEpzXVDUKG1bI3Hso/hqG0QcAfS4aLYmK6grEEFXr1DVtwPZkEbt2RCpSvC2q CzIg1fOKaGXJLjYqW8ImL+8ilnsbrucRBcDpF9xO1AM/KW3tNGZ0yu5i5gY5KpYS+/uM /D4Q== 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=sJgZ26pjbMZilbcKLqWWwX96iXERKkWruu1Viz6Y6lo=; b=hpOiHH/38J7dL44ZWmr/5TyQQEQ3rOEaJmZwuc6Hmyy0yrCMsTOBAZUvLdOEc5FqIT CkIQOlax+4+JcQXBYCPCmI/GIkyGDMIIcH2lcyc1DgsaB0RXwX3uHovDbWxkST2hGiLE qjQ6EGs3TR4WHum1wqD3uqyu/ZVYjRTnKfj9uQ/0ryOnVx0GW96EiWWE07DYPtBUNnH2 eZtvy5j/g7IUzFDaBjclrWjyQrjulDQAxR+jMk1csJ87kr+OVP9lYYHYyBUemmMl2Xor 9hW+tshck9kzqPy2LXPJ/QzkRptXsqv5f3wC4I40H/ctqiZKYbc0HhuT0yAdfbqmoj1w EeCw== X-Gm-Message-State: AOAM533nl+SV3jFOQ0mfBqAoCzksh+FSLvGQ9zRST/gZAiFRSWpUM52l pWZsRDxcl6411EO4ZO4wBTI= X-Google-Smtp-Source: ABdhPJw44GQF9xS8wFMa0kEdTebZ/qDRDYYKKeK40F1Ieqw7MIefDNiaF4z5d8p4n3E5QxkdkxmRrw== X-Received: by 2002:a50:b2a1:: with SMTP id p30mr28485817edd.199.1591720796067; Tue, 09 Jun 2020 09:39:56 -0700 (PDT) Received: from net.saheed (0526DA6B.dsl.pool.telekom.hu. [5.38.218.107]) by smtp.gmail.com with ESMTPSA id ce25sm8822176edb.45.2020.06.09.09.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 09:39:55 -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 Subject: [PATCH 6/8] PCI: Convert PCIBIOS_ error codes to non-PCI generic error codes Date: Tue, 9 Jun 2020 17:39:48 +0200 Message-Id: <20200609153950.8346-7-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200609153950.8346-1-refactormyself@gmail.com> References: <20200609153950.8346-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 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 return value of pcie capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative non-PCI generic error values. Signed-off-by: Bolarinwa Olayemi Saheed Suggested-by: Bjorn Helgaas --- 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 rc; } EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting); From patchwork Tue Jun 9 15:39:49 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: 1306108 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=hxv07Nzc; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49hG7P1rptz9sRK for ; Wed, 10 Jun 2020 02:40:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731161AbgFIQkA (ORCPT ); Tue, 9 Jun 2020 12:40:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731076AbgFIQj7 (ORCPT ); Tue, 9 Jun 2020 12:39:59 -0400 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0515AC05BD1E for ; Tue, 9 Jun 2020 09:39:59 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id x1so23095978ejd.8 for ; Tue, 09 Jun 2020 09:39:58 -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=k6aOczayNfGEXaDTZxRmJje2jWJyimgY57ZW0JiHbas=; b=hxv07Nzce/gCZPhyb/n7XzzCX4LaR4u+l8bNVViKdCOFyi7Es4ZcLeYpEbAkLbLmje FBlVEj3bobpSkV4D0tyaX3r1+pKUTNtXu7s2siNmiWRnThC+3W/n4WNOp8dhOKjlI4cU 1bkhYb19YaOrFhwWMlHslhOO0EAidxofVpprdluJRmmeRWhQbgo7m0fNeNNHjQs+X6id x6zV2wV6o4IMNoZc9Jzsz2UCozaKm7uY7FPi2lOD58IROH0Wc90M941U5izkyA7RGihw tTbl8KwZ/VB7M0oPVckD/gWykd7PnhsQR2nD69NEX/12Z/e8HhVJrknT6kLYSxlRveZc E08g== 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=k6aOczayNfGEXaDTZxRmJje2jWJyimgY57ZW0JiHbas=; b=jxuuuwtBrsfveWwrGvQljA4hS0+LUUi85eaSfH+XTgE13bBuxEfXzh8w4BU8kh+5u5 rfhh4UhWEW+VWOu/Qi/PzPPcHkZmXm0+yZlZvYiJeLcNDQWEVa8dlmr0M0WeOy517T3Y YixWlv4Gc29PSX7r4p7PQQJbIAm09Sr38tIkOdfi55ECkRijGuIs/kHCrHgWHzqZxjie /zcBe/e9tTtOcChqy9F8c+pnbLnOLhX+RKcew8Q1TttnJxMNOUibsnMtoc/8KWZUTfSL YddOZi/iMUEJEoHWwCW7FgB0c6JEZi4QD3UC0BIZTOCcFyIqcUvktwuFvPGAi11bM7sG z3yw== X-Gm-Message-State: AOAM530+7KZzmwwC6572CGDPS88oIeELxita1eiKL6UPBy7LNXvgd662 X/5I7YwQJoxe+FHt9bdynJ0= X-Google-Smtp-Source: ABdhPJzlhaqqFBTZnIoy4e423oIZvbaSLlyyfEaA9kkUSIlObtqMbsWjkmbwi0k0TNJXL8wTRTUadw== X-Received: by 2002:a17:906:e257:: with SMTP id gq23mr24967176ejb.398.1591720797792; Tue, 09 Jun 2020 09:39:57 -0700 (PDT) Received: from net.saheed (0526DA6B.dsl.pool.telekom.hu. [5.38.218.107]) by smtp.gmail.com with ESMTPSA id ce25sm8822176edb.45.2020.06.09.09.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 09:39:57 -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 Subject: [PATCH 7/8] PCI: Convert PCIBIOS_ error codes to non-PCI generic error codes Date: Tue, 9 Jun 2020 17:39:49 +0200 Message-Id: <20200609153950.8346-8-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200609153950.8346-1-refactormyself@gmail.com> References: <20200609153950.8346-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 return value of pcie capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative non-PCI generic error values. Signed-off-by: Bolarinwa Olayemi Saheed Suggested-by: Bjorn Helgaas --- 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 rc; } EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting); From patchwork Tue Jun 9 15:39:50 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: 1306109 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=mAsgYWoO; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49hG7Q3w6Sz9sRN for ; Wed, 10 Jun 2020 02:40:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731163AbgFIQkB (ORCPT ); Tue, 9 Jun 2020 12:40:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731076AbgFIQkB (ORCPT ); Tue, 9 Jun 2020 12:40:01 -0400 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C45D0C05BD1E for ; Tue, 9 Jun 2020 09:40:00 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id n24so23127668ejd.0 for ; Tue, 09 Jun 2020 09:40:00 -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=0jsc0WVDCzngvbleQ8FMVWNiYCK+/w60HL1ut3/sF08=; b=mAsgYWoOJGUlGLWXjx2QapagvaT5DCRY0rgeNKlXSiz17mP7EviuKkkYgS46x7C0F2 mxlZhY1ZEgThqWQQdzbqlakWTv4msE5E7ribb18M1AAxxHL2DhKBF3EFMkI49BNnIKAA DreY9qGzBl577nQaRl+sL1pt6JoMRJL3p5jyOUxHeeka320N8ZhTs36Jim1L1R0TlZuf OlD+K7gZjWzt+3YHmsQeKxbAwn7GE1YUfF/zLCod2Ay9L59UfD1/b4E97Nvp8JOBB5G7 tfw5BfqBTLmI/pPZ2NvbiI/EyvW/pARDblT6eURtmqrzzNzMfQ3SI8ExKAfHrpn5YGJ+ vg0A== 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=0jsc0WVDCzngvbleQ8FMVWNiYCK+/w60HL1ut3/sF08=; b=S5EKZJMBQlGRqYAg8ZcLzUVf51PJRv07GIgF063Mpda4jWukmJxIfoexjaqrwDX3hf eWBYlQo2ZVXG4RJ8+0I9qXrCM3aNsi2/t693u1nKyHVTMWnSw89Sd89W8cKgLCGXntaL s6chAIxRMKiR264gcFJdHPs3obeVWyzF4onGKBgC1UtZu/T8TZS1gk9zVA8JD98G2CEO eO2lezPoXcwgUBrGfSRarsDZ9aPbIQN0T5m64ksVvqtCC73ax7M/fULNInDl1lisJfN4 1R3hVmv24upOmV4Nd5wfccNlpxcbdIG86N1b2eX2MwrYb7WyKfPrhfAzkAOa21i8EGgY w2Vg== X-Gm-Message-State: AOAM533H50cnKHVQZShZMRhMBxHOt9q90lMExihj22mvyN94gPE8r4pW nFdygCa0q30MoYHmR2nZfhA= X-Google-Smtp-Source: ABdhPJzGbsBCwNgskEcVznnyAoQuL7JnlRbzWbMC447LnC3mtr7xDTjXw3UyWIeiXwWBoNmhNJlfDA== X-Received: by 2002:a17:906:f185:: with SMTP id gs5mr25417319ejb.223.1591720799486; Tue, 09 Jun 2020 09:39:59 -0700 (PDT) Received: from net.saheed (0526DA6B.dsl.pool.telekom.hu. [5.38.218.107]) by smtp.gmail.com with ESMTPSA id ce25sm8822176edb.45.2020.06.09.09.39.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 09:39:58 -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 Subject: [PATCH 8/8] PCI: Align return value of pcie capability accessors with other accessors Date: Tue, 9 Jun 2020 17:39:50 +0200 Message-Id: <20200609153950.8346-9-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200609153950.8346-1-refactormyself@gmail.com> References: <20200609153950.8346-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. Signed-off-by: Bolarinwa Olayemi Saheed Suggested-by: Bjorn Helgaas --- 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;