hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-acpi-fixes' into WIP.x86/pti.base 

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2017-12-17 13:09:31 +01:00
parent 650400b2cc 4f89fa286f
commit 2ec077c186
3 changed files with 33 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm64/include/asm/fixmap.h
View File

@ -51,6 +51,13 @@ enum fixed_addresses {
FIX_EARLYCON_MEM_BASE, FIX_EARLYCON_MEM_BASE,
FIX_TEXT_POKE0, FIX_TEXT_POKE0,
#ifdef CONFIG_ACPI_APEI_GHES
/* Used for GHES mapping from assorted contexts */
FIX_APEI_GHES_IRQ,
FIX_APEI_GHES_NMI,
#endif /* CONFIG_ACPI_APEI_GHES */
__end_of_permanent_fixed_addresses, __end_of_permanent_fixed_addresses,
/* /*

6
arch/x86/include/asm/fixmap.h
View File

@ -104,6 +104,12 @@ enum fixed_addresses {
FIX_GDT_REMAP_BEGIN, FIX_GDT_REMAP_BEGIN,
FIX_GDT_REMAP_END = FIX_GDT_REMAP_BEGIN + NR_CPUS - 1, FIX_GDT_REMAP_END = FIX_GDT_REMAP_BEGIN + NR_CPUS - 1,
#ifdef CONFIG_ACPI_APEI_GHES
/* Used for GHES mapping from assorted contexts */
FIX_APEI_GHES_IRQ,
FIX_APEI_GHES_NMI,
#endif
__end_of_permanent_fixed_addresses, __end_of_permanent_fixed_addresses,
/* /*

78
drivers/acpi/apei/ghes.c
View File

@ -51,6 +51,7 @@
#include <acpi/actbl1.h> #include <acpi/actbl1.h>
#include <acpi/ghes.h> #include <acpi/ghes.h>
#include <acpi/apei.h> #include <acpi/apei.h>
#include <asm/fixmap.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <ras/ras_event.h> #include <ras/ras_event.h>
@ -112,7 +113,7 @@ static DEFINE_MUTEX(ghes_list_mutex);
* Because the memory area used to transfer hardware error information * Because the memory area used to transfer hardware error information
* from BIOS to Linux can be determined only in NMI, IRQ or timer * from BIOS to Linux can be determined only in NMI, IRQ or timer
* handler, but general ioremap can not be used in atomic context, so * handler, but general ioremap can not be used in atomic context, so
* a special version of atomic ioremap is implemented for that. * the fixmap is used instead.
*/ */
/* /*
@ -126,8 +127,8 @@ static DEFINE_MUTEX(ghes_list_mutex);
/* virtual memory area for atomic ioremap */ /* virtual memory area for atomic ioremap */
static struct vm_struct *ghes_ioremap_area; static struct vm_struct *ghes_ioremap_area;
/* /*
* These 2 spinlock is used to prevent atomic ioremap virtual memory * These 2 spinlocks are used to prevent the fixmap entries from being used
* area from being mapped simultaneously. * simultaneously.
*/ */
static DEFINE_RAW_SPINLOCK(ghes_ioremap_lock_nmi); static DEFINE_RAW_SPINLOCK(ghes_ioremap_lock_nmi);
static DEFINE_SPINLOCK(ghes_ioremap_lock_irq); static DEFINE_SPINLOCK(ghes_ioremap_lock_irq);
@ -159,52 +160,36 @@ static void ghes_ioremap_exit(void)
static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn) static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn)
{ {
unsigned long vaddr;
phys_addr_t paddr; phys_addr_t paddr;
pgprot_t prot; pgprot_t prot;
vaddr = (unsigned long)GHES_IOREMAP_NMI_PAGE(ghes_ioremap_area->addr);
paddr = pfn << PAGE_SHIFT; paddr = pfn << PAGE_SHIFT;
prot = arch_apei_get_mem_attribute(paddr); prot = arch_apei_get_mem_attribute(paddr);
ioremap_page_range(vaddr, vaddr + PAGE_SIZE, paddr, prot); __set_fixmap(FIX_APEI_GHES_NMI, paddr, prot);
return (void __iomem *)vaddr; return (void __iomem *) fix_to_virt(FIX_APEI_GHES_NMI);
} }
static void __iomem *ghes_ioremap_pfn_irq(u64 pfn) static void __iomem *ghes_ioremap_pfn_irq(u64 pfn)
{ {
unsigned long vaddr, paddr; phys_addr_t paddr;
pgprot_t prot; pgprot_t prot;
vaddr = (unsigned long)GHES_IOREMAP_IRQ_PAGE(ghes_ioremap_area->addr);
paddr = pfn << PAGE_SHIFT; paddr = pfn << PAGE_SHIFT;
prot = arch_apei_get_mem_attribute(paddr); prot = arch_apei_get_mem_attribute(paddr);
__set_fixmap(FIX_APEI_GHES_IRQ, paddr, prot);
ioremap_page_range(vaddr, vaddr + PAGE_SIZE, paddr, prot); return (void __iomem *) fix_to_virt(FIX_APEI_GHES_IRQ);
return (void __iomem *)vaddr;
} }
static void ghes_iounmap_nmi(void __iomem *vaddr_ptr) static void ghes_iounmap_nmi(void)
{ {
unsigned long vaddr = (unsigned long __force)vaddr_ptr; clear_fixmap(FIX_APEI_GHES_NMI);
void *base = ghes_ioremap_area->addr;
BUG_ON(vaddr != (unsigned long)GHES_IOREMAP_NMI_PAGE(base));
unmap_kernel_range_noflush(vaddr, PAGE_SIZE);
arch_apei_flush_tlb_one(vaddr);
} }
static void ghes_iounmap_irq(void __iomem *vaddr_ptr) static void ghes_iounmap_irq(void)
{ {
unsigned long vaddr = (unsigned long __force)vaddr_ptr; clear_fixmap(FIX_APEI_GHES_IRQ);
void *base = ghes_ioremap_area->addr;
BUG_ON(vaddr != (unsigned long)GHES_IOREMAP_IRQ_PAGE(base));
unmap_kernel_range_noflush(vaddr, PAGE_SIZE);
arch_apei_flush_tlb_one(vaddr);
} }
static int ghes_estatus_pool_init(void) static int ghes_estatus_pool_init(void)
@ -360,10 +345,10 @@ static void ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len,
paddr += trunk; paddr += trunk;
buffer += trunk; buffer += trunk;
if (in_nmi) { if (in_nmi) {
ghes_iounmap_nmi(vaddr); ghes_iounmap_nmi();
raw_spin_unlock(&ghes_ioremap_lock_nmi); raw_spin_unlock(&ghes_ioremap_lock_nmi);
} else { } else {
ghes_iounmap_irq(vaddr); ghes_iounmap_irq();
spin_unlock_irqrestore(&ghes_ioremap_lock_irq, flags); spin_unlock_irqrestore(&ghes_ioremap_lock_irq, flags);
} }
} }
@ -851,17 +836,8 @@ static void ghes_sea_remove(struct ghes *ghes)
synchronize_rcu(); synchronize_rcu();
} }
#else /* CONFIG_ACPI_APEI_SEA */ #else /* CONFIG_ACPI_APEI_SEA */
static inline void ghes_sea_add(struct ghes *ghes) static inline void ghes_sea_add(struct ghes *ghes) { }
{ static inline void ghes_sea_remove(struct ghes *ghes) { }
pr_err(GHES_PFX "ID: %d, trying to add SEA notification which is not supported\n",
ghes->generic->header.source_id);
}
static inline void ghes_sea_remove(struct ghes *ghes)
{
pr_err(GHES_PFX "ID: %d, trying to remove SEA notification which is not supported\n",
ghes->generic->header.source_id);
}
#endif /* CONFIG_ACPI_APEI_SEA */ #endif /* CONFIG_ACPI_APEI_SEA */
#ifdef CONFIG_HAVE_ACPI_APEI_NMI #ifdef CONFIG_HAVE_ACPI_APEI_NMI
@ -1063,23 +1039,9 @@ static void ghes_nmi_init_cxt(void)
init_irq_work(&ghes_proc_irq_work, ghes_proc_in_irq); init_irq_work(&ghes_proc_irq_work, ghes_proc_in_irq);
} }
#else /* CONFIG_HAVE_ACPI_APEI_NMI */ #else /* CONFIG_HAVE_ACPI_APEI_NMI */
static inline void ghes_nmi_add(struct ghes *ghes) static inline void ghes_nmi_add(struct ghes *ghes) { }
{ static inline void ghes_nmi_remove(struct ghes *ghes) { }
pr_err(GHES_PFX "ID: %d, trying to add NMI notification which is not supported!\n", static inline void ghes_nmi_init_cxt(void) { }
ghes->generic->header.source_id);
BUG();
}
static inline void ghes_nmi_remove(struct ghes *ghes)
{
pr_err(GHES_PFX "ID: %d, trying to remove NMI notification which is not supported!\n",
ghes->generic->header.source_id);
BUG();
}
static inline void ghes_nmi_init_cxt(void)
{
}
#endif /* CONFIG_HAVE_ACPI_APEI_NMI */ #endif /* CONFIG_HAVE_ACPI_APEI_NMI */
static int ghes_probe(struct platform_device *ghes_dev) static int ghes_probe(struct platform_device *ghes_dev)