From patchwork Mon Sep 12 13:57:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sreekanth Reddy X-Patchwork-Id: 606092 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20D18C6FA8A for ; Mon, 12 Sep 2022 13:45:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229797AbiILNpf (ORCPT ); Mon, 12 Sep 2022 09:45:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229561AbiILNpb (ORCPT ); Mon, 12 Sep 2022 09:45:31 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7C1C1CB3B for ; Mon, 12 Sep 2022 06:45:30 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id b75so3422514pfb.7 for ; Mon, 12 Sep 2022 06:45:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date; bh=Sp4HRuKUmj+sBwaXgteDwjmqjP4oIDle2DgpGiJ4wgo=; b=ZC2LS52N3hqvd3EQNzoi0cFGXTOaoT0GqtmNxjgrw0cs6+0gpR0BDXF0IWMYh2mEOE DaTfsoC1QuMtMW9Q2qpuZF0mV4OZIkCHwXx6k2p8FyZku66t4nMjOyDv9s7nW/TU9vjJ Q/FmoeN/4zdMC/rbKepX/83jtUdkn1TLL66NM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date; bh=Sp4HRuKUmj+sBwaXgteDwjmqjP4oIDle2DgpGiJ4wgo=; b=cpT94OTZaJ14ziampKDYYGmaPS+7uPmv3poPUJP8OUs1SBHfMry6lf3ayeoP+pkSZu 9oMOGvOLbUH8bGtbG5fWqbDGIn1+obljjgoh9kh9ixBfhpf4X1V0N1sSNK2UA4eLhnUI OKWxZ7tzrM9hr0kxZbJpcLY+zswOPS9pllzr/6YzpuaTW2wy/WPJeTdkrRuZCIhrumF3 Hbjq4I2biR9Xa+FQwKNlG2ieyiXGV0g71akeBLiHmeRZQdrLppRKgd+3MCYsReclBXSs i3aPDzf4qFhijCio5cOCXncpgp9731xtoEzZRo/JJ3g56gIWHzPdYSoutI05A9wVCfki 5WzQ== X-Gm-Message-State: ACgBeo1SyRSx0hFoPJS+P9L31z9jeRnoDxBRHveCDblvAbjFa87JEMCF R9n5Y1mpKvai16hgcmkCwEWiHSvCTijAXv2donQcw7tgvmDDHClQN3JVBE/WhSxHZg4TjBJh9s1 O9WP0rlYcvt6BdIMnYubJ+rGO4MiI5x1/jDJ8eZ5CPuP53FtuOeb2Fap6yVi6rv7GwhI4n4YDug 2TJLn6W1N2 X-Google-Smtp-Source: AA6agR5/UVVntOskEvYiPiB0mEBvdOLNYUDsxNOtpuB0j8HrlHN4H9zFUB82sdyccH04+/fVH35iQA== X-Received: by 2002:a63:31d6:0:b0:434:af58:c988 with SMTP id x205-20020a6331d6000000b00434af58c988mr23254937pgx.29.1662990329800; Mon, 12 Sep 2022 06:45:29 -0700 (PDT) Received: from dhcp-10-123-20-36.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id u7-20020a170903124700b00176e8f85146sm6112900plh.185.2022.09.12.06.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Sep 2022 06:45:29 -0700 (PDT) From: Sreekanth Reddy To: linux-scsi@vger.kernel.org Cc: martin.petersen@oracle.com, Sreekanth Reddy Subject: [PATCH v2 2/9] mpi3mr: Support new power management framework Date: Mon, 12 Sep 2022 19:27:35 +0530 Message-Id: <20220912135742.11764-3-sreekanth.reddy@broadcom.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220912135742.11764-1-sreekanth.reddy@broadcom.com> References: <20220912135742.11764-1-sreekanth.reddy@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Switched to the new generic PCI PM (Power Management) framework. Also, removed unnecessary calls to the PCI Helper functions (such as pci_set_power_state(), pci_enable_wake(), pci_save_state(), pci_restore_state() etc). Signed-off-by: Sreekanth Reddy --- drivers/scsi/mpi3mr/mpi3mr_os.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index 22f1a06..f1a6448 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -5094,22 +5094,21 @@ static void mpi3mr_shutdown(struct pci_dev *pdev) mpi3mr_cleanup_resources(mrioc); } -#ifdef CONFIG_PM /** * mpi3mr_suspend - PCI power management suspend callback - * @pdev: PCI device instance - * @state: New power state + * @dev: Device struct * * Change the power state to the given value and cleanup the IOC * by issuing MUR and shutdown notification * * Return: 0 always. */ -static int mpi3mr_suspend(struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused +mpi3mr_suspend(struct device *dev) { + struct pci_dev *pdev = to_pci_dev(dev); struct Scsi_Host *shost = pci_get_drvdata(pdev); struct mpi3mr_ioc *mrioc; - pci_power_t device_state; if (!shost) return 0; @@ -5123,27 +5122,26 @@ static int mpi3mr_suspend(struct pci_dev *pdev, pm_message_t state) mpi3mr_stop_watchdog(mrioc); mpi3mr_cleanup_ioc(mrioc); - device_state = pci_choose_state(pdev, state); - ioc_info(mrioc, "pdev=0x%p, slot=%s, entering operating state [D%d]\n", - pdev, pci_name(pdev), device_state); - pci_save_state(pdev); + ioc_info(mrioc, "pdev=0x%p, slot=%s, entering operating state\n", + pdev, pci_name(pdev)); mpi3mr_cleanup_resources(mrioc); - pci_set_power_state(pdev, device_state); return 0; } /** * mpi3mr_resume - PCI power management resume callback - * @pdev: PCI device instance + * @dev: Device struct * * Restore the power state to D0 and reinitialize the controller * and resume I/O operations to the target devices * * Return: 0 on success, non-zero on failure */ -static int mpi3mr_resume(struct pci_dev *pdev) +static int __maybe_unused +mpi3mr_resume(struct device *dev) { + struct pci_dev *pdev = to_pci_dev(dev); struct Scsi_Host *shost = pci_get_drvdata(pdev); struct mpi3mr_ioc *mrioc; pci_power_t device_state = pdev->current_state; @@ -5156,9 +5154,6 @@ static int mpi3mr_resume(struct pci_dev *pdev) ioc_info(mrioc, "pdev=0x%p, slot=%s, previous operating state [D%d]\n", pdev, pci_name(pdev), device_state); - pci_set_power_state(pdev, PCI_D0); - pci_enable_wake(pdev, PCI_D0, 0); - pci_restore_state(pdev); mrioc->pdev = pdev; mrioc->cpu_count = num_online_cpus(); r = mpi3mr_setup_resources(mrioc); @@ -5180,7 +5175,6 @@ static int mpi3mr_resume(struct pci_dev *pdev) return 0; } -#endif static const struct pci_device_id mpi3mr_pci_id_table[] = { { @@ -5191,16 +5185,15 @@ static const struct pci_device_id mpi3mr_pci_id_table[] = { }; MODULE_DEVICE_TABLE(pci, mpi3mr_pci_id_table); +static SIMPLE_DEV_PM_OPS(mpi3mr_pm_ops, mpi3mr_suspend, mpi3mr_resume); + static struct pci_driver mpi3mr_pci_driver = { .name = MPI3MR_DRIVER_NAME, .id_table = mpi3mr_pci_id_table, .probe = mpi3mr_probe, .remove = mpi3mr_remove, .shutdown = mpi3mr_shutdown, -#ifdef CONFIG_PM - .suspend = mpi3mr_suspend, - .resume = mpi3mr_resume, -#endif + .driver.pm = &mpi3mr_pm_ops, }; static ssize_t event_counter_show(struct device_driver *dd, char *buf)