Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bb45e394e21eb2abc710ad43d98ebac1069bf355

Authored by Rafael J. Wysocki
1 parent 13606a2de1
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ACPI / PM: Use existing ACPI iomaps for NVS save/restore (v2) 

Modify the NVS save/restore code to use acpi_os_get_iomem() and
acpi_os_unmap_memory() to acquire and release references to ACPI
iomaps, respectively.  If there's no ACPI iomap corresponding to the
given NVS page, acpi_os_ioremap() is used to map that page and
iounmap() is used to unmap it during resume.  [If the page is not
present in the ACPI iomaps already, it doesn't make sense to add its
mapping to the list of ACPI iomaps, because it's going to be thrown
away during the subsequent resume anyway.]

Testing on my HP nx6325 shows that approx. 90% of the NVS pages
have already been mapped by ACPI before suspend and are present in
the ACPI iomaps, so this change appears to be the right thing to do
in general.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

Showing 1 changed file with 19 additions and 3 deletions Side-by-side Diff

... ... @@ -26,6 +26,7 @@
26 26 unsigned int size;
27 27 void *kaddr;
28 28 void *data;
  29 + bool unmap;
29 30 struct list_head node;
30 31 };
31 32  
... ... @@ -44,6 +45,9 @@
44 45 {
45 46 struct nvs_page *entry, *next;
46 47  
  48 + pr_info("PM: Registering ACPI NVS region at %lx (%ld bytes)\n",
  49 + start, size);
  50 +
47 51 while (size > 0) {
48 52 unsigned int nr_bytes;
49 53  
... ... @@ -81,7 +85,13 @@
81 85 free_page((unsigned long)entry->data);
82 86 entry->data = NULL;
83 87 if (entry->kaddr) {
84   - iounmap(entry->kaddr);
  88 + if (entry->unmap) {
  89 + iounmap(entry->kaddr);
  90 + entry->unmap = false;
  91 + } else {
  92 + acpi_os_unmap_memory(entry->kaddr,
  93 + entry->size);
  94 + }
85 95 entry->kaddr = NULL;
86 96 }
87 97 }
... ... @@ -115,8 +125,14 @@
115 125  
116 126 list_for_each_entry(entry, &nvs_list, node)
117 127 if (entry->data) {
118   - entry->kaddr = acpi_os_ioremap(entry->phys_start,
119   - entry->size);
  128 + unsigned long phys = entry->phys_start;
  129 + unsigned int size = entry->size;
  130 +
  131 + entry->kaddr = acpi_os_get_iomem(phys, size);
  132 + if (!entry->kaddr) {
  133 + entry->kaddr = acpi_os_ioremap(phys, size);
  134 + entry->unmap = !!entry->kaddr;
  135 + }
120 136 if (!entry->kaddr) {
121 137 suspend_nvs_free();
122 138 return -ENOMEM;