Robin, the patch below breaks the build on the .36 kernel tree with the
following errors:
CC [M] drivers/misc/sgi-xp/xp_uv.o
drivers/misc/sgi-xp/xp_uv.c: In function ‘xp_remote_mmr_read’:
drivers/misc/sgi-xp/xp_uv.c:40:2: error: implicit declaration of
function ‘uv_gpa_to_soc_phys_ram’
drivers/misc/sgi-xp/xp_uv.c:42:2: error: implicit declaration of
function ‘uv_gpa_in_mmr_space’
drivers/misc/sgi-xp/xp_uv.c:45:2: error: implicit declaration of
function ‘gru_read_gpa’
Was there some other patch that I needed to apply to get this one to
work properly?
I'm going to drop this one from the tree now.
thanks,
greg k-h
On Tue, Dec 07, 2010 at 02:04:18PM -0800, [email protected] wrote:
>
> This is a note to let you know that I've just added the patch titled
>
> x86: uv: update XPC to handle updated BIOS interface
>
> to the 2.6.32-stable tree which can be found at:
>
> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
> x86-uv-update-xpc-to-handle-updated-bios-interface.patch
> and it can be found in the queue-2.6.32 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <[email protected]> know about it.
>
>
> >From c2c9f115741453715d6b4da1cd2de65af8c7ad86 Mon Sep 17 00:00:00 2001
> From: Robin Holt <[email protected]>
> Date: Tue, 15 Dec 2009 16:47:56 -0800
> Subject: x86: uv: update XPC to handle updated BIOS interface
>
> From: Robin Holt <[email protected]>
>
> commit c2c9f115741453715d6b4da1cd2de65af8c7ad86 upstream.
>
> The UV BIOS has moved the location of some of their pointers to the
> "partition reserved page" from memory into a uv hub MMR. The GRU does not
> support bcopy operations from MMR space so we need to special case the MMR
> addresses using VLOAD operations.
>
> Additionally, the BIOS call for registering a message queue watchlist has
> removed the 'blade' value and eliminated the structure that was being
> passed in. This is also reflected in this patch.
>
> Signed-off-by: Robin Holt <[email protected]>
> Cc: Jack Steiner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> Signed-off-by: Linus Torvalds <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
>
> ---
> arch/x86/include/asm/uv/bios.h | 11 +----------
> arch/x86/kernel/bios_uv.c | 8 ++------
> drivers/misc/sgi-xp/xp_uv.c | 23 +++++++++++++++++++++++
> drivers/misc/sgi-xp/xpc_partition.c | 13 +++++++++----
> drivers/misc/sgi-xp/xpc_uv.c | 27 +++++++++++++++------------
> 5 files changed, 50 insertions(+), 32 deletions(-)
>
> --- a/arch/x86/include/asm/uv/bios.h
> +++ b/arch/x86/include/asm/uv/bios.h
> @@ -76,15 +76,6 @@ union partition_info_u {
> };
> };
>
> -union uv_watchlist_u {
> - u64 val;
> - struct {
> - u64 blade : 16,
> - size : 32,
> - filler : 16;
> - };
> -};
> -
> enum uv_memprotect {
> UV_MEMPROT_RESTRICT_ACCESS,
> UV_MEMPROT_ALLOW_AMO,
> @@ -100,7 +91,7 @@ extern s64 uv_bios_call_reentrant(enum u
>
> extern s64 uv_bios_get_sn_info(int, int *, long *, long *, long *);
> extern s64 uv_bios_freq_base(u64, u64 *);
> -extern int uv_bios_mq_watchlist_alloc(int, unsigned long, unsigned int,
> +extern int uv_bios_mq_watchlist_alloc(unsigned long, unsigned int,
> unsigned long *);
> extern int uv_bios_mq_watchlist_free(int, int);
> extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect);
> --- a/arch/x86/kernel/bios_uv.c
> +++ b/arch/x86/kernel/bios_uv.c
> @@ -101,21 +101,17 @@ s64 uv_bios_get_sn_info(int fc, int *uvt
> }
>
> int
> -uv_bios_mq_watchlist_alloc(int blade, unsigned long addr, unsigned int
> mq_size,
> +uv_bios_mq_watchlist_alloc(unsigned long addr, unsigned int mq_size,
> unsigned long *intr_mmr_offset)
> {
> - union uv_watchlist_u size_blade;
> u64 watchlist;
> s64 ret;
>
> - size_blade.size = mq_size;
> - size_blade.blade = blade;
> -
> /*
> * bios returns watchlist number or negative error number.
> */
> ret = (int)uv_bios_call_irqsave(UV_BIOS_WATCHLIST_ALLOC, addr,
> - size_blade.val, (u64)intr_mmr_offset,
> + mq_size, (u64)intr_mmr_offset,
> (u64)&watchlist, 0);
> if (ret < BIOS_STATUS_SUCCESS)
> return ret;
> --- a/drivers/misc/sgi-xp/xp_uv.c
> +++ b/drivers/misc/sgi-xp/xp_uv.c
> @@ -33,11 +33,34 @@ xp_pa_uv(void *addr)
> }
>
> static enum xp_retval
> +xp_remote_mmr_read(unsigned long dst_gpa, const unsigned long src_gpa,
> + size_t len)
> +{
> + int ret;
> + unsigned long *dst_va = __va(uv_gpa_to_soc_phys_ram(dst_gpa));
> +
> + BUG_ON(!uv_gpa_in_mmr_space(src_gpa));
> + BUG_ON(len != 8);
> +
> + ret = gru_read_gpa(dst_va, src_gpa);
> + if (ret == 0)
> + return xpSuccess;
> +
> + dev_err(xp, "gru_read_gpa() failed, dst_gpa=0x%016lx src_gpa=0x%016lx "
> + "len=%ld\n", dst_gpa, src_gpa, len);
> + return xpGruCopyError;
> +}
> +
> +
> +static enum xp_retval
> xp_remote_memcpy_uv(unsigned long dst_gpa, const unsigned long src_gpa,
> size_t len)
> {
> int ret;
>
> + if (uv_gpa_in_mmr_space(src_gpa))
> + return xp_remote_mmr_read(dst_gpa, src_gpa, len);
> +
> ret = gru_copy_gpa(dst_gpa, src_gpa, len);
> if (ret == 0)
> return xpSuccess;
> --- a/drivers/misc/sgi-xp/xpc_partition.c
> +++ b/drivers/misc/sgi-xp/xpc_partition.c
> @@ -18,6 +18,7 @@
> #include <linux/device.h>
> #include <linux/hardirq.h>
> #include "xpc.h"
> +#include <asm/uv/uv_hub.h>
>
> /* XPC is exiting flag */
> int xpc_exiting;
> @@ -92,8 +93,12 @@ xpc_get_rsvd_page_pa(int nasid)
> break;
>
> /* !!! L1_CACHE_ALIGN() is only a sn2-bte_copy requirement */
> - if (L1_CACHE_ALIGN(len) > buf_len) {
> - kfree(buf_base);
> + if (is_shub())
> + len = L1_CACHE_ALIGN(len);
> +
> + if (len > buf_len) {
> + if (buf_base != NULL)
> + kfree(buf_base);
> buf_len = L1_CACHE_ALIGN(len);
> buf = xpc_kmalloc_cacheline_aligned(buf_len, GFP_KERNEL,
> &buf_base);
> @@ -105,7 +110,7 @@ xpc_get_rsvd_page_pa(int nasid)
> }
> }
>
> - ret = xp_remote_memcpy(xp_pa(buf), rp_pa, buf_len);
> + ret = xp_remote_memcpy(xp_pa(buf), rp_pa, len);
> if (ret != xpSuccess) {
> dev_dbg(xpc_part, "xp_remote_memcpy failed %d\n", ret);
> break;
> @@ -143,7 +148,7 @@ xpc_setup_rsvd_page(void)
> dev_err(xpc_part, "SAL failed to locate the reserved page\n");
> return -ESRCH;
> }
> - rp = (struct xpc_rsvd_page *)__va(rp_pa);
> + rp = (struct xpc_rsvd_page *)__va(xp_socket_pa(rp_pa));
>
> if (rp->SAL_version < 3) {
> /* SAL_versions < 3 had a SAL_partid defined as a u8 */
> --- a/drivers/misc/sgi-xp/xpc_uv.c
> +++ b/drivers/misc/sgi-xp/xpc_uv.c
> @@ -156,22 +156,24 @@ xpc_gru_mq_watchlist_alloc_uv(struct xpc
> {
> int ret;
>
> -#if defined CONFIG_X86_64
> - ret = uv_bios_mq_watchlist_alloc(mq->mmr_blade, uv_gpa(mq->address),
> - mq->order, &mq->mmr_offset);
> - if (ret < 0) {
> - dev_err(xpc_part, "uv_bios_mq_watchlist_alloc() failed, "
> - "ret=%d\n", ret);
> - return ret;
> - }
> -#elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
> - ret = sn_mq_watchlist_alloc(mq->mmr_blade, (void *)uv_gpa(mq->address),
> +#if defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
> + int mmr_pnode = uv_blade_to_pnode(mq->mmr_blade);
> +
> + ret = sn_mq_watchlist_alloc(mmr_pnode, (void *)uv_gpa(mq->address),
> mq->order, &mq->mmr_offset);
> if (ret < 0) {
> dev_err(xpc_part, "sn_mq_watchlist_alloc() failed, ret=%d\n",
> ret);
> return -EBUSY;
> }
> +#elif defined CONFIG_X86_64
> + ret = uv_bios_mq_watchlist_alloc(uv_gpa(mq->address),
> + mq->order, &mq->mmr_offset);
> + if (ret < 0) {
> + dev_err(xpc_part, "uv_bios_mq_watchlist_alloc() failed, "
> + "ret=%d\n", ret);
> + return ret;
> + }
> #else
> #error not a supported configuration
> #endif
> @@ -184,12 +186,13 @@ static void
> xpc_gru_mq_watchlist_free_uv(struct xpc_gru_mq_uv *mq)
> {
> int ret;
> + int mmr_pnode = uv_blade_to_pnode(mq->mmr_blade);
>
> #if defined CONFIG_X86_64
> - ret = uv_bios_mq_watchlist_free(mq->mmr_blade, mq->watchlist_num);
> + ret = uv_bios_mq_watchlist_free(mmr_pnode, mq->watchlist_num);
> BUG_ON(ret != BIOS_STATUS_SUCCESS);
> #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
> - ret = sn_mq_watchlist_free(mq->mmr_blade, mq->watchlist_num);
> + ret = sn_mq_watchlist_free(mmr_pnode, mq->watchlist_num);
> BUG_ON(ret != SALRET_OK);
> #else
> #error not a supported configuration
>
>
> Patches currently in stable-queue which might be from [email protected] are
>
> queue-2.6.32/sgi-xpc-xpc-fails-to-discover-partitions-with-all-nasids-above-128.patch
> queue-2.6.32/x86-uv-xpc-receive-message-reuse-triggers-invalid-bug_on.patch
> queue-2.6.32/uv-xpc-pass-nasid-instead-of-nid-to-gru_create_message_queue.patch
> queue-2.6.32/x86-uv-xpc_make_first_contact-hang-due-to-not-accepting-active-state.patch
> queue-2.6.32/limit-sysctl_tcp_mem-and-sysctl_udp_mem-initializers-to-prevent-integer-overflows.patch
> queue-2.6.32/x86-uv-xpc-null-deref-when-mesq-becomes-empty.patch
> queue-2.6.32/x86-uv-update-xpc-to-handle-updated-bios-interface.patch
> queue-2.6.32/x86-uv-xpc-needs-to-provide-an-abstraction-for-uv_gpa.patch
>
> _______________________________________________
> stable mailing list
> [email protected]
> http://linux.kernel.org/mailman/listinfo/stable
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
