openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Some small fixes and cleanups, these latest have been in 

linux-next for a few weeks.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlc6a1sACgkQIXnXXONXERficACeM2cxmoEBfQFGSRq5ETreZA/2
 8qEAn1kk6VfititVpVflxE923hy4M1V0
 =Q+9z
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-4.7' of git://git.code.sf.net/p/openipmi/linux-ipmi

Pull IPMI updates from Corey Minyard:
 "Some small fixes and cleanups, these latest have been in linux-next
  for a few weeks"

* tag 'for-linus-4.7' of git://git.code.sf.net/p/openipmi/linux-ipmi:
  ipmi: Fix the I2C address extraction from SPMI tables
  IPMI: reserve memio regions separately
  ipmi: Fix some minor coding style issues
This commit is contained in:
Linus Torvalds 2016-05-16 18:55:43 -07:00
parent fdb8a29122 70f95b76f1
commit 27d6cafa7e
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/char/ipmi/ipmi_si_intf.c
View File

@ -1576,10 +1576,9 @@ static int port_setup(struct smi_info *info)
if (request_region(addr + idx * info->io.regspacing, if (request_region(addr + idx * info->io.regspacing,
info->io.regsize, DEVICE_NAME) == NULL) { info->io.regsize, DEVICE_NAME) == NULL) {
/* Undo allocations */ /* Undo allocations */
while (idx--) { while (idx--)
release_region(addr + idx * info->io.regspacing, release_region(addr + idx * info->io.regspacing,
info->io.regsize); info->io.regsize);
}
return -EIO; return -EIO;
} }
} }
@ -1638,25 +1637,28 @@ static void mem_outq(const struct si_sm_io *io, unsigned int offset,
} }
#endif #endif
static void mem_cleanup(struct smi_info *info) static void mem_region_cleanup(struct smi_info *info, int num)
{ {
unsigned long addr = info->io.addr_data; unsigned long addr = info->io.addr_data;
int mapsize; int idx;
for (idx = 0; idx < num; idx++)
release_mem_region(addr + idx * info->io.regspacing,
info->io.regsize);
}
static void mem_cleanup(struct smi_info *info)
{
if (info->io.addr) { if (info->io.addr) {
iounmap(info->io.addr); iounmap(info->io.addr);
mem_region_cleanup(info, info->io_size);
mapsize = ((info->io_size * info->io.regspacing)
- (info->io.regspacing - info->io.regsize));
release_mem_region(addr, mapsize);
} }
} }
static int mem_setup(struct smi_info *info) static int mem_setup(struct smi_info *info)
{ {
unsigned long addr = info->io.addr_data; unsigned long addr = info->io.addr_data;
int mapsize; int mapsize, idx;
if (!addr) if (!addr)
return -ENODEV; return -ENODEV;
@ -1692,6 +1694,21 @@ static int mem_setup(struct smi_info *info)
return -EINVAL; return -EINVAL;
} }
/*
* Some BIOSes reserve disjoint memory regions in their ACPI
* tables. This causes problems when trying to request the
* entire region. Therefore we must request each register
* separately.
*/
for (idx = 0; idx < info->io_size; idx++) {
if (request_mem_region(addr + idx * info->io.regspacing,
info->io.regsize, DEVICE_NAME) == NULL) {
/* Undo allocations */
mem_region_cleanup(info, idx);
return -EIO;
}
}
/* /*
* Calculate the total amount of memory to claim. This is an * Calculate the total amount of memory to claim. This is an
* unusual looking calculation, but it avoids claiming any * unusual looking calculation, but it avoids claiming any
@ -1701,13 +1718,9 @@ static int mem_setup(struct smi_info *info)
*/ */
mapsize = ((info->io_size * info->io.regspacing) mapsize = ((info->io_size * info->io.regspacing)
- (info->io.regspacing - info->io.regsize)); - (info->io.regspacing - info->io.regsize));
if (request_mem_region(addr, mapsize, DEVICE_NAME) == NULL)
return -EIO;
info->io.addr = ioremap(addr, mapsize); info->io.addr = ioremap(addr, mapsize);
if (info->io.addr == NULL) { if (info->io.addr == NULL) {
release_mem_region(addr, mapsize); mem_region_cleanup(info, info->io_size);
return -EIO; return -EIO;
} }
return 0; return 0;

2
drivers/char/ipmi/ipmi_ssif.c
View File

@ -1870,7 +1870,7 @@ static int try_init_spmi(struct SPMITable *spmi)
return -EIO; return -EIO;
} }
myaddr = spmi->addr.address >> 1; myaddr = spmi->addr.address & 0x7f;
return new_ssif_client(myaddr, NULL, 0, 0, SI_SPMI); return new_ssif_client(myaddr, NULL, 0, 0, SI_SPMI);
} }