linux-toradex.git/kernel/resource.c, branch v2.6.34-rc3

resources: add interfaces that return conflict information

2010-03-23T20:33:50+00:00

request_resource() and insert_resource() only return success or failure,
which no information about what existing resource conflicted with the
proposed new reservation.  This patch adds request_resource_conflict()
and insert_resource_conflict(), which return the conflicting resource.

Callers may use this for better error messages or to adjust the new
resource and retry the request.

Signed-off-by: Bjorn Helgaas 
Signed-off-by: Jesse Barnes

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-03-03T17:11:02+00:00

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  resource: Fix broken indentation
  resource: Fix generic page_is_ram() for partial RAM pages
  x86, paravirt: Remove kmap_atomic_pte paravirt op.
  x86, vmi: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y
  x86, xen: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y

resource: Fix broken indentation

2010-03-02T19:21:09+00:00

Fix broken indentation in patch
37b99dd5372cff42f83210c280f314f10f99138e.

Reported-by: Linus Torvalds 
Cc: Wu Fengguang 
LKML-Reference: <20100301135551.GA9998@localhost>
Signed-off-by: H. Peter Anvin

resource: Fix generic page_is_ram() for partial RAM pages

2010-03-01T18:18:32+00:00

The System RAM walk shall skip partial RAM pages and avoid calling
func() on them. So that page_is_ram() return 0 for a partial RAM page.

In particular, it shall not call func() with len=0.
This fixes a boot time bug reported by Sachin and root caused by Thomas:

> >>> WARNING: at arch/x86/mm/ioremap.c:111 __ioremap_caller+0x169/0x2f1()
> >>> Hardware name: BladeCenter LS21 -[79716AA]-
> >>> Modules linked in:
> >>> Pid: 0, comm: swapper Not tainted 2.6.33-git6-autotest #1
> >>> Call Trace:
> >>> [] ? __ioremap_caller+0x169/0x2f1
> >>> [] warn_slowpath_common+0x77/0xa4
> >>> [] warn_slowpath_null+0xf/0x11
> >>> [] __ioremap_caller+0x169/0x2f1
> >>> [] ? acpi_os_map_memory+0x12/0x1b
> >>> [] ioremap_nocache+0x12/0x14
> >>> [] acpi_os_map_memory+0x12/0x1b
> >>> [] acpi_tb_verify_table+0x29/0x5b
> >>> [] acpi_load_tables+0x39/0x15a
> >>> [] acpi_early_init+0x60/0xf5
> >>> [] start_kernel+0x397/0x3a7
> >>> [] x86_64_start_reservations+0xa5/0xa9
> >>> [] x86_64_start_kernel+0xe1/0xe8
> >>> ---[ end trace 4eaa2a86a8e2da22 ]---
> >>> ioremap reserve_memtype failed -22

The return code is -EINVAL, so it failed in the is_ram check, which is
not too surprising

> BIOS-provided physical RAM map:
>  BIOS-e820: 0000000000000000 - 000000000009c000 (usable)
>  BIOS-e820: 000000000009c000 - 00000000000a0000 (reserved)
>  BIOS-e820: 00000000000e0000 - 0000000000100000 (reserved)
>  BIOS-e820: 0000000000100000 - 00000000cffa3900 (usable)
>  BIOS-e820: 00000000cffa3900 - 00000000cffa7400 (ACPI data)

The ACPI data is not starting on a page boundary and neither does the
usable RAM area end on a page boundary. Very useful !

> ACPI: DSDT 00000000cffa3900 036CE (v01 IBM    SERLEWIS 00001000 INTL 20060912)

ACPI is trying to map DSDT at cffa3900, which results in a check
vs. cffa3000 which is the relevant page boundary. The generic is_ram
check correctly identifies that as RAM because it's in the usable
resource area. The old e820 based is_ram check does not take
overlapping resource areas into account. That's why it works.

CC: Sachin Sant 
CC: Thomas Gleixner 
CC: KAMEZAWA Hiroyuki 
Signed-off-by: Wu Fengguang 
LKML-Reference: <20100301135551.GA9998@localhost>
Signed-off-by: H. Peter Anvin

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-02-28T18:38:45+00:00

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mm: Unify kernel_physical_mapping_init() API
  x86, mm: Allow highmem user page tables to be disabled at boot time
  x86: Do not reserve brk for DMI if it's not going to be used
  x86: Convert tlbstate_lock to raw_spinlock
  x86: Use the generic page_is_ram()
  x86: Remove BIOS data range from e820
  Move page_is_ram() declaration to mm.h
  Generic page_is_ram: use __weak
  resources: introduce generic page_is_ram()

resource: add release_child_resources

2010-02-23T00:17:00+00:00

Useful for freeing a portion of the resource tree, e.g. when trying to
reallocate resources more efficiently.

Signed-off-by: Yinghai Lu 
Acked-by: Linus Torvalds 
Signed-off-by: Jesse Barnes

resource/PCI: mark struct resource as const

2010-02-23T00:16:57+00:00

Now that we return the new resource start position, there is no
need to update "struct resource" inside the align function.
Therefore, mark the struct resource as const.

Cc: Bjorn Helgaas 
Cc: Yinghai Lu 
Signed-off-by: Dominik Brodowski 
Signed-off-by: Jesse Barnes

resource/PCI: align functions now return start of resource

2010-02-23T00:16:56+00:00

As suggested by Linus, align functions should return the start
of a resource, not void. An update of "res->start" is no longer
necessary.

Cc: Bjorn Helgaas 
Cc: Yinghai Lu 
Signed-off-by: Dominik Brodowski 
Signed-off-by: Jesse Barnes

Merge branch 'linus' into x86/mm

2010-02-17T17:28:05+00:00

x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.

Signed-off-by: Thomas Gleixner

Generic page_is_ram: use __weak

2010-02-02T00:58:17+00:00

Use __weak instead of __attribute__((weak)).

Cc: Wu Fengguang 
Signed-off-by: Andrew Morton 
Signed-off-by: H. Peter Anvin