[PATCH AUTOSEL for 4.4 091/101] vgacon: Set VGA struct resource types

[Sasha Levin]

From: Bjorn Helgaas 

[ Upstream commit c82084117f79bcae085e40da526253736a247120 ]

Set the resource type when we reserve VGA-related I/O port resources.

The resource code doesn't actually look at the type, so it inserts
resources without a type in the tree correctly even without this change.
But if we ever print a resource without a type, it looks like this:

  vga+ [??? 0x03c0-0x03df flags 0x0]

Setting the type means it will be printed correctly as:

  vga+ [io  0x03c0-0x03df]

Signed-off-by: Bjorn Helgaas 
Signed-off-by: Sasha Levin 
---
 arch/alpha/kernel/console.c|  1 +
 drivers/video/console/vgacon.c | 34 ++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c
index 6a61deed4a85..ab228ed45945 100644
--- a/arch/alpha/kernel/console.c
+++ b/arch/alpha/kernel/console.c
@@ -20,6 +20,7 @@
 struct pci_controller *pci_vga_hose;
 static struct resource alpha_vga = {
.name   = "alpha-vga+",
+   .flags  = IORESOURCE_IO,
.start  = 0x3C0,
.end= 0x3DF
 };
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 517f565b65d7..598ec7545e84 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -409,7 +409,10 @@ static const char *vgacon_startup(void)
vga_video_port_val = VGA_CRT_DM;
if ((screen_info.orig_video_ega_bx & 0xff) != 0x10) {
static struct resource ega_console_resource =
-   { .name = "ega", .start = 0x3B0, .end = 0x3BF };
+   { .name = "ega",
+ .flags= IORESOURCE_IO,
+ .start= 0x3B0,
+ .end  = 0x3BF };
vga_video_type = VIDEO_TYPE_EGAM;
vga_vram_size = 0x8000;
display_desc = "EGA+";
@@ -417,9 +420,15 @@ static const char *vgacon_startup(void)
 _console_resource);
} else {
static struct resource mda1_console_resource =
-   { .name = "mda", .start = 0x3B0, .end = 0x3BB };
+   { .name = "mda",
+ .flags= IORESOURCE_IO,
+ .start= 0x3B0,
+ .end  = 0x3BB };
static struct resource mda2_console_resource =
-   { .name = "mda", .start = 0x3BF, .end = 0x3BF };
+   { .name = "mda",
+ .flags= IORESOURCE_IO,
+ .start= 0x3BF,
+ .end  = 0x3BF };
vga_video_type = VIDEO_TYPE_MDA;
vga_vram_size = 0x2000;
display_desc = "*MDA";
@@ -441,15 +450,21 @@ static const char *vgacon_startup(void)
vga_vram_size = 0x8000;
 
if (!screen_info.orig_video_isVGA) {
-   static struct resource ega_console_resource
-   = { .name = "ega", .start = 0x3C0, .end = 
0x3DF };
+   static struct resource ega_console_resource =
+   { .name = "ega",
+ .flags= IORESOURCE_IO,
+ .start= 0x3C0,
+ .end  = 0x3DF };
vga_video_type = VIDEO_TYPE_EGAC;
display_desc = "EGA";
request_resource(_resource,
 _console_resource);
} else {
-   static struct resource vga_console_resource
-   = { .name = "vga+", .start = 0x3C0, .end = 
0x3DF };
+   static struct resource vga_console_resource =
+   { .name = "vga+",
+ .flags= IORESOURCE_IO,
+ .start= 0x3C0,
+ .end  = 0x3DF };
vga_video_type = VIDEO_TYPE_VGAC;
display_desc = "VGA+";
request_resource(_resource,
@@ -493,7 +508,10 @@ static const char *vgacon_startup(void)
}
} else {
static struct resource cga_console_resource =
-   { .name = "cga", .start = 0x3D4, .end = 0x3D5 };
+   { .name = "cga",
+

[PATCH AUTOSEL for 4.4 091/101] vgacon: Set VGA struct resource types

[Sasha Levin]

From: Bjorn Helgaas 

[ Upstream commit c82084117f79bcae085e40da526253736a247120 ]

Set the resource type when we reserve VGA-related I/O port resources.

The resource code doesn't actually look at the type, so it inserts
resources without a type in the tree correctly even without this change.
But if we ever print a resource without a type, it looks like this:

  vga+ [??? 0x03c0-0x03df flags 0x0]

Setting the type means it will be printed correctly as:

  vga+ [io  0x03c0-0x03df]

Signed-off-by: Bjorn Helgaas 
Signed-off-by: Sasha Levin 
---
 arch/alpha/kernel/console.c|  1 +
 drivers/video/console/vgacon.c | 34 ++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c
index 6a61deed4a85..ab228ed45945 100644
--- a/arch/alpha/kernel/console.c
+++ b/arch/alpha/kernel/console.c
@@ -20,6 +20,7 @@
 struct pci_controller *pci_vga_hose;
 static struct resource alpha_vga = {
.name   = "alpha-vga+",
+   .flags  = IORESOURCE_IO,
.start  = 0x3C0,
.end= 0x3DF
 };
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 517f565b65d7..598ec7545e84 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -409,7 +409,10 @@ static const char *vgacon_startup(void)
vga_video_port_val = VGA_CRT_DM;
if ((screen_info.orig_video_ega_bx & 0xff) != 0x10) {
static struct resource ega_console_resource =
-   { .name = "ega", .start = 0x3B0, .end = 0x3BF };
+   { .name = "ega",
+ .flags= IORESOURCE_IO,
+ .start= 0x3B0,
+ .end  = 0x3BF };
vga_video_type = VIDEO_TYPE_EGAM;
vga_vram_size = 0x8000;
display_desc = "EGA+";
@@ -417,9 +420,15 @@ static const char *vgacon_startup(void)
 _console_resource);
} else {
static struct resource mda1_console_resource =
-   { .name = "mda", .start = 0x3B0, .end = 0x3BB };
+   { .name = "mda",
+ .flags= IORESOURCE_IO,
+ .start= 0x3B0,
+ .end  = 0x3BB };
static struct resource mda2_console_resource =
-   { .name = "mda", .start = 0x3BF, .end = 0x3BF };
+   { .name = "mda",
+ .flags= IORESOURCE_IO,
+ .start= 0x3BF,
+ .end  = 0x3BF };
vga_video_type = VIDEO_TYPE_MDA;
vga_vram_size = 0x2000;
display_desc = "*MDA";
@@ -441,15 +450,21 @@ static const char *vgacon_startup(void)
vga_vram_size = 0x8000;
 
if (!screen_info.orig_video_isVGA) {
-   static struct resource ega_console_resource
-   = { .name = "ega", .start = 0x3C0, .end = 
0x3DF };
+   static struct resource ega_console_resource =
+   { .name = "ega",
+ .flags= IORESOURCE_IO,
+ .start= 0x3C0,
+ .end  = 0x3DF };
vga_video_type = VIDEO_TYPE_EGAC;
display_desc = "EGA";
request_resource(_resource,
 _console_resource);
} else {
-   static struct resource vga_console_resource
-   = { .name = "vga+", .start = 0x3C0, .end = 
0x3DF };
+   static struct resource vga_console_resource =
+   { .name = "vga+",
+ .flags= IORESOURCE_IO,
+ .start= 0x3C0,
+ .end  = 0x3DF };
vga_video_type = VIDEO_TYPE_VGAC;
display_desc = "VGA+";
request_resource(_resource,
@@ -493,7 +508,10 @@ static const char *vgacon_startup(void)
}
} else {
static struct resource cga_console_resource =
-   { .name = "cga", .start = 0x3D4, .end = 0x3D5 };
+   { .name = "cga",
+ .flags= IORESOURCE_IO,
+