From patchwork Fri Mar 12 17:34:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amey Narkhede X-Patchwork-Id: 1452247 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=IhFDQPqi; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DxtLG00dTz9sVt for ; Sat, 13 Mar 2021 04:37:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232043AbhCLRgx (ORCPT ); Fri, 12 Mar 2021 12:36:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232489AbhCLRgs (ORCPT ); Fri, 12 Mar 2021 12:36:48 -0500 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E9A1C061574; Fri, 12 Mar 2021 09:36:48 -0800 (PST) Received: by mail-pl1-x636.google.com with SMTP id j6so12246248plx.6; Fri, 12 Mar 2021 09:36:48 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=dbrCD0QksJvbladF2pSbKHap/I9l4dbU3nddsfuyvyw=; b=IhFDQPqig9wPYYHb/xsHbGWyIu/fHSgkOpAqto/afvNC/NZyQGCFNGNDthpirixsq1 v/nxEf3zKaJOfSDLf/d+4DRb5hOv0A9hGlj2q9oRvHqEG02wL1JMuFBnY+3BSMEFtbe0 7Yr7vh3aL7aNbE2SrmVILVcnfRk6XKMb54NJTZ93lI2duWV4i044gyczJ5AxgjAtdNBS Pwy5nU7qQFE2D+gkKANq5/URk5ZHjHCWD5eUvmjeR6n4t4ujM2xhSL5Yoc8Fao1o4Ly+ d90+6jsdQentbwBuOM0SBUZLwK4JVf1UcI2eCoxjTykyvf1kK1z9xJgK1dR6TZWa7Zi1 vPEw== 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:mime-version:content-transfer-encoding; bh=dbrCD0QksJvbladF2pSbKHap/I9l4dbU3nddsfuyvyw=; b=f/w9QbmbyilqRfmOtuY7tnxdO0OC4Hmoso+ZlUiaRURlAAGS9keebjFiVBKVeasce5 IPguLMW0AytUANMhYNTmVy4F6mu/i4apUzRogEsGWvghlEAaEIBK3S9mlmiNWKGdlIAC 2Gp2qkoGsNDMThNJ+RaS02rQyUGKtjmfcjeHQVkemK852Y1cD3s2+XNalVeZA1XmBUTO IRvv/GTo5AMrILSkHNECZjUhJjf+HHZYCJxaCpl3WYRARoiFlFaiTeVbw2iqDKjEiXYw wZRzBxnDlw/fSgwbt+uRO7kngEDZjbc5Je3ytmEAFo5sAH208e/pvUUxFBLF1jRiszpr TldA== X-Gm-Message-State: AOAM530MkMBCH0ndX6+ZwAy+VaIjqBQa0S5+v/Qo14cu+lpfem8FecgH wThvz36VJlbF5QUt8rpwbp7gh3MmQWqyGA== X-Google-Smtp-Source: ABdhPJxpxD/SBh6SuNUNo49K5IRPmkXySv+RNtQ+X+t7/jymqHCDmmYiqDMYe0F4zcLlJqeBpbEaJg== X-Received: by 2002:a17:902:aa0a:b029:e4:c090:ad76 with SMTP id be10-20020a170902aa0ab02900e4c090ad76mr180949plb.2.1615570606528; Fri, 12 Mar 2021 09:36:46 -0800 (PST) Received: from localhost.localdomain ([103.248.31.144]) by smtp.googlemail.com with ESMTPSA id l10sm180045pfc.125.2021.03.12.09.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 09:36:46 -0800 (PST) From: ameynarkhede03@gmail.com To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, alex.williamson@redhat.com, raphael.norwitz@nutanix.com, Amey Narkhede Subject: [PATCH 2/4] PCI: Add new bitmap for keeping track of supported reset mechanisms Date: Fri, 12 Mar 2021 23:04:50 +0530 Message-Id: <20210312173452.3855-3-ameynarkhede03@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210312173452.3855-1-ameynarkhede03@gmail.com> References: <20210312173452.3855-1-ameynarkhede03@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Amey Narkhede Introduce a new bitmap reset_methods in struct pci_dev to keep track of reset mechanisms supported by the device. Also refactor probing and reset functions to take advantage of calling convention of reset functions. Signed-off-by: Amey Narkhede --- Reviewed-by: Alex Williamson Reviewed-by: Raphael Norwitz drivers/pci/pci.c | 106 ++++++++++++++++++++++++-------------------- drivers/pci/pci.h | 11 ++++- drivers/pci/probe.c | 5 +-- include/linux/pci.h | 10 +++++ 4 files changed, 79 insertions(+), 53 deletions(-) -- 2.30.2 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 4a7c084a3..407b44e85 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -40,6 +40,26 @@ const char *pci_power_names[] = { }; EXPORT_SYMBOL_GPL(pci_power_names); +static int pci_af_flr(struct pci_dev *dev, int probe); +static int pci_pm_reset(struct pci_dev *dev, int probe); +static int pci_dev_reset_slot_function(struct pci_dev *dev, int probe); +static int pci_parent_bus_reset(struct pci_dev *dev, int probe); + +/* + * The ordering for functions in pci_reset_fn_methods + * is required for bitmap positions defined + * in reset_methods in struct pci_dev + */ +const struct pci_reset_fn_method pci_reset_fn_methods[] = { + { .reset_fn = &pci_dev_specific_reset, .name = "device_specific" }, + { .reset_fn = &pcie_flr, .name = "flr" }, + { .reset_fn = &pci_af_flr, .name = "af_flr" }, + { .reset_fn = &pci_pm_reset, .name = "pm" }, + { .reset_fn = &pci_dev_reset_slot_function, .name = "slot" }, + { .reset_fn = &pci_parent_bus_reset, .name = "bus" }, + { 0 }, +}; + int isa_dma_bridge_buggy; EXPORT_SYMBOL(isa_dma_bridge_buggy); @@ -5080,71 +5100,59 @@ static void pci_dev_restore(struct pci_dev *dev) */ int __pci_reset_function_locked(struct pci_dev *dev) { - int rc; + int i, rc = -ENOTTY; + const struct pci_reset_fn_method *reset; might_sleep(); - /* - * A reset method returns -ENOTTY if it doesn't support this device - * and we should try the next method. - * - * If it returns 0 (success), we're finished. If it returns any - * other error, we're also finished: this indicates that further - * reset mechanisms might be broken on the device. - */ - rc = pci_dev_specific_reset(dev, 0); - if (rc != -ENOTTY) - return rc; - rc = pcie_flr(dev, 0); - if (rc != -ENOTTY) - return rc; - rc = pci_af_flr(dev, 0); - if (rc != -ENOTTY) - return rc; - rc = pci_pm_reset(dev, 0); - if (rc != -ENOTTY) - return rc; - rc = pci_dev_reset_slot_function(dev, 0); - if (rc != -ENOTTY) - return rc; - return pci_parent_bus_reset(dev, 0); + for (i = 0, reset = pci_reset_fn_methods; reset->reset_fn; i++, reset++) { + if (!(dev->reset_methods & (1 << i))) + continue; + + /* + * A reset method returns -ENOTTY if it doesn't support this device + * and we should try the next method. + * + * If it returns 0 (success), we're finished. If it returns any + * other error, we're also finished: this indicates that further + * reset mechanisms might be broken on the device. + */ + rc = reset->reset_fn(dev, 0); + if (rc != -ENOTTY) + return rc; + } + return rc; } EXPORT_SYMBOL_GPL(__pci_reset_function_locked); /** - * pci_probe_reset_function - check whether the device can be safely reset - * @dev: PCI device to reset + * pci_init_reset_methods - check whether device can be safely reset + * and store supported reset mechanisms. + * @dev: PCI device to check for reset mechanisms * * Some devices allow an individual function to be reset without affecting * other functions in the same device. The PCI device must be responsive - * to PCI config space in order to use this function. + * to reads and writes to its PCI config space in order to use this function. * - * Returns 0 if the device function can be reset or negative if the - * device doesn't support resetting a single function. + * Stores reset mechanisms supported by device in reset_methods bitmap + * field of struct pci_dev */ -int pci_probe_reset_function(struct pci_dev *dev) +void pci_init_reset_methods(struct pci_dev *dev) { - int rc; + int i, rc; + const struct pci_reset_fn_method *reset; - might_sleep(); + dev->reset_methods = 0; - rc = pci_dev_specific_reset(dev, 1); - if (rc != -ENOTTY) - return rc; - rc = pcie_flr(dev, 1); - if (rc != -ENOTTY) - return rc; - rc = pci_af_flr(dev, 1); - if (rc != -ENOTTY) - return rc; - rc = pci_pm_reset(dev, 1); - if (rc != -ENOTTY) - return rc; - rc = pci_dev_reset_slot_function(dev, 1); - if (rc != -ENOTTY) - return rc; + might_sleep(); - return pci_parent_bus_reset(dev, 1); + for (i = 0, reset = pci_reset_fn_methods; reset->reset_fn; i++, reset++) { + rc = reset->reset_fn(dev, 1); + if (!rc) + dev->reset_methods |= (1 << i); + else if (rc != -ENOTTY) + break; + } } /** diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index ef7c46613..ec093efdc 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -39,7 +39,7 @@ enum pci_mmap_api { int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai, enum pci_mmap_api mmap_api); -int pci_probe_reset_function(struct pci_dev *dev); +void pci_init_reset_methods(struct pci_dev *dev); int pci_bridge_secondary_bus_reset(struct pci_dev *dev); int pci_bus_error_reset(struct pci_dev *dev); @@ -612,6 +612,15 @@ struct pci_dev_reset_methods { int (*reset)(struct pci_dev *dev, int probe); }; +typedef int (*pci_reset_fn_t)(struct pci_dev *, int); + +struct pci_reset_fn_method { + pci_reset_fn_t reset_fn; + char *name; +}; + +extern const struct pci_reset_fn_method pci_reset_fn_methods[]; + #ifdef CONFIG_PCI_QUIRKS int pci_dev_specific_reset(struct pci_dev *dev, int probe); #else diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 953f15abc..01dd037bd 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2403,9 +2403,8 @@ static void pci_init_capabilities(struct pci_dev *dev) pci_rcec_init(dev); /* Root Complex Event Collector */ pcie_report_downtraining(dev); - - if (pci_probe_reset_function(dev) == 0) - dev->reset_fn = 1; + pci_init_reset_methods(dev); + dev->reset_fn = !!dev->reset_methods; } /* diff --git a/include/linux/pci.h b/include/linux/pci.h index 621ff5224..56d6e4750 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -325,6 +325,16 @@ struct pci_dev { unsigned int class; /* 3 bytes: (base,sub,prog-if) */ u8 revision; /* PCI revision, low byte of class word */ u8 hdr_type; /* PCI header type (`multi' flag masked out) */ + /* + * bit 0 -> dev_specific + * bit 1 -> flr + * bit 2 -> af_flr + * bit 3 -> pm + * bit 4 -> slot + * bit 5 -> bus + * See pci_reset_fn_methods array in pci.c + */ + u8 __bitwise reset_methods; /* bitmap for device supported reset capabilities */ #ifdef CONFIG_PCIEAER u16 aer_cap; /* AER capability offset */ struct aer_stats *aer_stats; /* AER stats for this device */ From patchwork Fri Mar 12 17:34:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amey Narkhede X-Patchwork-Id: 1452248 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=H2sNtGKC; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DxtLG2b5dz9sWH for ; Sat, 13 Mar 2021 04:37:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232562AbhCLRgy (ORCPT ); Fri, 12 Mar 2021 12:36:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232518AbhCLRgu (ORCPT ); Fri, 12 Mar 2021 12:36:50 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6091AC061574; Fri, 12 Mar 2021 09:36:50 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id x7so2329138pfi.7; Fri, 12 Mar 2021 09:36:50 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Vt+ZfXxgHIj6pX3xDrY5HBJPS+3eP7j5LuBWZFkBTOA=; b=H2sNtGKCYEmqPUML4+/kHtIv1LlbJvgctbPkS2MYqDMWom+h5/VXskL+DEPMvI06lv 0QoXA74fkSQXICpWq6JlsNoUQYp9COv9zZeD77a/Mz0hGlB30ItamI60CIvgWC7nPBFa Kp4SbQ4d2DEFnUnUD7weK0KGB5cFcaXB7kRRirUjPUKoUgLJAefM7ltQR5Tjb669i+cH zJGrzDeLnnMMBHKhHzdQ7T2UaDpCjIGXSIvYb0IPHbS3KJ0/cqYLtDk91A4odOAuG5lJ qqgB4ppuFoowIR5sx2lRJO3w75RgbCYu8AZL4bAThsJ6ZOheVo32GfvHHYDEpTgntR46 goAA== 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:mime-version:content-transfer-encoding; bh=Vt+ZfXxgHIj6pX3xDrY5HBJPS+3eP7j5LuBWZFkBTOA=; b=aOfbegz/28+Xi3AMt+YOmXlOlvTUTfu9RgEJFDfsiggJQcteBFyKn5F/NEsenZjg3m ZW0kLaWD3JewwGAdobsYTOS/gZHEv1hG8drPRQFznXxxJ+PvkFoSrCMoRINzE5EJKp28 di+ZtdesCJCXO+pRMRVE+aC3LfcwJhVgU/NFgKwC1J0kdLlWG/AkdUxCfURQFfrKpPhm Kk3ba8k4mYKTqkxLBoofOgyZmF5K3ynLHE0IgvGQ1UqoTf/oikc9/T9Qfyrf1tMq9FCV 6AGah3C7eagxFwCNkYaK1sP6Unp0Pp7XSJT9fer58UcfsgzQeiuB/sbCytx+E0tN6I2B skGQ== X-Gm-Message-State: AOAM531O0CQC/ows46l0fiFwSw83iqb2DqW78xlNaE8Ej5bCsDYSPwqr 4X9L2dXBIUTKniqS5+rSapDxin+DbGS/Wg== X-Google-Smtp-Source: ABdhPJzrExl+qGpImolq4qic6CUqHJrgmZub1I8cG7jRSDb78aB90sabNbclv3+zcuD4U/hEZJMEwA== X-Received: by 2002:a62:5b43:0:b029:1ef:21ad:846 with SMTP id p64-20020a625b430000b02901ef21ad0846mr13544573pfb.51.1615570609987; Fri, 12 Mar 2021 09:36:49 -0800 (PST) Received: from localhost.localdomain ([103.248.31.144]) by smtp.googlemail.com with ESMTPSA id l10sm180045pfc.125.2021.03.12.09.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 09:36:49 -0800 (PST) From: ameynarkhede03@gmail.com To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, alex.williamson@redhat.com, raphael.norwitz@nutanix.com, Amey Narkhede Subject: [PATCH 3/4] PCI: Remove reset_fn field from pci_dev Date: Fri, 12 Mar 2021 23:04:51 +0530 Message-Id: <20210312173452.3855-4-ameynarkhede03@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210312173452.3855-1-ameynarkhede03@gmail.com> References: <20210312173452.3855-1-ameynarkhede03@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Amey Narkhede reset_fn field is used to indicate whether the device supports any reset mechanism or not. Deprecate use of reset_fn in favor of new reset_methods bitmap which can be used to keep track of all supported reset mechanisms of a device. Signed-off-by: Amey Narkhede --- Reviewed-by: Alex Williamson Reviewed-by: Raphael Norwitz drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- drivers/pci/pci-sysfs.c | 6 ++---- drivers/pci/pci.c | 6 +++--- drivers/pci/probe.c | 1 - drivers/pci/quirks.c | 2 +- include/linux/pci.h | 1 - 6 files changed, 7 insertions(+), 11 deletions(-) -- 2.30.2 diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 9b9d305c6..3e2c49e08 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -526,7 +526,7 @@ static void octeon_destroy_resources(struct octeon_device *oct) oct->irq_name_storage = NULL; } /* Soft reset the octeon device before exiting */ - if (oct->pci_dev->reset_fn) + if (oct->pci_dev->reset_methods) octeon_pci_flr(oct); else cn23xx_vf_ask_pf_to_do_flr(oct); diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index f8afd54ca..78d2c130c 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1334,7 +1334,7 @@ static int pci_create_capabilities_sysfs(struct pci_dev *dev) pcie_vpd_create_sysfs_dev_files(dev); - if (dev->reset_fn) { + if (dev->reset_methods) { retval = device_create_file(&dev->dev, &dev_attr_reset); if (retval) goto error; @@ -1417,10 +1417,8 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) static void pci_remove_capabilities_sysfs(struct pci_dev *dev) { pcie_vpd_remove_sysfs_dev_files(dev); - if (dev->reset_fn) { + if (dev->reset_methods) device_remove_file(&dev->dev, &dev_attr_reset); - dev->reset_fn = 0; - } } /** diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 407b44e85..b7f6c6588 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5175,7 +5175,7 @@ int pci_reset_function(struct pci_dev *dev) { int rc; - if (!dev->reset_fn) + if (!dev->reset_methods) return -ENOTTY; pci_dev_lock(dev); @@ -5211,7 +5211,7 @@ int pci_reset_function_locked(struct pci_dev *dev) { int rc; - if (!dev->reset_fn) + if (!dev->reset_methods) return -ENOTTY; pci_dev_save_and_disable(dev); @@ -5234,7 +5234,7 @@ int pci_try_reset_function(struct pci_dev *dev) { int rc; - if (!dev->reset_fn) + if (!dev->reset_methods) return -ENOTTY; if (!pci_dev_trylock(dev)) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 01dd037bd..4764e031a 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2404,7 +2404,6 @@ static void pci_init_capabilities(struct pci_dev *dev) pcie_report_downtraining(dev); pci_init_reset_methods(dev); - dev->reset_fn = !!dev->reset_methods; } /* diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 0a3df84c9..20a81b1bc 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5535,7 +5535,7 @@ static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev) if (pdev->subsystem_vendor != PCI_VENDOR_ID_LENOVO || pdev->subsystem_device != 0x222e || - !pdev->reset_fn) + !pdev->reset_methods) return; if (pci_enable_device_mem(pdev)) diff --git a/include/linux/pci.h b/include/linux/pci.h index 56d6e4750..a2f003f4e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -437,7 +437,6 @@ struct pci_dev { unsigned int state_saved:1; unsigned int is_physfn:1; unsigned int is_virtfn:1; - unsigned int reset_fn:1; unsigned int is_hotplug_bridge:1; unsigned int shpc_managed:1; /* SHPC owned by shpchp */ unsigned int is_thunderbolt:1; /* Thunderbolt controller */ From patchwork Fri Mar 12 17:34:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amey Narkhede X-Patchwork-Id: 1452250 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=RF1TURJa; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DxtLs29wSz9sRR for ; Sat, 13 Mar 2021 04:37:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232836AbhCLRhY (ORCPT ); Fri, 12 Mar 2021 12:37:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232057AbhCLRgy (ORCPT ); Fri, 12 Mar 2021 12:36:54 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBDE9C061761; Fri, 12 Mar 2021 09:36:53 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id lr10-20020a17090b4b8ab02900dd61b95c5eso8813967pjb.4; Fri, 12 Mar 2021 09:36:53 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Zjhsutfaeg2zNXMNMCFjuL9SYJCyEz5Q4XqI1wTv0Ik=; b=RF1TURJaNG+GldM5/SQ5joAXkkFNDBuM6+XdowZkvodau/rvsnvyF73wAIafTxZqBO 8rC+JnPWv17QtUrQTGLCn5KLUGMBbaCI16q2z8FcQyOi38KYGJcUmvLPZpz/dOnb2+RW c3/+v1daRTRlp1Ox1h+BdTUvcQmo6Iv1Dr+ifqoiyAzlE4EhPFos6ippfrB8U5D2Rtuz I0fgFtnbj0JB0mkreB86chsonVUecAX97iELeurqJxxfzgRBtgPUQLS+GBqQnBS4e3g3 ZvQKSejG9CkqckJb6TieLKtyZshMR7rjLwpTIs3YUqMxQTTXnnNH82TAbPDCno1IsKA/ Pybg== 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:mime-version:content-transfer-encoding; bh=Zjhsutfaeg2zNXMNMCFjuL9SYJCyEz5Q4XqI1wTv0Ik=; b=tyNOzVNOkLeD0HjB0A8zDsnbdAiLmVX6hQU0Zm4LGrhEiaNVfAZ2ag8jQBqGCf4not YN/ny77HI/yJldm4X6bGibUDhoNOJF/020YyL5qBnf2OQSm8whuarGYghPEdYcgZi+KU XIivJ2J3s9H8YIWCWL1RF3bKBXsppWUdQZzSk6C0gYDTVUTB2Tbs8nbyR9BhKuBraZ/Y Svk4Y3Yuvr0lOAdpEOwPq/emzX3FAdopptTs5MiJnhEq2/AHZqH+oDUeNzfgEUxA2V+T wOigJKxq667im9zbd0yPkbXMcU+XuXeVSAgmfeuPgDSn/iCWBWBdyt0OBfEzmRgo6voi KYzA== X-Gm-Message-State: AOAM533euhx0kCk7KG86tWKIlHqq4FKZXcNW8pWTwSprdTCICW4eRh9G RRfKu/ts5uEfmvtK34HBvuE= X-Google-Smtp-Source: ABdhPJxTH/NXED/lfZqHjFsm4/PGtY8ZKPZbRVS/szN/fl0IfyyToFyhfbcnYUS3XB1iCAI5DPxfKg== X-Received: by 2002:a17:902:7444:b029:e4:30bf:8184 with SMTP id e4-20020a1709027444b02900e430bf8184mr115558plt.45.1615570613463; Fri, 12 Mar 2021 09:36:53 -0800 (PST) Received: from localhost.localdomain ([103.248.31.144]) by smtp.googlemail.com with ESMTPSA id l10sm180045pfc.125.2021.03.12.09.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 09:36:53 -0800 (PST) From: ameynarkhede03@gmail.com To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, alex.williamson@redhat.com, raphael.norwitz@nutanix.com, Amey Narkhede Subject: [PATCH 4/4] PCI/sysfs: Allow userspace to query and set device reset mechanism Date: Fri, 12 Mar 2021 23:04:52 +0530 Message-Id: <20210312173452.3855-5-ameynarkhede03@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210312173452.3855-1-ameynarkhede03@gmail.com> References: <20210312173452.3855-1-ameynarkhede03@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Amey Narkhede Add reset_methods_enabled bitmap to struct pci_dev to keep track of user preferred device reset mechanisms. Add reset_method sysfs attribute to query and set user preferred device reset mechanisms. Signed-off-by: Amey Narkhede --- Reviewed-by: Alex Williamson Reviewed-by: Raphael Norwitz Documentation/ABI/testing/sysfs-bus-pci | 15 ++++++ drivers/pci/pci-sysfs.c | 66 +++++++++++++++++++++++-- drivers/pci/pci.c | 3 +- include/linux/pci.h | 2 + 4 files changed, 82 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci index 25c9c3977..ae53ecd2e 100644 --- a/Documentation/ABI/testing/sysfs-bus-pci +++ b/Documentation/ABI/testing/sysfs-bus-pci @@ -121,6 +121,21 @@ Description: child buses, and re-discover devices removed earlier from this part of the device tree. +What: /sys/bus/pci/devices/.../reset_method +Date: March 2021 +Contact: Amey Narkhede +Description: + Some devices allow an individual function to be reset + without affecting other functions in the same slot. + For devices that have this support, a file named reset_method + will be present in sysfs. Reading this file will give names + of the device supported reset methods. Currently used methods + are enclosed in brackets. Writing the name of any of the device + supported reset method to this file will set the reset method to + be used when resetting the device. Writing "none" to this file + will disable ability to reset the device and writing "default" + will return to the original value. + What: /sys/bus/pci/devices/.../reset Date: July 2009 Contact: Michael S. Tsirkin diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 78d2c130c..3cd06d1c0 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1304,6 +1304,59 @@ static const struct bin_attribute pcie_config_attr = { .write = pci_write_config, }; +static ssize_t reset_method_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + const struct pci_reset_fn_method *reset; + struct pci_dev *pdev = to_pci_dev(dev); + ssize_t len = 0; + int i; + + for (i = 0, reset = pci_reset_fn_methods; reset->reset_fn; i++, reset++) { + if (pdev->reset_methods_enabled & (1 << i)) + len += sysfs_emit_at(buf, len, "[%s] ", reset->name); + else if (pdev->reset_methods & (1 << i)) + len += sysfs_emit_at(buf, len, "%s ", reset->name); + } + + return len; +} + +static ssize_t reset_method_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + const struct pci_reset_fn_method *reset = pci_reset_fn_methods; + struct pci_dev *pdev = to_pci_dev(dev); + u8 reset_mechanism; + int i = 0; + + /* Writing none disables reset */ + if (sysfs_streq(buf, "none")) { + reset_mechanism = 0; + } else if (sysfs_streq(buf, "default")) { + /* Writing default returns to initial value */ + reset_mechanism = pdev->reset_methods; + } else { + reset_mechanism = 0; + for (; reset->reset_fn; i++, reset++) { + if (sysfs_streq(buf, reset->name)) { + reset_mechanism = 1 << i; + break; + } + } + if (!reset_mechanism || !(pdev->reset_methods & reset_mechanism)) + return -EINVAL; + } + + pdev->reset_methods_enabled = reset_mechanism; + + return count; +} + +static DEVICE_ATTR_RW(reset_method); + static ssize_t reset_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { @@ -1337,11 +1390,16 @@ static int pci_create_capabilities_sysfs(struct pci_dev *dev) if (dev->reset_methods) { retval = device_create_file(&dev->dev, &dev_attr_reset); if (retval) - goto error; + goto err_reset; + retval = device_create_file(&dev->dev, &dev_attr_reset_method); + if (retval) + goto err_method; } return 0; -error: +err_method: + device_remove_file(&dev->dev, &dev_attr_reset); +err_reset: pcie_vpd_remove_sysfs_dev_files(dev); return retval; } @@ -1417,8 +1475,10 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) static void pci_remove_capabilities_sysfs(struct pci_dev *dev) { pcie_vpd_remove_sysfs_dev_files(dev); - if (dev->reset_methods) + if (dev->reset_methods) { device_remove_file(&dev->dev, &dev_attr_reset); + device_remove_file(&dev->dev, &dev_attr_reset_method); + } } /** diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index b7f6c6588..81cebea56 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5106,7 +5106,7 @@ int __pci_reset_function_locked(struct pci_dev *dev) might_sleep(); for (i = 0, reset = pci_reset_fn_methods; reset->reset_fn; i++, reset++) { - if (!(dev->reset_methods & (1 << i))) + if (!(dev->reset_methods_enabled & (1 << i))) continue; /* @@ -5153,6 +5153,7 @@ void pci_init_reset_methods(struct pci_dev *dev) else if (rc != -ENOTTY) break; } + dev->reset_methods_enabled = dev->reset_methods; } /** diff --git a/include/linux/pci.h b/include/linux/pci.h index a2f003f4e..400f614e0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -335,6 +335,8 @@ struct pci_dev { * See pci_reset_fn_methods array in pci.c */ u8 __bitwise reset_methods; /* bitmap for device supported reset capabilities */ + /* bitmap for user enabled and device supported reset capabilities */ + u8 __bitwise reset_methods_enabled; #ifdef CONFIG_PCIEAER u16 aer_cap; /* AER capability offset */ struct aer_stats *aer_stats; /* AER stats for this device */