Commit f0f4c343 authored by Aaron Durbin's avatar Aaron Durbin Committed by Andi Kleen
Browse files

[PATCH] i386: add HPET(s) into resource map 



Add HPET(s) into resource map. This will allow for the HPET(s) to be
visibile within /proc/iomem.

Signed-off-by: default avatarAaron Durbin <adurbin@google.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 54dbc0c9

arch/i386/kernel/acpi/boot.c

+26 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <linux/module.h>

#include <linux/dmi.h>

#include <linux/irq.h>

#include <linux/bootmem.h>

#include <linux/ioport.h>



#include <asm/pgtable.h>

#include <asm/io_apic.h>
@@ -646,6 +648,8 @@ static int __init acpi_parse_sbf(unsigned long phys_addr, unsigned long size) 
static int __init acpi_parse_hpet(unsigned long phys, unsigned long size)

{

	struct acpi_table_hpet *hpet_tbl;

	struct resource *hpet_res;

	resource_size_t res_start;



	if (!phys || !size)

		return -EINVAL;
@@ -661,12 +665,26 @@ static int __init acpi_parse_hpet(unsigned long phys, unsigned long size) 
		       "memory.\n");

		return -1;

	}



#define HPET_RESOURCE_NAME_SIZE 9

	hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE);

	if (hpet_res) {

		memset(hpet_res, 0, sizeof(*hpet_res));

		hpet_res->name = (void *)&hpet_res[1];

		hpet_res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;

		snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE,

			 "HPET %u", hpet_tbl->number);

		hpet_res->end = (1 * 1024) - 1;

	}



#ifdef	CONFIG_X86_64

	vxtime.hpet_address = hpet_tbl->addr.addrl |

	    ((long)hpet_tbl->addr.addrh << 32);



	printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",

	       hpet_tbl->id, vxtime.hpet_address);



	res_start = vxtime.hpet_address;

#else				/* X86 */

	{

		extern unsigned long hpet_address;
@@ -674,9 +692,17 @@ static int __init acpi_parse_hpet(unsigned long phys, unsigned long size) 
		hpet_address = hpet_tbl->addr.addrl;

		printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",

		       hpet_tbl->id, hpet_address);



		res_start = hpet_address;

	}

#endif				/* X86 */



	if (hpet_res) {

		hpet_res->start = res_start;

		hpet_res->end += res_start;

		insert_resource(&iomem_resource, hpet_res);

	}



	return 0;

}

#else