Attachment #3670 for bug #3297

Lines 478-483 acpi_scan_rsdp ( Link Here

(-)a-2.6.7/arch/i386/kernel/acpi/boot.c (+18 lines)
478	{	478	{
479	unsigned long offset = 0;	479	unsigned long offset = 0;
480	unsigned long sig_len = sizeof("RSD PTR ") - 1;	480	unsigned long sig_len = sizeof("RSD PTR ") - 1;
		481	unsigned long rsdp;
		482	int ret;
		483	void *p;
481		484
482	/*	485	/*
483	* Scan all 16-byte boundaries of the physical memory region for the	486	* Scan all 16-byte boundaries of the physical memory region for the
Lines 486-491 acpi_scan_rsdp ( Link Here
486	for (offset = 0; offset < length; offset += 16) {	489	for (offset = 0; offset < length; offset += 16) {
487	if (strncmp((char *) (start + offset), "RSD PTR ", sig_len))	490	if (strncmp((char *) (start + offset), "RSD PTR ", sig_len))
488	continue;	491	continue;
		492	p = (void*)(start + offset);
		493	rsdp = ((u32)(p + 16));
		494	if (rsdp == 0 \|\| rsdp > (1UL<<16)) {
		495	printk(KERN_WARNING "Wrong RSDP!! 0x%lx\n",rsdp);
		496	continue;
		497	}
		498	if ((((u8)(p+15))) == 2) {
		499	ret = acpi_table_compute_checksum(p, (((u32)(p+20))));
		500	} else {
		501	ret = acpi_table_compute_checksum(p, 20);
		502	}
		503	if (ret) {
		504	printk(KERN_WARNING "RSDP Checksum Error! \n");
		505	continue;
		506	}
489	return (start + offset);	507	return (start + offset);
490	}	508	}
491		509




}


int
acpi_table_compute_checksum (
	void			*table_pointer,
	unsigned long		length)

{
	struct acpi_table_rsdp	*rsdp = NULL;
	unsigned long		rsdp_phys = 0;
	int			result = 0;

	/* Locate and map the Root System Description Table (RSDP) */
	/* Search until first one that is sane*/
	rsdp_phys = acpi_find_rsdp();
	if (!rsdp_phys) {
		printk(KERN_ERR PREFIX "Unable to locate RSDP\n");

	printk(KERN_INFO PREFIX "RSDP (v%3.3d %6.6s                                    ) @ 0x%p\n",
		rsdp->revision, rsdp->oem_id, (void *) rsdp_phys);

	if (rsdp->revision < 2)
		result = acpi_table_compute_checksum(rsdp, sizeof(struct acpi_table_rsdp));
	else
		result = acpi_table_compute_checksum(rsdp, ((struct acpi20_table_rsdp *)rsdp)->length);

	if (result) {
		printk(KERN_WARNING "  >>> ERROR: Invalid checksum\n");
		return -ENODEV;
	}

	/* Locate and map the System Description table (RSDT/XSDT) */

	if (acpi_table_get_sdt(rsdp))

Lines 389-394 int acpi_table_parse_srat (enum acpi_sra Link Here

(-)a-2.6.7/include/linux/acpi.h (+1 lines)
389	void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr);	389	void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr);
390	void acpi_table_print_madt_entry (acpi_table_entry_header *madt);	390	void acpi_table_print_madt_entry (acpi_table_entry_header *madt);
391	void acpi_table_print_srat_entry (acpi_table_entry_header *srat);	391	void acpi_table_print_srat_entry (acpi_table_entry_header *srat);
		392	int acpi_table_compute_checksum(void *table_pointer, unsigned long length);
392		393
393	/* the following four functions are architecture-dependent */	394	/* the following four functions are architecture-dependent */
394	void acpi_numa_slit_init (struct acpi_table_slit *slit);	395	void acpi_numa_slit_init (struct acpi_table_slit *slit);

Return to bug 3297

Lines 218-224 acpi_table_print_madt_entry ( Link Here

(-)a-2.6.7/drivers/acpi/tables.c (-13 / +2 lines)
218	}	218	}
219		219
220		220
221	static int	221	int
222	acpi_table_compute_checksum (	222	acpi_table_compute_checksum (
223	void *table_pointer,	223	void *table_pointer,
224	unsigned long length)	224	unsigned long length)
Lines 571-580 acpi_table_init (void) Link Here
571	{	571	{
572	struct acpi_table_rsdp *rsdp = NULL;	572	struct acpi_table_rsdp *rsdp = NULL;
573	unsigned long rsdp_phys = 0;	573	unsigned long rsdp_phys = 0;
574	int result = 0;
575		574
576	/* Locate and map the Root System Description Table (RSDP) */	575	/* Locate and map the Root System Description Table (RSDP) */
577		576	/* Search until first one that is sane*/
578	rsdp_phys = acpi_find_rsdp();	577	rsdp_phys = acpi_find_rsdp();
579	if (!rsdp_phys) {	578	if (!rsdp_phys) {
580	printk(KERN_ERR PREFIX "Unable to locate RSDP\n");	579	printk(KERN_ERR PREFIX "Unable to locate RSDP\n");
Lines 590-605 acpi_table_init (void) Link Here
590	printk(KERN_INFO PREFIX "RSDP (v%3.3d %6.6s ) @ 0x%p\n",	589	printk(KERN_INFO PREFIX "RSDP (v%3.3d %6.6s ) @ 0x%p\n",
591	rsdp->revision, rsdp->oem_id, (void *) rsdp_phys);	590	rsdp->revision, rsdp->oem_id, (void *) rsdp_phys);
592		591
593	if (rsdp->revision < 2)
594	result = acpi_table_compute_checksum(rsdp, sizeof(struct acpi_table_rsdp));
595	else
596	result = acpi_table_compute_checksum(rsdp, ((struct acpi20_table_rsdp *)rsdp)->length);
597
598	if (result) {
599	printk(KERN_WARNING " >>> ERROR: Invalid checksum\n");
600	return -ENODEV;
601	}
602
603	/* Locate and map the System Description table (RSDT/XSDT) */	592	/* Locate and map the System Description table (RSDT/XSDT) */
604		593
605	if (acpi_table_get_sdt(rsdp))	594	if (acpi_table_get_sdt(rsdp))