Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 36f32675f40292002ee1fed252c180a43022d2d4

Authored by Becky Bruce
Committed by Wolfgang Denk
1 parent 91a616741f
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Update pci code to use phys_addr_t 

Physical addrs need to be represented by phys_addr_t, not
unsigned long.  Otherwise, systems that use CONFIG_PHYS_64BIT
are going to fail mightily.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>

Showing 2 changed files with 9 additions and 9 deletions Side-by-side Diff

... ... @@ -221,7 +221,7 @@
221 221 */
222 222  
223 223 unsigned long pci_hose_phys_to_bus (struct pci_controller *hose,
224   - unsigned long phys_addr,
  224 + phys_addr_t phys_addr,
225 225 unsigned long flags)
226 226 {
227 227 struct pci_region *res;
... ... @@ -253,9 +253,9 @@
253 253 return 0;
254 254 }
255 255  
256   -unsigned long pci_hose_bus_to_phys(struct pci_controller* hose,
257   - unsigned long bus_addr,
258   - unsigned long flags)
  256 +phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose,
  257 + unsigned long bus_addr,
  258 + unsigned long flags)
259 259 {
260 260 struct pci_region *res;
261 261 int i;
... ... @@ -314,7 +314,7 @@
314 314  
315 315 struct pci_region {
316 316 unsigned long bus_start; /* Start on the bus */
317   - unsigned long phys_start; /* Start in physical address space */
  317 + phys_addr_t phys_start; /* Start in physical address space */
318 318 unsigned long size; /* Size */
319 319 unsigned long flags; /* Resource flags */
320 320  
... ... @@ -331,7 +331,7 @@
331 331  
332 332 extern __inline__ void pci_set_region(struct pci_region *reg,
333 333 unsigned long bus_start,
334   - unsigned long phys_start,
  334 + phys_addr_t phys_start,
335 335 unsigned long size,
336 336 unsigned long flags) {
337 337 reg->bus_start = bus_start;
338 338  
... ... @@ -432,10 +432,10 @@
432 432  
433 433 extern void pci_setup_indirect(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data);
434 434  
435   -extern unsigned long pci_hose_bus_to_phys(struct pci_controller* hose,
436   - unsigned long addr, unsigned long flags);
  435 +extern phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose,
  436 + unsigned long addr, unsigned long flags);
437 437 extern unsigned long pci_hose_phys_to_bus(struct pci_controller* hose,
438   - unsigned long addr, unsigned long flags);
  438 + phys_addr_t addr, unsigned long flags);
439 439  
440 440 #define pci_phys_to_bus(dev, addr, flags) \
441 441 pci_hose_phys_to_bus(pci_bus_to_hose(PCI_BUS(dev)), (addr), (flags))