iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Browse Source 
Pull MIPS fix from Ralf Baechle:
 "Just a fix for empty loops that may be removed by non-antique GCC"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix delay loops which may be removed by GCC.
This commit is contained in:
Linus Torvalds
2015-11-29 17:24:35 -08:00
parent d72aee78e9 c861519fcf
commit 00fd6a7194
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/pci/pci-rt2880.c
View File

@@ -11,6 +11,7 @@
* by the Free Software Foundation. * by the Free Software Foundation.
*/ */
#include <linux/delay.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/io.h> #include <linux/io.h>
@@ -232,8 +233,7 @@ static int rt288x_pci_probe(struct platform_device *pdev)
ioport_resource.end = RT2880_PCI_IO_BASE + RT2880_PCI_IO_SIZE - 1; ioport_resource.end = RT2880_PCI_IO_BASE + RT2880_PCI_IO_SIZE - 1;
rt2880_pci_reg_write(0, RT2880_PCI_REG_PCICFG_ADDR); rt2880_pci_reg_write(0, RT2880_PCI_REG_PCICFG_ADDR);
for (i = 0; i < 0xfffff; i++) udelay(1);
;
rt2880_pci_reg_write(0x79, RT2880_PCI_REG_ARBCTL); rt2880_pci_reg_write(0x79, RT2880_PCI_REG_ARBCTL);
rt2880_pci_reg_write(0x07FF0001, RT2880_PCI_REG_BAR0SETUP_ADDR); rt2880_pci_reg_write(0x07FF0001, RT2880_PCI_REG_BAR0SETUP_ADDR);

4
arch/mips/pmcs-msp71xx/msp_setup.c
View File

@@ -10,6 +10,8 @@
* option) any later version. * option) any later version.
*/ */
#include <linux/delay.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/idle.h> #include <asm/idle.h>
@@ -77,7 +79,7 @@ void msp7120_reset(void)
*/ */
/* Wait a bit for the DDRC to settle */ /* Wait a bit for the DDRC to settle */
for (i = 0; i < 100000000; i++); mdelay(125);
#if defined(CONFIG_PMC_MSP7120_GW) #if defined(CONFIG_PMC_MSP7120_GW)
/* /*

6
arch/mips/sni/reset.c
View File

@@ -3,6 +3,8 @@
* *
* Reset a SNI machine. * Reset a SNI machine.
*/ */
#include <linux/delay.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/sni.h> #include <asm/sni.h>
@@ -32,9 +34,9 @@ void sni_machine_restart(char *command)
for (;;) { for (;;) {
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
kb_wait(); kb_wait();
for (j = 0; j < 100000 ; j++) udelay(50);
/* nothing */;
outb_p(0xfe, 0x64); /* pulse reset low */ outb_p(0xfe, 0x64); /* pulse reset low */
udelay(50);
} }
} }
} }