From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> To: <linux-kernel@vger.kernel.org>, <iommu@lists.linux-foundation.org> Cc: <joro@8bytes.org>, <bp@alien8.de>, <peterz@infradead.org>, <mingo@redhat.com>, Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> Subject: [PATCH v7 6/7] iommu/amd: Introduce amd_iommu_get_num_iommus() Date: Mon, 9 Jan 2017 21:33:46 -0600 [thread overview] Message-ID: <1484019227-11473-7-git-send-email-Suravee.Suthikulpanit@amd.com> (raw) In-Reply-To: <1484019227-11473-1-git-send-email-Suravee.Suthikulpanit@amd.com> This patch introduces amd_iommu_get_num_iommus(). This is intended for Perf AMD IOMMU driver. Cc: Joerg Roedel <joro@8bytes.org> Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> --- arch/x86/events/amd/iommu.h | 2 ++ drivers/iommu/amd_iommu_init.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/amd/iommu.h b/arch/x86/events/amd/iommu.h index 342716e..381f1c4 100644 --- a/arch/x86/events/amd/iommu.h +++ b/arch/x86/events/amd/iommu.h @@ -25,6 +25,8 @@ #define PC_MAX_SPEC_CNTRS 16 /* amd_iommu_init.c external support functions */ +extern int amd_iommu_get_num_iommus(void); + extern bool amd_iommu_pc_supported(void); extern u8 amd_iommu_pc_get_max_banks(uint idx); diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index c993c77..c3740cb 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -1329,7 +1329,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) /* Add IOMMU to internal data structures */ list_add_tail(&iommu->list, &amd_iommu_list); - iommu->index = amd_iommus_present++; + iommu->index = amd_iommus_present++; if (unlikely(iommu->index >= MAX_IOMMUS)) { WARN(1, "AMD-Vi: System has more IOMMUs than supported by this driver\n"); @@ -2717,6 +2717,11 @@ static struct amd_iommu *get_amd_iommu(uint idx) return iommu; } +int amd_iommu_get_num_iommus(void) +{ + return amd_iommus_present; +} + /**************************************************************************** * * IOMMU EFR Performance Counter support functionality. This code allows -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Suravee Suthikulpanit <Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org> To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org, mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org Subject: [PATCH v7 6/7] iommu/amd: Introduce amd_iommu_get_num_iommus() Date: Mon, 9 Jan 2017 21:33:46 -0600 [thread overview] Message-ID: <1484019227-11473-7-git-send-email-Suravee.Suthikulpanit@amd.com> (raw) In-Reply-To: <1484019227-11473-1-git-send-email-Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org> This patch introduces amd_iommu_get_num_iommus(). This is intended for Perf AMD IOMMU driver. Cc: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org> --- arch/x86/events/amd/iommu.h | 2 ++ drivers/iommu/amd_iommu_init.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/amd/iommu.h b/arch/x86/events/amd/iommu.h index 342716e..381f1c4 100644 --- a/arch/x86/events/amd/iommu.h +++ b/arch/x86/events/amd/iommu.h @@ -25,6 +25,8 @@ #define PC_MAX_SPEC_CNTRS 16 /* amd_iommu_init.c external support functions */ +extern int amd_iommu_get_num_iommus(void); + extern bool amd_iommu_pc_supported(void); extern u8 amd_iommu_pc_get_max_banks(uint idx); diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index c993c77..c3740cb 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -1329,7 +1329,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) /* Add IOMMU to internal data structures */ list_add_tail(&iommu->list, &amd_iommu_list); - iommu->index = amd_iommus_present++; + iommu->index = amd_iommus_present++; if (unlikely(iommu->index >= MAX_IOMMUS)) { WARN(1, "AMD-Vi: System has more IOMMUs than supported by this driver\n"); @@ -2717,6 +2717,11 @@ static struct amd_iommu *get_amd_iommu(uint idx) return iommu; } +int amd_iommu_get_num_iommus(void) +{ + return amd_iommus_present; +} + /**************************************************************************** * * IOMMU EFR Performance Counter support functionality. This code allows -- 1.8.3.1
next prev parent reply other threads:[~2017-01-10 3:35 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-10 3:33 [PATCH v7 0/7] perf/amd/iommu: Enable multi-IOMMU support Suravee Suthikulpanit 2017-01-10 3:33 ` Suravee Suthikulpanit 2017-01-10 3:33 ` [PATCH v7 1/7] perf/amd/iommu: Misc fix up perf_iommu_read Suravee Suthikulpanit 2017-01-10 3:33 ` Suravee Suthikulpanit 2017-01-11 10:32 ` Borislav Petkov 2017-01-11 10:32 ` Borislav Petkov 2017-01-11 11:57 ` Peter Zijlstra 2017-01-11 11:57 ` Peter Zijlstra 2017-01-15 2:36 ` Suravee Suthikulpanit 2017-01-15 2:36 ` Suravee Suthikulpanit 2017-01-19 10:14 ` Peter Zijlstra 2017-01-19 10:14 ` Peter Zijlstra 2017-01-10 3:33 ` [PATCH v7 2/7] perf/amd/iommu: Modify functions to query max banks and counters Suravee Suthikulpanit 2017-01-10 3:33 ` Suravee Suthikulpanit 2017-01-10 14:43 ` Joerg Roedel 2017-01-10 14:43 ` Joerg Roedel 2017-01-11 3:03 ` Suravee Suthikulpanit 2017-01-11 3:03 ` Suravee Suthikulpanit 2017-01-11 8:13 ` Boris Petkov 2017-01-11 8:13 ` Boris Petkov 2017-01-11 9:14 ` Suravee Suthikulpanit 2017-01-11 9:14 ` Suravee Suthikulpanit 2017-01-10 3:33 ` [PATCH v7 3/7] perf/amd/iommu: Modify IOMMU API to allow specifying IOMMU index Suravee Suthikulpanit 2017-01-10 3:33 ` Suravee Suthikulpanit 2017-01-11 17:23 ` Borislav Petkov 2017-01-10 3:33 ` [PATCH v7 4/7] perf/amd/iommu: Declare pr_fmt and remove unnecessary pr_debug Suravee Suthikulpanit 2017-01-10 3:33 ` Suravee Suthikulpanit 2017-01-12 10:19 ` Borislav Petkov 2017-01-14 10:13 ` Suravee Suthikulpanit 2017-01-14 10:13 ` Suravee Suthikulpanit 2017-01-10 3:33 ` [PATCH v7 5/7] perf/amd/iommu: Clean up perf_iommu_enable_event Suravee Suthikulpanit 2017-01-10 3:33 ` Suravee Suthikulpanit 2017-01-12 14:14 ` Borislav Petkov 2017-01-12 14:14 ` Borislav Petkov 2017-01-10 3:33 ` Suravee Suthikulpanit [this message] 2017-01-10 3:33 ` [PATCH v7 6/7] iommu/amd: Introduce amd_iommu_get_num_iommus() Suravee Suthikulpanit 2017-01-12 14:21 ` Borislav Petkov 2017-01-10 3:33 ` [PATCH v7 7/7] perf/amd/iommu: Enable support for multiple IOMMUs Suravee Suthikulpanit 2017-01-10 3:33 ` Suravee Suthikulpanit 2017-01-12 17:52 ` Borislav Petkov 2017-01-12 17:52 ` Borislav Petkov 2017-01-13 10:24 ` Suravee Suthikulpanit 2017-01-13 10:24 ` Suravee Suthikulpanit 2017-01-13 11:49 ` Borislav Petkov 2017-01-14 2:58 ` Suravee Suthikulpanit 2017-01-14 2:58 ` Suravee Suthikulpanit 2017-01-14 10:29 ` Borislav Petkov 2017-01-14 10:29 ` Borislav Petkov
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=1484019227-11473-7-git-send-email-Suravee.Suthikulpanit@amd.com \ --to=suravee.suthikulpanit@amd.com \ --cc=bp@alien8.de \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=peterz@infradead.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.