Skip to content
Snippets Groups Projects
Commit cf5787f2 authored by Kumar Gala's avatar Kumar Gala Committed by Anatolij Gustschin
Browse files

pci: fix some warnings related to assumptions about


The following commit introduced some warnings associated with using
pci_addr_t instead of a proper 32-bit data type.

commit af778c6d
Author: Andrew Sharp <andywyse6@gmail.com>
Date:   Wed Aug 1 12:27:16 2012 +0000

    pci: fix errant data types and corresponding access functions

On some platforms pci_addr_t is defined as a 64-bit data type so its not
proper to use with pci_{read,write}_config_dword.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 5bfa78db
No related branches found
No related tags found
No related merge requests found
...@@ -118,11 +118,11 @@ PCI_WRITE_VIA_DWORD_OP(word, u16, 0x02, 0x0000ffff) ...@@ -118,11 +118,11 @@ PCI_WRITE_VIA_DWORD_OP(word, u16, 0x02, 0x0000ffff)
void *pci_map_bar(pci_dev_t pdev, int bar, int flags) void *pci_map_bar(pci_dev_t pdev, int bar, int flags)
{ {
pci_addr_t pci_bus_addr; pci_addr_t pci_bus_addr;
pci_addr_t bar_response; u32 bar_response;
/* read BAR address */ /* read BAR address */
pci_read_config_dword(pdev, bar, &bar_response); pci_read_config_dword(pdev, bar, &bar_response);
pci_bus_addr = bar_response & ~0xf; pci_bus_addr = (pci_addr_t)(bar_response & ~0xf);
/* /*
* Pass "0" as the length argument to pci_bus_to_virt. The arg * Pass "0" as the length argument to pci_bus_to_virt. The arg
...@@ -389,7 +389,7 @@ int pci_hose_config_device(struct pci_controller *hose, ...@@ -389,7 +389,7 @@ int pci_hose_config_device(struct pci_controller *hose,
pci_addr_t mem, pci_addr_t mem,
unsigned long command) unsigned long command)
{ {
pci_addr_t bar_response; u32 bar_response;
unsigned int old_command; unsigned int old_command;
pci_addr_t bar_value; pci_addr_t bar_value;
pci_size_t bar_size; pci_size_t bar_size;
......
...@@ -89,7 +89,7 @@ void pciauto_setup_device(struct pci_controller *hose, ...@@ -89,7 +89,7 @@ void pciauto_setup_device(struct pci_controller *hose,
struct pci_region *prefetch, struct pci_region *prefetch,
struct pci_region *io) struct pci_region *io)
{ {
pci_addr_t bar_response; u32 bar_response;
pci_size_t bar_size; pci_size_t bar_size;
u16 cmdstat = 0; u16 cmdstat = 0;
int bar, bar_nr = 0; int bar, bar_nr = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment