From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
To: <joro@8bytes.org>, <bp@alien8.de>, <peterz@infradead.org>,
<mingo@redhat.com>, <acme@kernel.org>
Cc: <andihartmann@freenet.de>, <vw@iommu.org>, <labbott@redhat.com>,
<linux-kernel@vger.kernel.org>,
<iommu@lists.linux-foundation.org>,
"Suravee Suthikulpanit" <Suravee.Suthikulpanit@amd.com>
Subject: [PATCH V5 07/10] perf/amd/iommu: Clean up get_next_available_iommu_bnk_cntr
Date: Tue, 23 Feb 2016 08:12:41 -0600 [thread overview]
Message-ID: <1456236764-1569-8-git-send-email-Suravee.Suthikulpanit@amd.com> (raw)
In-Reply-To: <1456236764-1569-1-git-send-email-Suravee.Suthikulpanit@amd.com>
This patch cleans up the coding style of this function.
This should not affect the logic and functionality.
Cc: Borislav Petkov <bp@alien8.de>
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
---
arch/x86/events/amd/iommu.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
index 1a678b9..d5e4d39 100644
--- a/arch/x86/events/amd/iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -150,25 +150,23 @@ static struct attribute_group amd_iommu_cpumask_group = {
static int get_next_avail_iommu_bnk_cntr(struct perf_amd_iommu *perf_iommu)
{
unsigned long flags;
- int shift, bank, cntr, retval;
- int max_banks = perf_iommu->max_banks;
- int max_cntrs = perf_iommu->max_counters;
+ int bank, cntr, retval = -ENOSPC;
raw_spin_lock_irqsave(&perf_iommu->lock, flags);
- for (bank = 0, shift = 0; bank < max_banks; bank++) {
- for (cntr = 0; cntr < max_cntrs; cntr++) {
- shift = bank + (bank*3) + cntr;
- if (perf_iommu->cntr_assign_mask & (1ULL<<shift)) {
+ for (bank = 0; bank < perf_iommu->max_banks; bank++) {
+ for (cntr = 0; cntr < perf_iommu->max_counters; cntr++) {
+ int shift = (perf_iommu->max_counters * bank) + cntr;
+
+ if (perf_iommu->cntr_assign_mask & (1ULL << shift)) {
continue;
} else {
- perf_iommu->cntr_assign_mask |= (1ULL<<shift);
- retval = ((u16)((u16)bank<<8) | (u8)(cntr));
+ perf_iommu->cntr_assign_mask |= (1ULL << shift);
+ retval = ((u16)((u16)bank << 8) | (u8)(cntr));
goto out;
}
}
}
- retval = -ENOSPC;
out:
raw_spin_unlock_irqrestore(&perf_iommu->lock, flags);
return retval;
--
1.9.1
next prev parent reply other threads:[~2016-02-23 14:14 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 14:12 [PATCH V5 00/10] perf/amd/iommu: Enable multi-IOMMU support Suravee Suthikulpanit
2016-02-23 14:12 ` [PATCH V5 01/10] perf/amd/iommu: Misc fix up perf_iommu_read Suravee Suthikulpanit
2016-02-23 14:12 ` [PATCH V5 02/10] perf/amd/iommu: Consolidate and move perf_event_amd_iommu header Suravee Suthikulpanit
2016-03-12 13:22 ` Peter Zijlstra
2016-03-14 5:26 ` Suravee Suthikulpanit
2016-03-14 9:58 ` Peter Zijlstra
2016-03-14 13:37 ` Suravee Suthikulpanit
2016-03-14 14:19 ` Borislav Petkov
2016-03-14 16:39 ` Peter Zijlstra
2016-03-15 0:39 ` Suravee Suthikulpanit
2016-03-15 8:44 ` Peter Zijlstra
2016-03-15 10:40 ` Borislav Petkov
2016-03-15 10:53 ` Peter Zijlstra
2016-03-18 7:07 ` Suravee Suthikulpanit
2016-03-18 9:04 ` Borislav Petkov
2016-03-18 9:09 ` Suravee Suthikulpanit
2016-03-18 9:29 ` Borislav Petkov
2016-03-18 10:06 ` Suravee Suthikulpanit
2016-03-18 10:39 ` Borislav Petkov
2016-03-18 11:11 ` Joerg Roedel
2016-03-18 11:33 ` Borislav Petkov
2016-02-23 14:12 ` [PATCH V5 03/10] perf/amd/iommu: Modify functions to query max banks and counters Suravee Suthikulpanit
2016-02-23 14:12 ` [PATCH V5 04/10] perf/amd/iommu: Modify IOMMU API to allow specifying IOMMU index Suravee Suthikulpanit
2016-02-23 14:12 ` [PATCH V5 05/10] perf/amd/iommu: Declare pr_fmt and remove unnecessary pr_debug Suravee Suthikulpanit
2016-02-23 14:12 ` [PATCH V5 06/10] perf/amd/iommu: Clean up perf_iommu_enable_event Suravee Suthikulpanit
2016-02-23 14:12 ` Suravee Suthikulpanit [this message]
2016-02-23 14:12 ` [PATCH V5 08/10] perf/amd/iommu: Rename struct perf_amd_iommu to perf_iommu Suravee Suthikulpanit
2016-02-23 14:12 ` [PATCH V5 09/10] iommu/amd: Introduce amd_iommu_get_num_iommus() Suravee Suthikulpanit
2016-02-23 14:12 ` [PATCH V5 10/10] perf/amd/iommu: Enable support for multiple IOMMUs Suravee Suthikulpanit
2016-02-25 14:54 ` [PATCH V5 00/10] perf/amd/iommu: Enable multi-IOMMU support Joerg Roedel
2016-03-07 1:44 ` Suravee Suthikulpanit
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=1456236764-1569-8-git-send-email-Suravee.Suthikulpanit@amd.com \
--to=suravee.suthikulpanit@amd.com \
--cc=acme@kernel.org \
--cc=andihartmann@freenet.de \
--cc=bp@alien8.de \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=labbott@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=vw@iommu.org \
/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).