Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp733279pxa; Wed, 5 Aug 2020 11:23:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztmDZ2KQaibLz0scjTY3lfj/naBU4tzrCqa3oqlVW1DOS8FH/smV91KP+mMUw8Lh0KsN+1 X-Received: by 2002:a17:906:b2d7:: with SMTP id cf23mr325951ejb.113.1596651818508; Wed, 05 Aug 2020 11:23:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596651818; cv=none; d=google.com; s=arc-20160816; b=Ij+gXw8vncDHZ6/PqSbyBog6hka0m2LVAZO3c2RWU2sL/suilMzXYB7B4OndwOcefk lR+6mKI4N8aTqaXO4n6S1MR7aNrqeCAZzF69/O/XZ45g+wxM6B2Iu7vTzwqQTUv/2sGL 4umQ9aR6rjwNy4laiIcapic0Ef+awGaxFcpVkmHM/76+H5o1mb54a4x902+BPBsCr9zD Dz+vUj85GfyAun+ujG7CSfdu+l/9WsddK3Go1TYYYL12gyDyJVC5OEBSkrapYYhOt8E3 kueJ6KTkMe4/Cj0ivM/tnxSjLYgMUkwSX2Ms7FfPpeP9XD8uTgP9wMgTJrYnvZdK8xuC NogQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lTR8Lgo0lTVr30kAgGXldRLjSzJrurZ+/TCCEqZVqLQ=; b=LiOWMN/Jz5HhBsUpC0nSXJRjUi3IvxxK+EJFfrLKQgc9nImLz32/z+mkWYxZNjzVWM guusip28V4t70xffs4CwRRtkdc4SUPG4iWEYxB2jTDaNEDQOuqvmf6E0XeWPDxecMKTu Z6TxkV8AmJCZvF5dOxQ6JE9WMvvO4wbS3WzkODAuoLjchRM+sf4yjn3XkD5RIwxWc+wV hd+wufg8LVThO1cOebuXjsi3AcEuqp3n6OQY1CXlOdUdIECoyRYGva7GUdc03UgzNIUa M/Hw2sKE5elGH1kFaMmv/V38H0xU7VCPVpmk6gGj7wpZzRSWNuEm1Sw7S/Y3RDyHufV6 NKDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gub5BhXg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w4si1869216ejb.443.2020.08.05.11.23.14; Wed, 05 Aug 2020 11:23:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gub5BhXg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729167AbgHESW0 (ORCPT + 99 others); Wed, 5 Aug 2020 14:22:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728712AbgHESLW (ORCPT ); Wed, 5 Aug 2020 14:11:22 -0400 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E97BCC0617B1; Wed, 5 Aug 2020 11:10:28 -0700 (PDT) Received: by mail-pf1-x441.google.com with SMTP id 74so14935607pfx.13; Wed, 05 Aug 2020 11:10:28 -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 :mime-version:content-transfer-encoding; bh=lTR8Lgo0lTVr30kAgGXldRLjSzJrurZ+/TCCEqZVqLQ=; b=gub5BhXgKIwql1fVHMrX+4usvSKCyg4lEY8j+g0tftBKI6jTK++/xJ98ikhyonQevY DcLYyqAawxEpy1H9uh0ctJVCOSy6DVB6UbVaYPu9jY0G0ktlVkw+X21iaOWak94jrsje YpxQ1fTAdY0T9Q0qSVuWXq6A+0isRy8zZ0NbEA/o/9TfA02w/0zGNY4LVR5gUeAxm3lO 8US9cWJrqi3g6NL79G5wBUNN423vu40M3SuAnMfxpaGrVwO3QHs/RrIFY2aILq3cLCZJ 2nkBJ7O1LJb9mDA+yk7c7Acv7rxDBePnN5iZBw9YWWV39K2npVI8Oyx0SV3i3w2TrFXu Ejdw== 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=lTR8Lgo0lTVr30kAgGXldRLjSzJrurZ+/TCCEqZVqLQ=; b=KXeq+kRb9UeTW13/nwi6eKi/rTaimi58N/PhyG4uPGzBMe9j0qY5LAyvicmbVgc0ps 2pGl7NUsNv0i4oSn1IXaUuS1csFJcmROsyX664dfeqIZkiZc2meTmGlWsOUAyi9ThgQv Kmv+ZlIfmBclvfj03J+4fzNeXaYSFeFv1BmREcSRy/QBBZM71ipr6V8e//cgrw4DmjjQ /rQ7Y1XmYNudHFbJ10hSiYLsIQmbwKFdQqxZoESBMnDjo9y8sWlze1qCpUD3pp+4PJZA rCyNQWbTnTKqS4EwUS5ed1U0rnllBEoxlskPCBgzRmGDq4dNtftgG4o2jtEdvPVODe65 W4pQ== X-Gm-Message-State: AOAM5329q37U+tZrJgNEDdSX0YRmjoBRE3+oI18SvWjUgH+Zu3R2Rp93 qcTtPoM/oOZ6YF07fadaEv8= X-Received: by 2002:a63:330c:: with SMTP id z12mr4150629pgz.46.1596651028426; Wed, 05 Aug 2020 11:10:28 -0700 (PDT) Received: from varodek.iballbatonwifi.com ([103.105.152.86]) by smtp.gmail.com with ESMTPSA id t63sm4977510pfb.210.2020.08.05.11.10.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 11:10:27 -0700 (PDT) From: Vaibhav Gupta To: Bjorn Helgaas , Bjorn Helgaas , Bjorn Helgaas , Vaibhav Gupta , Bartlomiej Zolnierkiewicz , Paul Mackerras , Russell King , Andres Salomon , Antonino Daplas , Florian Tobias Schandinat Cc: Vaibhav Gupta , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-geode@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, Shuah Khan Subject: [PATCH v1 11/12] fbdev: s3fb: use generic power management Date: Wed, 5 Aug 2020 23:37:21 +0530 Message-Id: <20200805180722.244008-12-vaibhavgupta40@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200805180722.244008-1-vaibhavgupta40@gmail.com> References: <20200805180722.244008-1-vaibhavgupta40@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Drivers using legacy power management .suspen()/.resume() callbacks have to manage PCI states and device's PM states themselves. They also need to take care of standard configuration registers. Switch to generic power management framework using a single "struct dev_pm_ops" variable to take the unnecessary load from the driver. This also avoids the need for the driver to directly call most of the PCI helper functions and device power state control functions, as through the generic framework PCI Core takes care of the necessary operations, and drivers are required to do only device-specific jobs. Signed-off-by: Vaibhav Gupta --- drivers/video/fbdev/s3fb.c | 39 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/drivers/video/fbdev/s3fb.c b/drivers/video/fbdev/s3fb.c index 60c424fae988..5c74253e7b2c 100644 --- a/drivers/video/fbdev/s3fb.c +++ b/drivers/video/fbdev/s3fb.c @@ -1410,9 +1410,9 @@ static void s3_pci_remove(struct pci_dev *dev) /* PCI suspend */ -static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state) +static int __maybe_unused s3_pci_suspend(struct device *dev) { - struct fb_info *info = pci_get_drvdata(dev); + struct fb_info *info = dev_get_drvdata(dev); struct s3fb_info *par = info->par; dev_info(info->device, "suspend\n"); @@ -1420,7 +1420,7 @@ static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state) console_lock(); mutex_lock(&(par->open_lock)); - if ((state.event == PM_EVENT_FREEZE) || (par->ref_count == 0)) { + if (par->ref_count == 0) { mutex_unlock(&(par->open_lock)); console_unlock(); return 0; @@ -1428,10 +1428,6 @@ static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state) fb_set_suspend(info, 1); - pci_save_state(dev); - pci_disable_device(dev); - pci_set_power_state(dev, pci_choose_state(dev, state)); - mutex_unlock(&(par->open_lock)); console_unlock(); @@ -1441,11 +1437,10 @@ static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state) /* PCI resume */ -static int s3_pci_resume(struct pci_dev* dev) +static int __maybe_unused s3_pci_resume(struct device *dev) { - struct fb_info *info = pci_get_drvdata(dev); + struct fb_info *info = dev_get_drvdata(dev); struct s3fb_info *par = info->par; - int err; dev_info(info->device, "resume\n"); @@ -1458,17 +1453,6 @@ static int s3_pci_resume(struct pci_dev* dev) return 0; } - pci_set_power_state(dev, PCI_D0); - pci_restore_state(dev); - err = pci_enable_device(dev); - if (err) { - mutex_unlock(&(par->open_lock)); - console_unlock(); - dev_err(info->device, "error %d enabling device for resume\n", err); - return err; - } - pci_set_master(dev); - s3fb_set_par(info); fb_set_suspend(info, 0); @@ -1478,6 +1462,16 @@ static int s3_pci_resume(struct pci_dev* dev) return 0; } +static const struct dev_pm_ops s3_pci_pm_ops = { +#ifdef CONFIG_PM_SLEEP + .suspend = s3_pci_suspend, + .resume = s3_pci_resume, + .freeze = NULL, + .thaw = s3_pci_resume, + .poweroff = s3_pci_suspend, + .restore = s3_pci_resume, +#endif +}; /* List of boards that we are trying to support */ @@ -1510,8 +1504,7 @@ static struct pci_driver s3fb_pci_driver = { .id_table = s3_devices, .probe = s3_pci_probe, .remove = s3_pci_remove, - .suspend = s3_pci_suspend, - .resume = s3_pci_resume, + .driver.pm = &s3_pci_pm_ops, }; /* Parse user specified options */ -- 2.27.0