d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use volatile keywords properly.

Browse Source
This commit is contained in:
jkim 2012-11-30 20:15:01 +00:00
parent 6a45724ec7
commit 9c50b706fb
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/amd64/pci/pci_cfgreg.c
View File

@ -313,7 +313,7 @@ static int
pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg,
unsigned bytes)
{
volatile vm_offset_t va;
vm_offset_t va;
int data = -1;
if (bus < pcie_minbus || bus > pcie_maxbus || slot > PCI_SLOTMAX ||
@ -324,16 +324,16 @@ pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg,
switch (bytes) {
case 4:
__asm __volatile("movl %1, %0" : "=a" (data)
: "m" (*(uint32_t *)va));
__asm("movl %1, %0" : "=a" (data)
: "m" (*(volatile uint32_t *)va));
break;
case 2:
__asm __volatile("movzwl %1, %0" : "=a" (data)
: "m" (*(uint16_t *)va));
__asm("movzwl %1, %0" : "=a" (data)
: "m" (*(volatile uint16_t *)va));
break;
case 1:
__asm __volatile("movzbl %1, %0" : "=a" (data)
: "m" (*(uint8_t *)va));
__asm("movzbl %1, %0" : "=a" (data)
: "m" (*(volatile uint8_t *)va));
break;
}
@ -344,7 +344,7 @@ static void
pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data,
unsigned bytes)
{
volatile vm_offset_t va;
vm_offset_t va;
if (bus < pcie_minbus || bus > pcie_maxbus || slot > PCI_SLOTMAX ||
func > PCI_FUNCMAX || reg > PCIE_REGMAX)
@ -354,15 +354,15 @@ pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data,
switch (bytes) {
case 4:
__asm __volatile("movl %1, %0" : "=m" (*(uint32_t *)va)
__asm("movl %1, %0" : "=m" (*(volatile uint32_t *)va)
: "a" (data));
break;
case 2:
__asm __volatile("movw %1, %0" : "=m" (*(uint16_t *)va)
__asm("movw %1, %0" : "=m" (*(volatile uint16_t *)va)
: "a" ((uint16_t)data));
break;
case 1:
__asm __volatile("movb %1, %0" : "=m" (*(uint8_t *)va)
__asm("movb %1, %0" : "=m" (*(volatile uint8_t *)va)
: "a" ((uint8_t)data));
break;
}

22
sys/i386/pci/pci_cfgreg.c
View File

@ -665,7 +665,7 @@ pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg,
unsigned bytes)
{
struct pcie_cfg_elem *elem;
volatile vm_offset_t va;
vm_offset_t va;
vm_paddr_t pa, papage;
int data = -1;
@ -681,16 +681,16 @@ pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg,
switch (bytes) {
case 4:
__asm __volatile("movl %1, %0" : "=a" (data)
: "m" (*(uint32_t *)va));
__asm("movl %1, %0" : "=a" (data)
: "m" (*(volatile uint32_t *)va));
break;
case 2:
__asm __volatile("movzwl %1, %0" : "=a" (data)
: "m" (*(uint16_t *)va));
__asm("movzwl %1, %0" : "=a" (data)
: "m" (*(volatile uint16_t *)va));
break;
case 1:
__asm __volatile("movzbl %1, %0" : "=a" (data)
: "m" (*(uint8_t *)va));
__asm("movzbl %1, %0" : "=a" (data)
: "m" (*(volatile uint8_t *)va));
break;
}
@ -703,7 +703,7 @@ pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data,
unsigned bytes)
{
struct pcie_cfg_elem *elem;
volatile vm_offset_t va;
vm_offset_t va;
vm_paddr_t pa, papage;
if (bus < pcie_minbus || bus > pcie_maxbus || slot > PCI_SLOTMAX ||
@ -718,15 +718,15 @@ pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data,
switch (bytes) {
case 4:
__asm __volatile("movl %1, %0" : "=m" (*(uint32_t *)va)
__asm("movl %1, %0" : "=m" (*(volatile uint32_t *)va)
: "a" (data));
break;
case 2:
__asm __volatile("movw %1, %0" : "=m" (*(uint16_t *)va)
__asm("movw %1, %0" : "=m" (*(volatile uint16_t *)va)
: "a" ((uint16_t)data));
break;
case 1:
__asm __volatile("movb %1, %0" : "=m" (*(uint8_t *)va)
__asm("movb %1, %0" : "=m" (*(volatile uint8_t *)va)
: "a" ((uint8_t)data));
break;
}