releases/2.6.32.12/pci-update-pci_set_vga_state-to-call-arch-functions.patch

   1 From 95a8b6efc5d07103583f706c8a5889437d537939 Mon Sep 17 00:00:00 2001
   2 From: Mike Travis <travis@sgi.com>
   3 Date: Tue, 2 Feb 2010 14:38:13 -0800
   4 Subject: pci: Update pci_set_vga_state() to call arch functions
   5
   6 From: Mike Travis <travis@sgi.com>
   7
   8 commit 95a8b6efc5d07103583f706c8a5889437d537939 upstream.
   9
  10 Update pci_set_vga_state to call arch dependent functions to enable Legacy
  11 VGA I/O transactions to be redirected to correct target.
  12
  13 [akpm@linux-foundation.org: make pci_register_set_vga_state() __init]
  14 Signed-off-by: Mike Travis <travis@sgi.com>
  15 LKML-Reference: <201002022238.o12McE1J018723@imap1.linux-foundation.org>
  16 Cc: Thomas Gleixner <tglx@linutronix.de>
  17 Cc: Robin Holt <holt@sgi.com>
  18 Cc: Jack Steiner <steiner@sgi.com>
  19 Cc: Ingo Molnar <mingo@elte.hu>
  20 Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
  21 Cc: David Airlie <airlied@linux.ie>
  22 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  23 Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  24 Cc: maximilian attems <max@stro.at>
  25 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  26
  27 ---
  28  drivers/pci/pci.c   |   25 ++++++++++++++++++++++++-
  29  include/linux/pci.h |    5 +++++
  30  2 files changed, 29 insertions(+), 1 deletion(-)
  31
  32 --- a/drivers/pci/pci.c
  33 +++ b/drivers/pci/pci.c
  34 @@ -2541,6 +2541,23 @@ int pci_resource_bar(struct pci_dev *dev
  35         return 0;
  36  }
  37
  38 +/* Some architectures require additional programming to enable VGA */
  39 +static arch_set_vga_state_t arch_set_vga_state;
  40 +
  41 +void __init pci_register_set_vga_state(arch_set_vga_state_t func)
  42 +{
  43 +       arch_set_vga_state = func;      /* NULL disables */
  44 +}
  45 +
  46 +static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode,
  47 +                     unsigned int command_bits, bool change_bridge)
  48 +{
  49 +       if (arch_set_vga_state)
  50 +               return arch_set_vga_state(dev, decode, command_bits,
  51 +                                               change_bridge);
  52 +       return 0;
  53 +}
  54 +
  55  /**
  56   * pci_set_vga_state - set VGA decode state on device and parents if requested
  57   * @dev: the PCI device
  58 @@ -2554,9 +2571,15 @@ int pci_set_vga_state(struct pci_dev *de
  59         struct pci_bus *bus;
  60         struct pci_dev *bridge;
  61         u16 cmd;
  62 +       int rc;
  63
  64         WARN_ON(command_bits & ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY));
  65
  66 +       /* ARCH specific VGA enables */
  67 +       rc = pci_set_vga_state_arch(dev, decode, command_bits, change_bridge);
  68 +       if (rc)
  69 +               return rc;
  70 +
  71         pci_read_config_word(dev, PCI_COMMAND, &cmd);
  72         if (decode == true)
  73                 cmd |= command_bits;
  74 @@ -2771,6 +2794,7 @@ EXPORT_SYMBOL(pcim_pin_device);
  75  EXPORT_SYMBOL(pci_disable_device);
  76  EXPORT_SYMBOL(pci_find_capability);
  77  EXPORT_SYMBOL(pci_bus_find_capability);
  78 +EXPORT_SYMBOL(pci_register_set_vga_state);
  79  EXPORT_SYMBOL(pci_release_regions);
  80  EXPORT_SYMBOL(pci_request_regions);
  81  EXPORT_SYMBOL(pci_request_regions_exclusive);
  82 @@ -2803,4 +2827,3 @@ EXPORT_SYMBOL(pci_target_state);
  83  EXPORT_SYMBOL(pci_prepare_to_sleep);
  84  EXPORT_SYMBOL(pci_back_from_sleep);
  85  EXPORT_SYMBOL_GPL(pci_set_pcie_reset_state);
  86 -
  87 --- a/include/linux/pci.h
  88 +++ b/include/linux/pci.h
  89 @@ -945,6 +945,11 @@ static inline int pci_proc_domain(struct
  90  }
  91  #endif /* CONFIG_PCI_DOMAINS */
  92
  93 +/* some architectures require additional setup to direct VGA traffic */
  94 +typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode,
  95 +                     unsigned int command_bits, bool change_bridge);
  96 +extern void pci_register_set_vga_state(arch_set_vga_state_t func);
  97 +
  98  #else /* CONFIG_PCI is not enabled */
  99
 100  /*