|
@@ -685,10 +685,14 @@ static int __init pmc_core_probe(void)
|
|
|
if (pmcdev->map == &spt_reg_map && !pci_dev_present(pmc_pci_ids))
|
|
if (pmcdev->map == &spt_reg_map && !pci_dev_present(pmc_pci_ids))
|
|
|
pmcdev->map = &cnp_reg_map;
|
|
pmcdev->map = &cnp_reg_map;
|
|
|
|
|
|
|
|
- if (lpit_read_residency_count_address(&slp_s0_addr))
|
|
|
|
|
|
|
+ if (lpit_read_residency_count_address(&slp_s0_addr)) {
|
|
|
pmcdev->base_addr = PMC_BASE_ADDR_DEFAULT;
|
|
pmcdev->base_addr = PMC_BASE_ADDR_DEFAULT;
|
|
|
- else
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (page_is_ram(PHYS_PFN(pmcdev->base_addr)))
|
|
|
|
|
+ return -ENODEV;
|
|
|
|
|
+ } else {
|
|
|
pmcdev->base_addr = slp_s0_addr - pmcdev->map->slp_s0_offset;
|
|
pmcdev->base_addr = slp_s0_addr - pmcdev->map->slp_s0_offset;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
pmcdev->regbase = ioremap(pmcdev->base_addr,
|
|
pmcdev->regbase = ioremap(pmcdev->base_addr,
|
|
|
pmcdev->map->regmap_length);
|
|
pmcdev->map->regmap_length);
|