Commit 27d6cafa authored by Linus Torvalds's avatar Linus Torvalds

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
parents fdb8a291 70f95b76
...@@ -410,7 +410,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info) ...@@ -410,7 +410,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
rv = SI_SM_CALL_WITHOUT_DELAY; rv = SI_SM_CALL_WITHOUT_DELAY;
} }
out: out:
return rv; return rv;
} }
...@@ -539,7 +539,7 @@ static struct ipmi_smi_msg *alloc_msg_handle_irq(struct smi_info *smi_info) ...@@ -539,7 +539,7 @@ static struct ipmi_smi_msg *alloc_msg_handle_irq(struct smi_info *smi_info)
static void handle_flags(struct smi_info *smi_info) static void handle_flags(struct smi_info *smi_info)
{ {
retry: retry:
if (smi_info->msg_flags & WDT_PRE_TIMEOUT_INT) { if (smi_info->msg_flags & WDT_PRE_TIMEOUT_INT) {
/* Watchdog pre-timeout */ /* Watchdog pre-timeout */
smi_inc_stat(smi_info, watchdog_pretimeouts); smi_inc_stat(smi_info, watchdog_pretimeouts);
...@@ -831,7 +831,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info, ...@@ -831,7 +831,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info,
{ {
enum si_sm_result si_sm_result; enum si_sm_result si_sm_result;
restart: restart:
/* /*
* There used to be a loop here that waited a little while * There used to be a loop here that waited a little while
* (around 25us) before giving up. That turned out to be * (around 25us) before giving up. That turned out to be
...@@ -944,7 +944,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info, ...@@ -944,7 +944,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info,
smi_info->timer_running = false; smi_info->timer_running = false;
} }
out: out:
return si_sm_result; return si_sm_result;
} }
...@@ -1190,7 +1190,7 @@ static void smi_timeout(unsigned long data) ...@@ -1190,7 +1190,7 @@ static void smi_timeout(unsigned long data)
timeout = jiffies + SI_TIMEOUT_JIFFIES; timeout = jiffies + SI_TIMEOUT_JIFFIES;
} }
do_mod_timer: do_mod_timer:
if (smi_result != SI_SM_IDLE) if (smi_result != SI_SM_IDLE)
smi_mod_timer(smi_info, timeout); smi_mod_timer(smi_info, timeout);
else else
...@@ -1576,10 +1576,9 @@ static int port_setup(struct smi_info *info) ...@@ -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, ...@@ -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) ...@@ -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) ...@@ -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;
...@@ -1975,7 +1988,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp) ...@@ -1975,7 +1988,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
} }
} }
rv = len; rv = len;
out: out:
kfree(str); kfree(str);
return rv; return rv;
} }
...@@ -2945,7 +2958,7 @@ static int try_get_dev_id(struct smi_info *smi_info) ...@@ -2945,7 +2958,7 @@ static int try_get_dev_id(struct smi_info *smi_info)
/* Check and record info from the get device id, in case we need it. */ /* Check and record info from the get device id, in case we need it. */
rv = ipmi_demangle_device_id(resp, resp_len, &smi_info->device_id); rv = ipmi_demangle_device_id(resp, resp_len, &smi_info->device_id);
out: out:
kfree(resp); kfree(resp);
return rv; return rv;
} }
...@@ -3192,7 +3205,7 @@ static int try_enable_event_buffer(struct smi_info *smi_info) ...@@ -3192,7 +3205,7 @@ static int try_enable_event_buffer(struct smi_info *smi_info)
else else
smi_info->supports_event_msg_buff = true; smi_info->supports_event_msg_buff = true;
out: out:
kfree(resp); kfree(resp);
return rv; return rv;
} }
...@@ -3718,10 +3731,10 @@ static int try_smi_init(struct smi_info *new_smi) ...@@ -3718,10 +3731,10 @@ static int try_smi_init(struct smi_info *new_smi)
return 0; return 0;
out_err_stop_timer: out_err_stop_timer:
wait_for_timer_and_thread(new_smi); wait_for_timer_and_thread(new_smi);
out_err: out_err:
new_smi->interrupt_disabled = true; new_smi->interrupt_disabled = true;
if (new_smi->intf) { if (new_smi->intf) {
......
...@@ -1870,7 +1870,7 @@ static int try_init_spmi(struct SPMITable *spmi) ...@@ -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);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment