lkml.org 
[lkml]   [2008]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] merge the define of PCI_CFG_SPACE_SIZE
From
Date
Subject: pci: merge define of PCI_CFG_SPACE_SIZE
From: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>

3 files define PCI_CFG_SPACE_SIZE. Move the define to file
pci_regs.h.

Signed-off-by: Zhang Yanmin <yanmin_zhang@linux.intel.com>

---

diff -Nraup linux-2.6.27-rc7/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.27-rc7_cleanup/drivers/pci/pcie/aer/aerdrv_core.c
--- linux-2.6.27-rc7/drivers/pci/pcie/aer/aerdrv_core.c 2008-09-27 09:35:32.000000000 +0800
+++ linux-2.6.27-rc7_cleanup/drivers/pci/pcie/aer/aerdrv_core.c 2008-09-27 10:29:57.000000000 +0800
@@ -28,7 +28,6 @@
static int forceload;
module_param(forceload, bool, 0);

-#define PCI_CFG_SPACE_SIZE (0x100)
int pci_find_aer_capability(struct pci_dev *dev)
{
int pos;
diff -Nraup linux-2.6.27-rc7/drivers/pci/pcie/portdrv.h linux-2.6.27-rc7_cleanup/drivers/pci/pcie/portdrv.h
--- linux-2.6.27-rc7/drivers/pci/pcie/portdrv.h 2008-07-14 05:51:29.000000000 +0800
+++ linux-2.6.27-rc7_cleanup/drivers/pci/pcie/portdrv.h 2008-09-27 10:29:38.000000000 +0800
@@ -25,7 +25,6 @@
#define PCIE_CAPABILITIES_REG 0x2
#define PCIE_SLOT_CAPABILITIES_REG 0x14
#define PCIE_PORT_DEVICE_MAXSERVICES 4
-#define PCI_CFG_SPACE_SIZE 256

#define get_descriptor_id(type, service) (((type - 4) << 4) | service)

diff -Nraup linux-2.6.27-rc7/drivers/pci/probe.c linux-2.6.27-rc7_cleanup/drivers/pci/probe.c
--- linux-2.6.27-rc7/drivers/pci/probe.c 2008-09-27 09:35:32.000000000 +0800
+++ linux-2.6.27-rc7_cleanup/drivers/pci/probe.c 2008-09-27 10:42:30.000000000 +0800
@@ -14,8 +14,6 @@

#define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */
#define CARDBUS_RESERVE_BUSNR 3
-#define PCI_CFG_SPACE_SIZE 256
-#define PCI_CFG_SPACE_EXP_SIZE 4096

/* Ugh. Need to stop exporting this to modules. */
LIST_HEAD(pci_root_buses);
diff -Nraup linux-2.6.27-rc7/include/linux/pci_regs.h linux-2.6.27-rc7_cleanup/include/linux/pci_regs.h
--- linux-2.6.27-rc7/include/linux/pci_regs.h 2008-09-27 09:35:35.000000000 +0800
+++ linux-2.6.27-rc7_cleanup/include/linux/pci_regs.h 2008-09-27 10:37:34.000000000 +0800
@@ -421,6 +421,10 @@
#define PCI_EXP_RTSTA 32 /* Root Status */

/* Extended Capabilities (PCI-X 2.0 and Express) */
+/* pci space size & Ext cap start offset */
+#define PCI_CFG_SPACE_SIZE (256)
+#define PCI_CFG_SPACE_EXP_SIZE (4096) /* pci ext space size */
+
#define PCI_EXT_CAP_ID(header) (header & 0x0000ffff)
#define PCI_EXT_CAP_VER(header) ((header >> 16) & 0xf)
#define PCI_EXT_CAP_NEXT(header) ((header >> 20) & 0xffc)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2008-09-27 05:15    [W:0.254 / U:0.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site