LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Alex Chiang <achiang@hp.com>
To: "Luck, Tony" <tony.luck@intel.com>
Cc: lenb@kernel.org, linux-ia64@vger.kernel.org,
	linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] ia64: Provide ACPI fixup for /proc/cpuinfo/physical_id
Date: Tue, 29 Apr 2008 17:20:37 -0600	[thread overview]
Message-ID: <20080429232037.GA3820@ldl.fc.hp.com> (raw)
In-Reply-To: <1FE6DD409037234FAB833C420AA843EC0138200C@orsmsx424.amr.corp.intel.com>

Hi Tony,

* Luck, Tony <tony.luck@intel.com>:
> Alex,
> 
> I chewed on this a bit ... 

Thanks for all the fixups -- your version looks a lot nicer!

> diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
> +#define arch_fix_phys_package_id(num, slot)
> 
> Style preference is to now use a "static inline void" function for
> this to make sure args are correctly typed, and to avoid warnings about
> unused variables.

*nod*

I'll use that convention in the future, thanks.

> updated version of the patch looks like this ... ok???

Looks great to me.

/ac

> 
> -Tony
> 
> commit fe086a7bea7ab714930bd48addba961ceeef7634
> Author: Alex Chiang <achiang@hp.com>
> Date:   Tue Apr 29 15:05:29 2008 -0700
> 
>     [IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id
>     
>     Legacy HP ia64 platforms currently cannot provide
>     /proc/cpuinfo/physical_id due to legacy SAL/PAL implementations.
>     However, that physical topology information can be obtained
>     via ACPI.
>     
>     Provide an interface that gives ACPI one last chance to provide
>     physical_id for these legacy platforms. This logic only comes
>     into play iff:
>     
>     - ACPI actually provides slot information for the CPU
>     - we lack a valid socket_id
>     
>     Otherwise, we don't do anything.
>     
>     Since x86 uses the ACPI processor driver as well, we provide a nop
>     stub function for arch_fix_phys_package_id() in asm-x86/topology.h
>     
>     Signed-off-by: Alex Chiang <achiang@hp.com>
>     Signed-off-by: Tony Luck <tony.luck@intel.com>
> 
> diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
> index a2484fc..abb17a6 100644
> --- a/arch/ia64/kernel/topology.c
> +++ b/arch/ia64/kernel/topology.c
> @@ -27,6 +27,15 @@
>  
>  static struct ia64_cpu *sysfs_cpus;
>  
> +void arch_fix_phys_package_id(int num, u32 slot)
> +{
> +#ifdef CONFIG_SMP
> +	if (cpu_data(num)->socket_id == -1)
> +		cpu_data(num)->socket_id = slot;
> +#endif
> +}
> +EXPORT_SYMBOL_GPL(arch_fix_phys_package_id);
> +
>  int arch_register_cpu(int num)
>  {
>  #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)
> diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
> index dd28c91..5241e3f 100644
> --- a/drivers/acpi/processor_core.c
> +++ b/drivers/acpi/processor_core.c
> @@ -603,6 +603,15 @@ static int acpi_processor_get_info(struct acpi_processor *pr, unsigned has_uid)
>  		request_region(pr->throttling.address, 6, "ACPI CPU throttle");
>  	}
>  
> +	/*
> +	 * If ACPI describes a slot number for this CPU, we can use it
> +	 * ensure we get the right value in the "physical id" field
> +	 * of /proc/cpuinfo
> +	 */
> +	status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer);
> +	if (ACPI_SUCCESS(status))
> +		arch_fix_phys_package_id(pr->id, object.integer.value);
> +
>  	return 0;
>  }
>  
> diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h
> index f2f72ef..32863b3 100644
> --- a/include/asm-ia64/topology.h
> +++ b/include/asm-ia64/topology.h
> @@ -116,6 +116,8 @@ void build_cpu_to_node_map(void);
>  #define smt_capable() 				(smp_num_siblings > 1)
>  #endif
>  
> +extern void arch_fix_phys_package_id(int num, u32 slot);
> +
>  #define pcibus_to_cpumask(bus)	(pcibus_to_node(bus) == -1 ? \
>  					CPU_MASK_ALL : \
>  					node_to_cpumask(pcibus_to_node(bus)) \
> diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
> index 0e6d6b0..4f35a0f 100644
> --- a/include/asm-x86/topology.h
> +++ b/include/asm-x86/topology.h
> @@ -193,6 +193,10 @@ extern cpumask_t cpu_coregroup_map(int cpu);
>  #define topology_thread_siblings(cpu)		(per_cpu(cpu_sibling_map, cpu))
>  #endif
>  
> +static inline void arch_fix_phys_package_id(int num, u32 slot)
> +{
> +}
> +
>  struct pci_bus;
>  void set_pci_bus_resources_arch_default(struct pci_bus *b);
>  
> 
> 

      reply	other threads:[~2008-04-29 23:20 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-10 22:27 [PATCH, RFC] Create 'slot' sysfs attribute in /sys/devices/system/cpu/cpuN/topology/ Alex Chiang
2008-03-11 17:31 ` [PATCH, RFC] Create 'slot' sysfs attribute in/sys/devices/system/cpu/cpuN/topology/ Luck, Tony
2008-03-11 17:48   ` Matthew Wilcox
2008-03-12 15:45   ` Alex Chiang
2008-03-12 21:42 ` Luck, Tony
2008-03-19 23:31   ` Alex Chiang
2008-03-21 23:58     ` [PATCH, RFC] Create 'slot' sysfs attributein/sys/devices/system/cpu/cpuN/topology/ Luck, Tony
2008-03-26 18:59       ` Alex Chiang
2008-04-21  5:24         ` Alex Chiang
2008-04-21 22:00           ` [PATCH, RFC] Create 'slot' sysfsattributein/sys/devices/system/cpu/cpuN/topology/ Luck, Tony
2008-04-24 18:44             ` Alex Chiang
2008-04-24 18:51               ` [PATCH 1/2] ia64: Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO Alex Chiang
2008-04-24 18:57                 ` Alex Chiang
2008-04-24 18:52               ` [PATCH 2/2] ia64: Provide ACPI fixup for /proc/cpuinfo/physical_id Alex Chiang
2008-04-24 18:57                 ` Alex Chiang
2008-04-29 22:32                 ` Luck, Tony
2008-04-29 23:20                   ` Alex Chiang [this message]

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=20080429232037.GA3820@ldl.fc.hp.com \
    --to=achiang@hp.com \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tony.luck@intel.com \
    --subject='Re: [PATCH 2/2] ia64: Provide ACPI fixup for /proc/cpuinfo/physical_id' \
    /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

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).