linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: "Daniel Vetter" <daniel.vetter@intel.com>,
	"Jani Nikula" <jani.nikula@linux.intel.com>,
	"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
	"Jarkko Nikula" <jarkko.nikula@linux.intel.com>,
	"Wolfram Sang" <wsa@the-dreams.de>, "Len Brown" <lenb@kernel.org>,
	"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"H . Peter Anvin" <hpa@zytor.com>
Cc: Takashi Iwai <tiwai@suse.de>,
	"russianneuromancer @ ya . ru" <russianneuromancer@ya.ru>,
	intel-gfx <intel-gfx@lists.freedesktop.org>,
	dri-devel@lists.freedesktop.org,
	Hans de Goede <hdegoede@redhat.com>,
	linux-i2c@vger.kernel.org,
	Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [PATCH v2 05/13] i2c: designware-baytrail: Only check iosf_mbi_available() for shared hosts
Date: Mon, 23 Jan 2017 22:09:50 +0100	[thread overview]
Message-ID: <20170123210958.18410-6-hdegoede@redhat.com> (raw)
In-Reply-To: <20170123210958.18410-1-hdegoede@redhat.com>

If (!shared_host) simply return 0, this avoids delaying the probe if
iosf_mbi_available() returns false when an i2c bus is not using the
punit semaphore.

Also move the if (!iosf_mbi_available()) check to above the
dev_info, so that we do not repeat the dev_info on every probe
until iosf_mbi_available() returns true.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
---
Changes in v2:
-New patch in v2 of this set
Changes in v3:
-Use if (!shared_host) return 0, to simplify the non-shared_host path
 and to avoid nested ifs
---
 drivers/i2c/busses/i2c-designware-baytrail.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware-baytrail.c b/drivers/i2c/busses/i2c-designware-baytrail.c
index a3f581c..cf02222 100644
--- a/drivers/i2c/busses/i2c-designware-baytrail.c
+++ b/drivers/i2c/busses/i2c-designware-baytrail.c
@@ -138,15 +138,16 @@ int i2c_dw_eval_lock_support(struct dw_i2c_dev *dev)
 	if (ACPI_FAILURE(status))
 		return 0;
 
-	if (shared_host) {
-		dev_info(dev->dev, "I2C bus managed by PUNIT\n");
-		dev->acquire_lock = baytrail_i2c_acquire;
-		dev->release_lock = baytrail_i2c_release;
-		dev->pm_runtime_disabled = true;
-	}
+	if (!shared_host)
+		return 0;
 
 	if (!iosf_mbi_available())
 		return -EPROBE_DEFER;
 
+	dev_info(dev->dev, "I2C bus managed by PUNIT\n");
+	dev->acquire_lock = baytrail_i2c_acquire;
+	dev->release_lock = baytrail_i2c_release;
+	dev->pm_runtime_disabled = true;
+
 	return 0;
 }
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-01-23 21:09 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-23 21:09 [PATCH v2 00/13] coordinate cht i2c-pmic and i915-punit accesses Hans de Goede
2017-01-23 21:09 ` [PATCH v2 01/13] x86/platform/intel/iosf_mbi: Add a mutex for P-Unit access Hans de Goede
2017-01-23 21:09 ` [PATCH v2 02/13] x86/platform/intel/iosf_mbi: Add a PMIC bus access notifier Hans de Goede
2017-01-23 21:09 ` [PATCH v2 03/13] i2c: designware: Rename accessor_flags to flags Hans de Goede
2017-01-23 21:09 ` [PATCH v2 04/13] i2c: designware-baytrail: Pass dw_i2c_dev into helper functions Hans de Goede
2017-01-23 21:09 ` Hans de Goede [this message]
2017-01-23 21:09 ` [PATCH v2 06/13] i2c: designware-baytrail: Disallow the CPU to enter C6 or C7 while holding the punit semaphore Hans de Goede
2017-01-24  9:51   ` Andy Shevchenko
2017-01-24 16:48     ` Hans de Goede
2017-01-23 21:09 ` [PATCH v2 07/13] i2c: designware-baytrail: Fix race when resetting the semaphore Hans de Goede
2017-01-23 21:09 ` [PATCH v2 08/13] i2c: designware-baytrail: Add support for cherrytrail Hans de Goede
2017-01-23 21:09 ` [PATCH v2 09/13] i2c: designware-baytrail: Acquire P-Unit access on bus acquire Hans de Goede
2017-01-27 11:29   ` Jarkko Nikula
2017-01-23 21:09 ` [PATCH v2 10/13] i2c: designware-baytrail: Call pmic_bus_access_notifier_chain Hans de Goede
2017-01-27 11:35   ` Jarkko Nikula
2017-01-23 21:09 ` [PATCH v2 11/13] drm/i915: Add intel_uncore_suspend / resume functions Hans de Goede
2017-01-27 13:45   ` Ville Syrjälä
2017-01-28 16:05     ` Hans de Goede
2017-01-23 21:09 ` [PATCH v2 12/13] drm/i915: Listen for PMIC bus access notifications Hans de Goede
2017-01-27 13:52   ` Ville Syrjälä
2017-01-28 17:39     ` Hans de Goede
2017-01-23 21:09 ` [PATCH v2 13/13] drm/i915: Acquire P-Unit access when modifying P-Unit settings Hans de Goede
2017-01-27 13:51   ` Ville Syrjälä
2017-01-28 16:25     ` Hans de Goede
2017-01-28 17:18       ` Hans de Goede
2017-01-30 13:10         ` Ville Syrjälä
2017-01-30 15:02           ` Hans de Goede
2017-01-30 15:11             ` Ville Syrjälä
2017-01-30 15:27               ` Hans de Goede
2017-01-30 15:38                 ` Ville Syrjälä
2017-01-30 16:33                   ` Hans de Goede
2017-02-10 10:19               ` Hans de Goede
2017-01-25 20:18 ` [PATCH v2 00/13] coordinate cht i2c-pmic and i915-punit accesses Wolfram Sang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170123210958.18410-6-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hpa@zytor.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=jarkko.nikula@linux.intel.com \
    --cc=lenb@kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=russianneuromancer@ya.ru \
    --cc=tglx@linutronix.de \
    --cc=tiwai@suse.de \
    --cc=ville.syrjala@linux.intel.com \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).