From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3225261588 for ; Sat, 8 Nov 2025 09:29:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762594145; cv=none; b=u/XLU4Dkab4EEtpc/qaUOsmngHMuX8hgV6W2VjIJO18n1DSP/oiPyssXD6XqWZhh8SeP1kd9x8xwYbVqGD6crHKpFpF7OdbSKoHi2U6GJhTuOwOu5iqF5EeIPHWu0Tcv4kTFT1Xq3hI9lDd/NnU8qB7FFkS5foHP2F+eHvdpkeA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762594145; c=relaxed/simple; bh=appXKvLh3NKrUETTGFqjQxZS1gL48lTl6dWAIjQWBa0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=DYGWLA4IFe7hwoLf6023mWLd0b6MZCex318xQ5UEQRxGRP4qi3VKc5A1NGHR2mgAC89tkDeeo8f19s79UDwrzbTpTCY4hzdtnN1jw+w4qGa4e+akaa3v69sz0SNGFRp9iockg7/QjyZO7AJoJP8zE3NKt6wJdTyQfMMdFf8DYVo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=aRsNaeEw; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=AZ+MRD2M; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aRsNaeEw"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="AZ+MRD2M" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762594140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0i5dxxm940H2oOUUNhD8Sa5E80jy/5NUyBR36hP8GDM=; b=aRsNaeEwfa9psZeuYEsak75ikpNnz38D4U4pifbc29fZg6XgziZ0JD2zdLi6kyQuSTPILL YvuTcosRNrl6KtIQ3cMI45afWGCZv4nWCRobfElehfcpA1NoGuD1Lga6BXXds/e5In7yG8 gqzz6XPvAQE6xmwfBUVMqyYURBifONA= Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-190-yKskSGGpO2CIcv7n1I1V8g-1; Sat, 08 Nov 2025 04:28:59 -0500 X-MC-Unique: yKskSGGpO2CIcv7n1I1V8g-1 X-Mimecast-MFC-AGG-ID: yKskSGGpO2CIcv7n1I1V8g_1762594138 Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-7a2885329beso1514757b3a.0 for ; Sat, 08 Nov 2025 01:28:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1762594138; x=1763198938; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=0i5dxxm940H2oOUUNhD8Sa5E80jy/5NUyBR36hP8GDM=; b=AZ+MRD2Mz8mPy/eTFFFTW+iRnmOZV4DGTr/exObtmOH652MXr4W06vH8e9A2bTDSiQ qRzLMOfSmEe+tGpY7acdJWTZ3QGdl3pgjiAkds1SbQ4dtMGoLKO1saWWtW0LdaoKo6TZ vEgR0pTfGi61qfwQ9aEQCryLKPA2WXHGzbGqVkjGGMQaFa8/O2vN2ui0G+M2HZmXrsQG EnmdCjUeNpLKRXVNd9p27NEgBf/visHhzv+UD8ys5xXHI7DvR3Gch692t26VeBblFUeh Oa5fvtDJebiz5ftkQfZJk6E7EI+8gFUlmZ2VbW3PQYvjIvQOd4ZQvrqBN/NAe6ohl+Ji zTow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762594138; x=1763198938; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0i5dxxm940H2oOUUNhD8Sa5E80jy/5NUyBR36hP8GDM=; b=vXRCTEjUz+K/KRqeD0fQnwXNhQwVQkRCw7Rxnoc5GeoMepoFfMMeNyCtLoefzn2k1H nUnnoIhqenjOa2plWkrJIhcDfw0Wd8cXChSHiZpnewoKhvKTWYqFJfxSMygVp/LdJRRh 535lYJ4qHyjI7SgJ9G2/Y51GFuKqm9OyQM9O8SSBUWCjh2Vz2xV/Q8E0YUaBx7LhcVWa gtk+Z1oZS0Z8OnLEFk35XoNf57o0KFE5ghp0PSDNx4Jt1bb1ETAFQxZ9Q7wuGPW7H5lc dfGfTK6bJqDnJYj5K3PH94ieS/69uqFT+mzBWJhAWTYecfLlM+sTnXSbi71XHtMOJzkD 55Kw== X-Forwarded-Encrypted: i=1; AJvYcCV8a2JwhoaTsnLwU6a3UVyz01L9JQW5chJJe9lN79ZgJG5Nvb8IRJqFQdtBM3mb8Zv1V9B7sC+jBhiCI5w=@vger.kernel.org X-Gm-Message-State: AOJu0YzLZSG9oole7k19W5bQVKC/29Kbkq8RrOMm4Upyg/LbjTgKMeaa sJ2GLnzkXjC7HXAKs8QbfXA9SJrUz0SkY7gH6e4P9BTjQlHiLIcsoQJxv0hrqzxjDmVQ1B2XfE1 0bGyajywxIT0GHTbnadDjb6XNTdi9NMyeWuP2d2GZvm9aLolHJ+2zlJwyXAsa5UnTfQ== X-Gm-Gg: ASbGncuff8xGIWC3P9cAnmht6RzQLvX/A+PuQKaqq8xa0lg+0yZpvPGw4SZ4PzrM3Kg E26lqPHrV+49fkOj4JKH4hpqOl5Ad+Mll25oYmEpVtmdqifBVyHXfhLWxTaY8RLh5bu9h/7IU57 0zLiWwg5xWmX5YhSFPy8iRHugbtqEWx4Hpcc+LaQDSuC2smD+HPjSjNvwKPsqOxtlNMUu36XLeJ 51Lcz+EmZTZiGABag4BqeeMPIpjVsZxAuFmwTdzErMUqV7uzdx+pDMFuxC7gzfpC9Bo2W7hPMEF MrQuB3F+U4q0fWTQ0WxaR6pjCDKozcIN9o5PQb7Vm0YdPM+w6UGdNnxfPlpGpw3ImNVNxsGZULR VdMY99700UX5NTiC/n6F9bLnw7zr/iF1ieJA6tfE= X-Received: by 2002:a05:6a00:992:b0:7a2:83f4:1b5d with SMTP id d2e1a72fcca58-7b21800c3a7mr2839666b3a.6.1762594137723; Sat, 08 Nov 2025 01:28:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+zwxwjibEt64LEQj3V7SsxX7f792G4FQ4eCFL3ouTG/ujM7reC+2DTff72riVqEB11ER4KQ== X-Received: by 2002:a05:6a00:992:b0:7a2:83f4:1b5d with SMTP id d2e1a72fcca58-7b21800c3a7mr2839624b3a.6.1762594137250; Sat, 08 Nov 2025 01:28:57 -0800 (PST) Received: from [192.168.68.51] (n175-34-62-5.mrk21.qld.optusnet.com.au. [175.34.62.5]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7b0c963586fsm5368479b3a.10.2025.11.08.01.28.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 08 Nov 2025 01:28:56 -0800 (PST) Message-ID: <5b9136d6-b6c0-4f24-a8d2-05d7700140a8@redhat.com> Date: Sat, 8 Nov 2025 19:28:43 +1000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 10/33] arm_mpam: Add probe/remove for mpam msc driver and kbuild boiler plate To: Ben Horgan , james.morse@arm.com Cc: amitsinght@marvell.com, baisheng.gao@unisoc.com, baolin.wang@linux.alibaba.com, bobo.shaobowang@huawei.com, carl@os.amperecomputing.com, catalin.marinas@arm.com, dakr@kernel.org, dave.martin@arm.com, david@redhat.com, dfustini@baylibre.com, fenghuay@nvidia.com, gregkh@linuxfoundation.org, guohanjun@huawei.com, jeremy.linton@arm.com, jonathan.cameron@huawei.com, kobak@nvidia.com, lcherian@marvell.com, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, lpieralisi@kernel.org, peternewman@google.com, quic_jiles@quicinc.com, rafael@kernel.org, robh@kernel.org, rohit.mathew@arm.com, scott@os.amperecomputing.com, sdonthineni@nvidia.com, sudeep.holla@arm.com, tan.shaopeng@fujitsu.com, will@kernel.org, xhao@linux.alibaba.com, Shaopeng Tan References: <20251107123450.664001-1-ben.horgan@arm.com> <20251107123450.664001-11-ben.horgan@arm.com> Content-Language: en-US From: Gavin Shan In-Reply-To: <20251107123450.664001-11-ben.horgan@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Ben, On 11/7/25 10:34 PM, Ben Horgan wrote: > From: James Morse > > Probing MPAM is convoluted. MSCs that are integrated with a CPU may > only be accessible from those CPUs, and they may not be online. > Touching the hardware early is pointless as MPAM can't be used until > the system-wide common values for num_partid and num_pmg have been > discovered. > I'm not sure if below commit log is more clearer as I'm not a English native speaker: MPAM probing is convoluted. MSCs that are integrated to a set of CPUs may only be accessible from those CPUs, ... > Start with driver probe/remove and mapping the MSC. > > CC: Carl Worth > Tested-by: Fenghua Yu > Tested-by: Shaopeng Tan > Tested-by: Peter Newman > Signed-off-by: James Morse > Signed-off-by: Ben Horgan > --- > Changes since v3: > From Jonathan: > Include cleanup > Use devm_mutex_init() > Add an ERR_CAST() > Fenghua: > Return zero from update_msc_accessibility() > Additional: > Fail probe if MSC doesn't have an MMIO interface > --- > arch/arm64/Kconfig | 1 + > drivers/Kconfig | 2 + > drivers/Makefile | 1 + > drivers/resctrl/Kconfig | 15 +++ > drivers/resctrl/Makefile | 4 + > drivers/resctrl/mpam_devices.c | 194 ++++++++++++++++++++++++++++++++ > drivers/resctrl/mpam_internal.h | 49 ++++++++ > 7 files changed, 266 insertions(+) > create mode 100644 drivers/resctrl/Kconfig > create mode 100644 drivers/resctrl/Makefile > create mode 100644 drivers/resctrl/mpam_devices.c > create mode 100644 drivers/resctrl/mpam_internal.h > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index c5e66d5d72cd..004d58cfbff8 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -2025,6 +2025,7 @@ config ARM64_TLB_RANGE > > config ARM64_MPAM > bool "Enable support for MPAM" > + select ARM64_MPAM_DRIVER if EXPERT # does nothing yet > select ACPI_MPAM if ACPI > help > Memory System Resource Partitioning and Monitoring (MPAM) is an > diff --git a/drivers/Kconfig b/drivers/Kconfig > index 4915a63866b0..3054b50a2f4c 100644 > --- a/drivers/Kconfig > +++ b/drivers/Kconfig > @@ -251,4 +251,6 @@ source "drivers/hte/Kconfig" > > source "drivers/cdx/Kconfig" > > +source "drivers/resctrl/Kconfig" > + > endmenu > diff --git a/drivers/Makefile b/drivers/Makefile > index 8e1ffa4358d5..20eb17596b89 100644 > --- a/drivers/Makefile > +++ b/drivers/Makefile > @@ -194,6 +194,7 @@ obj-$(CONFIG_HTE) += hte/ > obj-$(CONFIG_DRM_ACCEL) += accel/ > obj-$(CONFIG_CDX_BUS) += cdx/ > obj-$(CONFIG_DPLL) += dpll/ > +obj-y += resctrl/ > > obj-$(CONFIG_DIBS) += dibs/ > obj-$(CONFIG_S390) += s390/ > diff --git a/drivers/resctrl/Kconfig b/drivers/resctrl/Kconfig > new file mode 100644 > index 000000000000..ef2f3adf64a9 > --- /dev/null > +++ b/drivers/resctrl/Kconfig > @@ -0,0 +1,15 @@ > +menuconfig ARM64_MPAM_DRIVER > + bool "MPAM driver" > + depends on ARM64 && ARM64_MPAM && EXPERT > + help > + Memory System Resource Partitioning and Monitoring (MPAM) driver for > + System IP, e,g. caches and memory controllers. > + > +if ARM64_MPAM_DRIVER > + > +config ARM64_MPAM_DRIVER_DEBUG > + bool "Enable debug messages from the MPAM driver" > + help > + Say yes here to enable debug messages from the MPAM driver. > + > +endif I am asking myself why "depends on ARM64_MPAM_DRIVER" can't be used here? :-) > diff --git a/drivers/resctrl/Makefile b/drivers/resctrl/Makefile > new file mode 100644 > index 000000000000..898199dcf80d > --- /dev/null > +++ b/drivers/resctrl/Makefile > @@ -0,0 +1,4 @@ > +obj-$(CONFIG_ARM64_MPAM_DRIVER) += mpam.o > +mpam-y += mpam_devices.o > + > +ccflags-$(CONFIG_ARM64_MPAM_DRIVER_DEBUG) += -DDEBUG > diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c > new file mode 100644 > index 000000000000..6c6be133d73a > --- /dev/null > +++ b/drivers/resctrl/mpam_devices.c > @@ -0,0 +1,194 @@ > +// SPDX-License-Identifier: GPL-2.0 > +// Copyright (C) 2025 Arm Ltd. > + > +#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mpam_internal.h" > + > +/* > + * mpam_list_lock protects the SRCU lists when writing. Once the > + * mpam_enabled key is enabled these lists are read-only, > + * unless the error interrupt disables the driver. > + */ s/when writing/for writing s/are read-only/become read-only > +static DEFINE_MUTEX(mpam_list_lock); > +static LIST_HEAD(mpam_all_msc); > + > +struct srcu_struct mpam_srcu; > + > +/* > + * Number of MSCs that have been probed. Once all MSC have been probed MPAM > + * can be enabled. > + */ s/all MSC/all MSCs (?) > +static atomic_t mpam_num_msc; > + > +/* > + * An MSC can control traffic from a set of CPUs, but may only be accessible > + * from a (hopefully wider) set of CPUs. The common reason for this is power > + * management. If all the CPUs in a cluster are in PSCI:CPU_SUSPEND, the > + * corresponding cache may also be powered off. By making accesses from > + * one of those CPUs, we ensure this isn't the case. > + */ s/An MSC/A MSC (?) s/from a/from the s/isn't the case/is the case (?) > +static int update_msc_accessibility(struct mpam_msc *msc) > +{ > + u32 affinity_id; > + int err; > + > + err = device_property_read_u32(&msc->pdev->dev, "cpu_affinity", > + &affinity_id); > + if (err) > + cpumask_copy(&msc->accessibility, cpu_possible_mask); > + else > + acpi_pptt_get_cpus_from_container(affinity_id, > + &msc->accessibility); > + return 0; > +} > + {} is needed for the block spanning multiple lines. I would validate msc->accessibility here instead of its caller (do_mpam_msc_drv_probe()). if (cpumask_empty(&msc->accessibility)) return {-EINVAL, -ENOENT}; > +static int fw_num_msc; > + > +static void mpam_msc_destroy(struct mpam_msc *msc) > +{ > + struct platform_device *pdev = msc->pdev; > + > + lockdep_assert_held(&mpam_list_lock); > + > + list_del_rcu(&msc->all_msc_list); > + platform_set_drvdata(pdev, NULL); > +} > + > +static void mpam_msc_drv_remove(struct platform_device *pdev) > +{ > + struct mpam_msc *msc = platform_get_drvdata(pdev); > + > + if (!msc) > + return; 'msc' is unlikely to be NULL here, so the check could be droped. > + > + mutex_lock(&mpam_list_lock); > + mpam_msc_destroy(msc); > + mutex_unlock(&mpam_list_lock); > + > + synchronize_srcu(&mpam_srcu); > +} > + > +static struct mpam_msc *do_mpam_msc_drv_probe(struct platform_device *pdev) > +{ > + int err; > + u32 tmp; > + struct mpam_msc *msc; > + struct resource *msc_res; > + struct device *dev = &pdev->dev; > + > + lockdep_assert_held(&mpam_list_lock); > + > + msc = devm_kzalloc(&pdev->dev, sizeof(*msc), GFP_KERNEL); > + if (!msc) > + return ERR_PTR(-ENOMEM); > + > + err = devm_mutex_init(dev, &msc->probe_lock); > + if (err) > + return ERR_PTR(err); > + err = devm_mutex_init(dev, &msc->part_sel_lock); > + if (err) > + return ERR_PTR(err); > + msc->id = pdev->id; > + msc->pdev = pdev; > + INIT_LIST_HEAD_RCU(&msc->all_msc_list); > + INIT_LIST_HEAD_RCU(&msc->ris); > + > + err = update_msc_accessibility(msc); > + if (err) > + return ERR_PTR(err); > + if (cpumask_empty(&msc->accessibility)) { > + dev_err_once(dev, "MSC is not accessible from any CPU!"); > + return ERR_PTR(-EINVAL); > + } > + As suggested above, this check would be done inside update_msc_accessibility(). > + if (device_property_read_u32(&pdev->dev, "pcc-channel", &tmp)) > + msc->iface = MPAM_IFACE_MMIO; > + else > + msc->iface = MPAM_IFACE_PCC; > + > + if (msc->iface == MPAM_IFACE_MMIO) { > + void __iomem *io; > + > + io = devm_platform_get_and_ioremap_resource(pdev, 0, > + &msc_res); > + if (IS_ERR(io)) { > + dev_err_once(dev, "Failed to map MSC base address\n"); > + return ERR_CAST(io); > + } > + msc->mapped_hwpage_sz = msc_res->end - msc_res->start; > + msc->mapped_hwpage = io; > + } else { > + return ERR_PTR(-ENOENT); Would be: return ERR_PTR(-EINVAL); > + } > + > + list_add_rcu(&msc->all_msc_list, &mpam_all_msc); > + platform_set_drvdata(pdev, msc); > + > + return msc; > +} > + > +static int mpam_msc_drv_probe(struct platform_device *pdev) > +{ > + int err; > + struct mpam_msc *msc = NULL; > + void *plat_data = pdev->dev.platform_data; > + > + mutex_lock(&mpam_list_lock); > + msc = do_mpam_msc_drv_probe(pdev); > + mutex_unlock(&mpam_list_lock); > + if (!IS_ERR(msc)) { > + /* Create RIS entries described by firmware */ > + err = acpi_mpam_parse_resources(msc, plat_data); > + if (err) > + mpam_msc_drv_remove(pdev); > + } else { > + err = PTR_ERR(msc); > + } > + > + if (!err && atomic_add_return(1, &mpam_num_msc) == fw_num_msc) > + pr_info("Discovered all MSC\n"); s/all MSC/all MSCs > + > + return err; > +} > + > +static struct platform_driver mpam_msc_driver = { > + .driver = { > + .name = "mpam_msc", > + }, > + .probe = mpam_msc_drv_probe, > + .remove = mpam_msc_drv_remove, > +}; > + > +static int __init mpam_msc_driver_init(void) > +{ > + if (!system_supports_mpam()) > + return -EOPNOTSUPP; > + > + init_srcu_struct(&mpam_srcu); > + > + fw_num_msc = acpi_mpam_count_msc(); > + > + if (fw_num_msc <= 0) { > + pr_err("No MSC devices found in firmware\n"); > + return -EINVAL; > + } > + > + return platform_driver_register(&mpam_msc_driver); > +} > +subsys_initcall(mpam_msc_driver_init); > diff --git a/drivers/resctrl/mpam_internal.h b/drivers/resctrl/mpam_internal.h > new file mode 100644 > index 000000000000..540066903eca > --- /dev/null > +++ b/drivers/resctrl/mpam_internal.h > @@ -0,0 +1,49 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +// Copyright (C) 2025 Arm Ltd. > + > +#ifndef MPAM_INTERNAL_H > +#define MPAM_INTERNAL_H > + > +#include > +#include > +#include > +#include > +#include > + > +struct platform_device; > + > +struct mpam_msc { > + /* member of mpam_all_msc */ > + struct list_head all_msc_list; > + > + int id; > + struct platform_device *pdev; > + > + /* Not modified after mpam_is_enabled() becomes true */ > + enum mpam_msc_iface iface; > + u32 nrdy_usec; > + cpumask_t accessibility; > + > + /* > + * probe_lock is only taken during discovery. After discovery these > + * properties become read-only and the lists are protected by SRCU. > + */ > + struct mutex probe_lock; > + unsigned long ris_idxs; > + u32 ris_max; > + > + /* mpam_msc_ris of this component */ > + struct list_head ris; > + > + /* > + * part_sel_lock protects access to the MSC hardware registers that are > + * affected by MPAMCFG_PART_SEL. (including the ID registers that vary > + * by RIS). > + * If needed, take msc->probe_lock first. > + */ > + struct mutex part_sel_lock; > + > + void __iomem *mapped_hwpage; > + size_t mapped_hwpage_sz; > +}; > +#endif /* MPAM_INTERNAL_H */ Thanks, Gavin