Subject: Re: linux-next: manual merge of the uuid tree with the arm64 tree

From: "Baicar, Tyler" <[email-masked]>
Date: Tue, 20 Jun 2017 12:26:01 -0600

On 6/20/2017 12:20 PM, Will Deacon wrote:
> On Tue, Jun 20, 2017 at 12:13:13PM -0600, Baicar, Tyler wrote:
>> I have sent you the rebased patches. I took Christoph's uuid-types tree and
>> added this patch onto it:
>>
>> 7bf130e4a065 ("ACPI/APEI: Handle GSIV and GPIO notification types")
>>
>> And then added my patches onto that. This will hopefully now avoid conflicts
>> with any other patch.
> No, patch 6 fails to apply:
>
> On Tue, Jun 20, 2017 at 12:07:27PM -0600, Tyler Baicar wrote:
>> diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
>> index 7e3ddbe..81ebb9b 100644
>> --- a/drivers/acpi/apei/ghes.c
>> +++ b/drivers/acpi/apei/ghes.c
>> @@ -116,11 +116,7 @@ static inline bool is_hest_type_generic_v2(struct ghes *ghes)
>>    * Two virtual pages are used, one for IRQ/PROCESS context, the other for
>>    * NMI context (optionally).
>>    */
>> -#ifdef CONFIG_HAVE_ACPI_APEI_NMI
>>   #define GHES_IOREMAP_PAGES           2
>> -#else
>> -#define GHES_IOREMAP_PAGES           1
>> -#endif
>>   #define GHES_IOREMAP_IRQ_PAGE(base)	(base)
>>   #define GHES_IOREMAP_NMI_PAGE(base)	((base) + PAGE_SIZE)
>>   
>> @@ -159,10 +155,14 @@ static void ghes_ioremap_exit(void)
>>   static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn)
>>   {
>>   	unsigned long vaddr;
>> +	phys_addr_t paddr;
>> +	pgprot_t prot;
>>   
>>   	vaddr = (unsigned long)GHES_IOREMAP_NMI_PAGE(ghes_ioremap_area->addr);
>> -	ioremap_page_range(vaddr, vaddr + PAGE_SIZE,
>> -			   pfn << PAGE_SHIFT, PAGE_KERNEL);
>> +
>> +	paddr = pfn << PAGE_SHIFT;
>> +	prot = arch_apei_get_mem_attribute(paddr);
>> +	ioremap_page_range(vaddr, vaddr + PAGE_SIZE, paddr, prot);
>>   
>>   	return (void __iomem *)vaddr;
>>   }
>> @@ -774,6 +774,50 @@ static int ghes_notify_hed(struct notifier_block *this, unsigned long event,
>>   	.notifier_call = ghes_notify_hed,
> In Christoph's tree, this line is:
>
> 	.notifier_call = ghes_notify_sci,
>
> http://git.infradead.org/users/hch/uuid.git/blob/refs/heads/uuid-types:/drivers/acpi/apei/ghes.c#l720
>
> so something still isn't right. What did you actually base your patches
> on?
Yes, that line is changed in this patch 7bf130e4a065 ("ACPI/APEI: Handle 
GSIV and GPIO notification types")

It is the other patch that was conflicting with this patch series when 
we tried to marge although it was a trivial conflict. I applied this 
patch to Christoph's tree and then put my patches on top of that.

commit 7bf130e4a0653f6cec83a387de5de0c2c9fa4dba
Author: Shiju Jose <[email-masked]>
Date:   Fri May 19 11:39:11 2017 +0200

     ACPI/APEI: Handle GSIV and GPIO notification types

     System Controller Interrupts are received by ACPI's error device, which
     in turn notifies the GHES code. The same is true of APEI's GSIV and
     GPIO notification types. Add support for GSIV and GPIO sharing the SCI
     register/unregister/notifier code. Rename the list and notifier to show
     this is no longer just SCI, but anything from the Hardware Error 
Device.

     Signed-off-by: Shiju Jose <[email-masked]>
     [ Rewrite commit log. ]
     Signed-off-by: James Morse <[email-masked]>
     [ Some small cleanups ontop. ]
     Signed-off-by: Borislav Petkov <[email-masked]>
     Tested-by: Tyler Baicar <[email-masked]>
     Reviewed-by: James Morse <[email-masked]>
     Link: 
http://lkml.kernel.org/r/[email-masked]
     Cc: "Guohanjun (Hanjun Guo)" <[email-masked]>
     Cc: "Rafael J. Wysocki" <[email-masked]>
     Cc: "Zhengqiang (turing)" <[email-masked]>
     Cc: "[email-masked]" <[email-masked]>
     Cc: "xuwei (O)" <[email-masked]>
     Cc: Gabriele Paoloni <[email-masked]>
     Cc: Geliang Tang <[email-masked]>
     Cc: John Garry <[email-masked]>
     Cc: Len Brown <[email-masked]>
     Cc: Prarit Bhargava <[email-masked]>
     Cc: Punit Agrawal <[email-masked]>
     Cc: [email-masked]
     Signed-off-by: Thomas Gleixner <[email-masked]>

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index d0855c0..d2c8a92 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -89,14 +89,14 @@
  module_param_named(disable, ghes_disable, bool, 0);

  /*
- * All error sources notified with SCI shares one notifier function,
- * so they need to be linked and checked one by one.  This is applied
- * to NMI too.
+ * All error sources notified with HED (Hardware Error Device) share a
+ * single notifier callback, so they need to be linked and checked one
+ * by one. This holds true for NMI too.
   *
   * RCU is used for these lists, so ghes_list_mutex is only used for
   * list changing, not for traversing.
   */
-static LIST_HEAD(ghes_sci);
+static LIST_HEAD(ghes_hed);
  static DEFINE_MUTEX(ghes_list_mutex);

  /*
@@ -702,14 +702,14 @@ static irqreturn_t ghes_irq_func(int irq, void *data)
      return IRQ_HANDLED;
  }

-static int ghes_notify_sci(struct notifier_block *this,
-                  unsigned long event, void *data)
+static int ghes_notify_hed(struct notifier_block *this, unsigned long 
event,
+               void *data)
  {
      struct ghes *ghes;
      int ret = NOTIFY_DONE;

      rcu_read_lock();
-    list_for_each_entry_rcu(ghes, &ghes_sci, list) {
+    list_for_each_entry_rcu(ghes, &ghes_hed, list) {
          if (!ghes_proc(ghes))
              ret = NOTIFY_OK;
      }
@@ -718,8 +718,8 @@ static int ghes_notify_sci(struct notifier_block *this,
      return ret;
  }

-static struct notifier_block ghes_notifier_sci = {
-    .notifier_call = ghes_notify_sci,
+static struct notifier_block ghes_notifier_hed = {
+    .notifier_call = ghes_notify_hed,
  };

  #ifdef CONFIG_HAVE_ACPI_APEI_NMI
@@ -966,7 +966,10 @@ static int ghes_probe(struct platform_device *ghes_dev)
      case ACPI_HEST_NOTIFY_POLLED:
      case ACPI_HEST_NOTIFY_EXTERNAL:
      case ACPI_HEST_NOTIFY_SCI:
+    case ACPI_HEST_NOTIFY_GSIV:
+    case ACPI_HEST_NOTIFY_GPIO:
          break;
+
      case ACPI_HEST_NOTIFY_NMI:
          if (!IS_ENABLED(CONFIG_HAVE_ACPI_APEI_NMI)) {
              pr_warn(GHES_PFX "Generic hardware error source: %d 
notified via NMI interrupt is not supported!\n",
@@ -1024,13 +1027,17 @@ static int ghes_probe(struct platform_device 
*ghes_dev)
              goto err_edac_unreg;
          }
          break;
+
      case ACPI_HEST_NOTIFY_SCI:
+    case ACPI_HEST_NOTIFY_GSIV:
+    case ACPI_HEST_NOTIFY_GPIO:
          mutex_lock(&ghes_list_mutex);
-        if (list_empty(&ghes_sci))
-            register_acpi_hed_notifier(&ghes_notifier_sci);
-        list_add_rcu(&ghes->list, &ghes_sci);
+        if (list_empty(&ghes_hed))
+            register_acpi_hed_notifier(&ghes_notifier_hed);
+        list_add_rcu(&ghes->list, &ghes_hed);
          mutex_unlock(&ghes_list_mutex);
          break;
+
      case ACPI_HEST_NOTIFY_NMI:
          ghes_nmi_add(ghes);
          break;
@@ -1066,14 +1073,18 @@ static int ghes_remove(struct platform_device 
*ghes_dev)
      case ACPI_HEST_NOTIFY_EXTERNAL:
          free_irq(ghes->irq, ghes);
          break;
+
      case ACPI_HEST_NOTIFY_SCI:
+    case ACPI_HEST_NOTIFY_GSIV:
+    case ACPI_HEST_NOTIFY_GPIO:
          mutex_lock(&ghes_list_mutex);
          list_del_rcu(&ghes->list);
-        if (list_empty(&ghes_sci))
-            unregister_acpi_hed_notifier(&ghes_notifier_sci);
+        if (list_empty(&ghes_hed))
+            unregister_acpi_hed_notifier(&ghes_notifier_hed);
          mutex_unlock(&ghes_list_mutex);
          synchronize_rcu();
          break;
+
      case ACPI_HEST_NOTIFY_NMI:
          ghes_nmi_remove(ghes);
          break;

-- 
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.