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

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

drivers/char/ipmi/ipmi_si_intf.c

+39 −26
Original line number Diff line number Diff line
@@ -1576,10 +1576,9 @@ static int port_setup(struct smi_info *info) 
		if (request_region(addr + idx * info->io.regspacing,

				   info->io.regsize, DEVICE_NAME) == NULL) {

			/* Undo allocations */

			while (idx--) {

			while (idx--)

				release_region(addr + idx * info->io.regspacing,

					       info->io.regsize);

			}

			return -EIO;

		}

	}
@@ -1638,25 +1637,28 @@ static void mem_outq(const struct si_sm_io *io, unsigned int offset, 
}

#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;

	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) {

		iounmap(info->io.addr);



		mapsize = ((info->io_size * info->io.regspacing)

			   - (info->io.regspacing - info->io.regsize));



		release_mem_region(addr, mapsize);

		mem_region_cleanup(info, info->io_size);

	}

}



static int mem_setup(struct smi_info *info)

{

	unsigned long addr = info->io.addr_data;

	int           mapsize;

	int           mapsize, idx;



	if (!addr)

		return -ENODEV;
@@ -1692,6 +1694,21 @@ static int mem_setup(struct smi_info *info) 
		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

	 * 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)

		   - (info->io.regspacing - info->io.regsize));



	if (request_mem_region(addr, mapsize, DEVICE_NAME) == NULL)

		return -EIO;



	info->io.addr = ioremap(addr, mapsize);

	if (info->io.addr == NULL) {

		release_mem_region(addr, mapsize);

		mem_region_cleanup(info, info->io_size);

		return -EIO;

	}

	return 0;

drivers/char/ipmi/ipmi_ssif.c

+1 −1
Original line number Diff line number Diff line
@@ -1870,7 +1870,7 @@ static int try_init_spmi(struct SPMITable *spmi) 
		return -EIO;

	}



	myaddr = spmi->addr.address >> 1;

	myaddr = spmi->addr.address & 0x7f;



	return new_ssif_client(myaddr, NULL, 0, 0, SI_SPMI);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE