From 3857ed015f8bd9331a8eaeb9b887448e2caff15c Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Mon, 1 Feb 2016 01:40:58 -0800 Subject: [PATCH] x86: pci: Drop legacy PCI APIs Now that we have converted all x86 codes to use DM PCI APIs, drop those legacy ones. Signed-off-by: Bin Meng Reviewed-by: Simon Glass Tested-by: Simon Glass --- arch/x86/cpu/pci.c | 53 -------------------------------------- arch/x86/include/asm/pci.h | 12 --------- 2 files changed, 65 deletions(-) diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c index 9cad57e223..c9c7637fa7 100644 --- a/arch/x86/cpu/pci.c +++ b/arch/x86/cpu/pci.c @@ -19,59 +19,6 @@ DECLARE_GLOBAL_DATA_PTR; -static struct pci_controller *get_hose(void) -{ - if (gd->hose) - return gd->hose; - - return pci_bus_to_hose(0); -} - -unsigned int x86_pci_read_config8(pci_dev_t dev, unsigned where) -{ - uint8_t value; - - if (pci_hose_read_config_byte(get_hose(), dev, where, &value)) - return -1U; - - return value; -} - -unsigned int x86_pci_read_config16(pci_dev_t dev, unsigned where) -{ - uint16_t value; - - if (pci_hose_read_config_word(get_hose(), dev, where, &value)) - return -1U; - - return value; -} - -unsigned int x86_pci_read_config32(pci_dev_t dev, unsigned where) -{ - uint32_t value; - - if (pci_hose_read_config_dword(get_hose(), dev, where, &value)) - return -1U; - - return value; -} - -void x86_pci_write_config8(pci_dev_t dev, unsigned where, unsigned value) -{ - pci_hose_write_config_byte(get_hose(), dev, where, value); -} - -void x86_pci_write_config16(pci_dev_t dev, unsigned where, unsigned value) -{ - pci_hose_write_config_word(get_hose(), dev, where, value); -} - -void x86_pci_write_config32(pci_dev_t dev, unsigned where, unsigned value) -{ - pci_hose_write_config_dword(get_hose(), dev, where, value); -} - int pci_x86_read_config(struct udevice *bus, pci_dev_t bdf, uint offset, ulong *valuep, enum pci_size_t size) { diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index a2945f1aff..46b992ef44 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -25,18 +25,6 @@ struct pci_controller; void pci_setup_type1(struct pci_controller *hose); -/* - * Simple PCI access routines - these work from either the early PCI hose - * or the 'real' one, created after U-Boot has memory available - */ -unsigned int x86_pci_read_config8(pci_dev_t dev, unsigned where); -unsigned int x86_pci_read_config16(pci_dev_t dev, unsigned where); -unsigned int x86_pci_read_config32(pci_dev_t dev, unsigned where); - -void x86_pci_write_config8(pci_dev_t dev, unsigned where, unsigned value); -void x86_pci_write_config16(pci_dev_t dev, unsigned where, unsigned value); -void x86_pci_write_config32(pci_dev_t dev, unsigned where, unsigned value); - int pci_x86_read_config(struct udevice *bus, pci_dev_t bdf, uint offset, ulong *valuep, enum pci_size_t size);