From: Mike Travis <travis@sgi.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>, Ingo Molnar <mingo@elte.hu>
Cc: Russ Anderson <rja@sgi.com>, Dave Airlie <airlied@redhat.com>,
Alex Chiang <achiang@hp.com>,
Thomas Gleixner <tglx@linutronix.de>,
Cyrill Gorcunov <gorcunov@openvz.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Robin Holt <holt@sgi.com>, "Rafael J. Wysocki" <rjw@sisk.pl>,
Adam Jackson <ajax@nwnk.net>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
Andrew Morton <akpm@linux-foundation.org>,
Gaetan Nadon <memsize@videotron.ca>,
"H. Peter Anvin" <hpa@zytor.com>,
Aaron Plattner <aplattner@nvidia.com>,
Jack Steiner <steiner@sgi.com>,
Tiago Vignatti <tiago.vignatti@nokia.com>,
Cliff Wickman <cpw@sgi.com>,
Matthew Wilcox <willy@linux.intel.com>,
Christian Zander <chzander@nvidia.com>,
Yu Zhao <yu.zhao@intel.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
x86@kernel.org
Subject: [PATCH 1/4] pci: Update pci_set_vga_state to call arch functions
Date: Mon, 18 Jan 2010 12:34:13 -0600 [thread overview]
Message-ID: <20100118183418.045021000@alcatraz.americas.sgi.com> (raw)
In-Reply-To: <20100118183412.560438000@alcatraz.americas.sgi.com>
[-- Attachment #1: update-pci --]
[-- Type: text/plain, Size: 3137 bytes --]
Update pci_set_vga_state to call arch dependent functions to enable
Legacy VGA I/O transactions to be redirected to correct target.
Signed-off-by: Mike Travis <travis@sgi.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Alex Chiang <achiang@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Robin Holt <holt@sgi.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Adam Jackson <ajax@nwnk.net>
Cc: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Gaetan Nadon <memsize@videotron.ca>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Aaron Plattner <aplattner@nvidia.com>
Cc: Jack Steiner <steiner@sgi.com>
Cc: Tiago Vignatti <tiago.vignatti@nokia.com>
Cc: Cliff Wickman <cpw@sgi.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Christian Zander <chzander@nvidia.com>
Cc: Yu Zhao <yu.zhao@intel.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: x86@kernel.org
---
drivers/pci/pci.c | 25 ++++++++++++++++++++++++-
include/linux/pci.h | 5 +++++
2 files changed, 29 insertions(+), 1 deletion(-)
--- linux.orig/drivers/pci/pci.c
+++ linux/drivers/pci/pci.c
@@ -2544,6 +2544,23 @@
return 0;
}
+/* Some architectures require additional programming to enable VGA */
+static arch_set_vga_state_t arch_set_vga_state;
+
+void pci_register_set_vga_state(arch_set_vga_state_t func)
+{
+ arch_set_vga_state = func; /* NULL disables */
+}
+
+static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode,
+ unsigned int command_bits, bool change_bridge)
+{
+ if (arch_set_vga_state)
+ return arch_set_vga_state(dev, decode, command_bits,
+ change_bridge);
+ return 0;
+}
+
/**
* pci_set_vga_state - set VGA decode state on device and parents if requested
* @dev: the PCI device
@@ -2557,9 +2574,15 @@
struct pci_bus *bus;
struct pci_dev *bridge;
u16 cmd;
+ int rc;
WARN_ON(command_bits & ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY));
+ /* ARCH specific VGA enables */
+ rc = pci_set_vga_state_arch(dev, decode, command_bits, change_bridge);
+ if (rc)
+ return rc;
+
pci_read_config_word(dev, PCI_COMMAND, &cmd);
if (decode == true)
cmd |= command_bits;
@@ -2769,6 +2792,7 @@
EXPORT_SYMBOL(pci_disable_device);
EXPORT_SYMBOL(pci_find_capability);
EXPORT_SYMBOL(pci_bus_find_capability);
+EXPORT_SYMBOL(pci_register_set_vga_state);
EXPORT_SYMBOL(pci_release_regions);
EXPORT_SYMBOL(pci_request_regions);
EXPORT_SYMBOL(pci_request_regions_exclusive);
@@ -2801,4 +2825,3 @@
EXPORT_SYMBOL(pci_prepare_to_sleep);
EXPORT_SYMBOL(pci_back_from_sleep);
EXPORT_SYMBOL_GPL(pci_set_pcie_reset_state);
-
--- linux.orig/include/linux/pci.h
+++ linux/include/linux/pci.h
@@ -942,6 +942,11 @@
}
#endif /* CONFIG_PCI_DOMAINS */
+/* some architectures require additional setup to direct VGA traffic */
+typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode,
+ unsigned int command_bits, bool change_bridge);
+extern void pci_register_set_vga_state(arch_set_vga_state_t func);
+
#else /* CONFIG_PCI is not enabled */
/*
--
next parent reply other threads:[~2010-01-18 18:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20100118183412.560438000@alcatraz.americas.sgi.com>
2010-01-18 18:34 ` Mike Travis [this message]
2010-01-25 23:52 ` Andrew Morton
2010-01-26 0:09 ` Mike Travis
2010-01-26 0:17 ` Andrew Morton
2010-01-18 18:34 ` [PATCH 2/4] x86_64 UV: Update UV arch to target Legacy VGA I/O correctly Mike Travis
2010-01-25 23:54 ` Andrew Morton
2010-01-26 0:05 ` Mike Travis
2010-01-26 0:22 ` H. Peter Anvin
2010-01-26 17:54 ` Mike Travis
2010-01-18 18:34 ` [PATCH 3/4] vgaarb: Fix VGA Arbiter to accept PCI Domains other than 0 Mike Travis
2010-01-18 18:34 ` [PATCH 4/4] vgaarb: Add user selectability of the number of GPUS in a system Mike Travis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100118183418.045021000@alcatraz.americas.sgi.com \
--to=travis@sgi.com \
--cc=achiang@hp.com \
--cc=airlied@redhat.com \
--cc=ajax@nwnk.net \
--cc=akpm@linux-foundation.org \
--cc=aplattner@nvidia.com \
--cc=benh@kernel.crashing.org \
--cc=chzander@nvidia.com \
--cc=cpw@sgi.com \
--cc=gorcunov@openvz.org \
--cc=holt@sgi.com \
--cc=hpa@zytor.com \
--cc=jbarnes@virtuousgeek.org \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=memsize@videotron.ca \
--cc=mingo@elte.hu \
--cc=rja@sgi.com \
--cc=rjw@sisk.pl \
--cc=steiner@sgi.com \
--cc=tglx@linutronix.de \
--cc=tiago.vignatti@nokia.com \
--cc=willy@linux.intel.com \
--cc=x86@kernel.org \
--cc=yu.zhao@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®