From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarkko Sakkinen Subject: Re: [PATCH v3 2/7] tpm_tis: Disable interrupt auto probing on a per-device basis Date: Sun, 3 Jan 2016 19:20:40 +0200 Message-ID: <20160103172040.GB4155@intel.com> References: <1450376600-6970-1-git-send-email-jgunthorpe@obsidianresearch.com> <1450376600-6970-3-git-send-email-jgunthorpe@obsidianresearch.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1450376600-6970-3-git-send-email-jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: tpmdd-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Jason Gunthorpe Cc: Martin Wilck , tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= List-Id: tpmdd-devel@lists.sourceforge.net On Thu, Dec 17, 2015 at 11:23:15AM -0700, Jason Gunthorpe wrote: > Instead of clearing the global interrupts flag when any device > does not have an interrupt just pass -1 through tpm_info.irq. > > The only thing that asks for autoprobing is the force=1 path. Sorry for my ignorance but what does this patch help? Why interrupts flag is not enough? > Signed-off-by: Jason Gunthorpe > Tested-by: Wilck, Martin > Tested-by: Jarkko Sakkinen Did I already give Tested-by's for this series (I did for those that went into v4.5 pull request)? /Jarkko > --- > drivers/char/tpm/tpm_tis.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > index 304323bdcaaa..fecd27b45fd1 100644 > --- a/drivers/char/tpm/tpm_tis.c > +++ b/drivers/char/tpm/tpm_tis.c > @@ -69,7 +69,11 @@ enum tis_defaults { > struct tpm_info { > unsigned long start; > unsigned long len; > - unsigned int irq; > + /* irq > 0 means: use irq $irq; > + * irq = 0 means: autoprobe for an irq; > + * irq = -1 means: no irq support > + */ > + int irq; > }; > > static struct tpm_info tis_default_info = { > @@ -807,7 +811,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > /* INTERRUPT Setup */ > init_waitqueue_head(&chip->vendor.read_queue); > init_waitqueue_head(&chip->vendor.int_queue); > - if (interrupts) { > + if (interrupts && tpm_info->irq != -1) { > if (tpm_info->irq) { > tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED, > tpm_info->irq); > @@ -895,9 +899,9 @@ static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume); > > #ifdef CONFIG_PNP > static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev, > - const struct pnp_device_id *pnp_id) > + const struct pnp_device_id *pnp_id) > { > - struct tpm_info tpm_info = tis_default_info; > + struct tpm_info tpm_info = {}; > acpi_handle acpi_dev_handle = NULL; > > tpm_info.start = pnp_mem_start(pnp_dev, 0); > @@ -906,7 +910,7 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev, > if (pnp_irq_valid(pnp_dev, 0)) > tpm_info.irq = pnp_irq(pnp_dev, 0); > else > - interrupts = false; > + tpm_info.irq = -1; > > #ifdef CONFIG_ACPI > if (pnp_acpi_device(pnp_dev)) { > @@ -984,6 +988,7 @@ static int tpm_tis_acpi_init(struct acpi_device *acpi_dev) > return -ENODEV; > > INIT_LIST_HEAD(&resources); > + tpm_info.irq = -1; > ret = acpi_dev_get_resources(acpi_dev, &resources, tpm_check_resource, > &tpm_info); > if (ret < 0) > @@ -991,9 +996,6 @@ static int tpm_tis_acpi_init(struct acpi_device *acpi_dev) > > acpi_dev_free_resource_list(&resources); > > - if (!tpm_info.irq) > - interrupts = false; > - > if (is_itpm(acpi_dev)) > itpm = true; > > -- > 2.1.4 > ------------------------------------------------------------------------------ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751931AbcACRUq (ORCPT ); Sun, 3 Jan 2016 12:20:46 -0500 Received: from mga11.intel.com ([192.55.52.93]:54581 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751297AbcACRUn (ORCPT ); Sun, 3 Jan 2016 12:20:43 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,516,1444719600"; d="scan'208";a="873782559" Date: Sun, 3 Jan 2016 19:20:40 +0200 From: Jarkko Sakkinen To: Jason Gunthorpe Cc: tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Martin Wilck , Peter Huewe , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Subject: Re: [PATCH v3 2/7] tpm_tis: Disable interrupt auto probing on a per-device basis Message-ID: <20160103172040.GB4155@intel.com> References: <1450376600-6970-1-git-send-email-jgunthorpe@obsidianresearch.com> <1450376600-6970-3-git-send-email-jgunthorpe@obsidianresearch.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1450376600-6970-3-git-send-email-jgunthorpe@obsidianresearch.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 17, 2015 at 11:23:15AM -0700, Jason Gunthorpe wrote: > Instead of clearing the global interrupts flag when any device > does not have an interrupt just pass -1 through tpm_info.irq. > > The only thing that asks for autoprobing is the force=1 path. Sorry for my ignorance but what does this patch help? Why interrupts flag is not enough? > Signed-off-by: Jason Gunthorpe > Tested-by: Wilck, Martin > Tested-by: Jarkko Sakkinen Did I already give Tested-by's for this series (I did for those that went into v4.5 pull request)? /Jarkko > --- > drivers/char/tpm/tpm_tis.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > index 304323bdcaaa..fecd27b45fd1 100644 > --- a/drivers/char/tpm/tpm_tis.c > +++ b/drivers/char/tpm/tpm_tis.c > @@ -69,7 +69,11 @@ enum tis_defaults { > struct tpm_info { > unsigned long start; > unsigned long len; > - unsigned int irq; > + /* irq > 0 means: use irq $irq; > + * irq = 0 means: autoprobe for an irq; > + * irq = -1 means: no irq support > + */ > + int irq; > }; > > static struct tpm_info tis_default_info = { > @@ -807,7 +811,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, > /* INTERRUPT Setup */ > init_waitqueue_head(&chip->vendor.read_queue); > init_waitqueue_head(&chip->vendor.int_queue); > - if (interrupts) { > + if (interrupts && tpm_info->irq != -1) { > if (tpm_info->irq) { > tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED, > tpm_info->irq); > @@ -895,9 +899,9 @@ static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume); > > #ifdef CONFIG_PNP > static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev, > - const struct pnp_device_id *pnp_id) > + const struct pnp_device_id *pnp_id) > { > - struct tpm_info tpm_info = tis_default_info; > + struct tpm_info tpm_info = {}; > acpi_handle acpi_dev_handle = NULL; > > tpm_info.start = pnp_mem_start(pnp_dev, 0); > @@ -906,7 +910,7 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev, > if (pnp_irq_valid(pnp_dev, 0)) > tpm_info.irq = pnp_irq(pnp_dev, 0); > else > - interrupts = false; > + tpm_info.irq = -1; > > #ifdef CONFIG_ACPI > if (pnp_acpi_device(pnp_dev)) { > @@ -984,6 +988,7 @@ static int tpm_tis_acpi_init(struct acpi_device *acpi_dev) > return -ENODEV; > > INIT_LIST_HEAD(&resources); > + tpm_info.irq = -1; > ret = acpi_dev_get_resources(acpi_dev, &resources, tpm_check_resource, > &tpm_info); > if (ret < 0) > @@ -991,9 +996,6 @@ static int tpm_tis_acpi_init(struct acpi_device *acpi_dev) > > acpi_dev_free_resource_list(&resources); > > - if (!tpm_info.irq) > - interrupts = false; > - > if (is_itpm(acpi_dev)) > itpm = true; > > -- > 2.1.4 >