update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/parisc/hppb.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
 ** hppb.c:
3
4
 **      HP-PB bus driver for the NOVA and K-Class systems.
..
..
@@ -5,10 +6,6 @@
5
6
 **      (c) Copyright 2002 Ryan Bradetich
6
7
 **      (c) Copyright 2002 Hewlett-Packard Company
7
8
 **
8
-** This program is free software; you can redistribute it and/or modify
9
-** it under the terms of the GNU General Public License as published by
10
-** the Free Software Foundation; either version 2 of the License, or
11
-** (at your option) any later version.
12
9
 **
13
10
 */
14
11
 
..
..
@@ -22,6 +19,8 @@
22
19
 #include <asm/io.h>
23
20
 #include <asm/hardware.h>
24
21
 #include <asm/parisc-device.h>
22
+
23
+#include "iommu.h"
25
24
 
26
25
 struct hppb_card {
27
26
 	unsigned long hpa;
..
..
@@ -62,8 +61,6 @@
62
61
 		}
63
62
 		card = card->next;
64
63
 	}
65
-	printk(KERN_INFO "Found GeckoBoa at 0x%llx\n",
66
-			(unsigned long long) dev->hpa.start);
67
64
 
68
65
 	card->hpa = dev->hpa.start;
69
66
 	card->mmio_region.name = "HP-PB Bus";
..
..
@@ -73,10 +70,11 @@
73
70
 	card->mmio_region.end = gsc_readl(dev->hpa.start + IO_IO_HIGH) - 1;
74
71
 
75
72
 	status = ccio_request_resource(dev, &card->mmio_region);
76
-	if(status < 0) {
77
-		printk(KERN_ERR "%s: failed to claim HP-PB bus space (%pR)\n",
78
-			__FILE__, &card->mmio_region);
79
-	}
73
+
74
+	pr_info("Found GeckoBoa at %pap, bus space %pR,%s claimed.\n",
75
+			&dev->hpa.start,
76
+			&card->mmio_region,
77
+			(status < 0) ? " not":"" );
80
78
 
81
79
         return 0;
82
80
 }