Commit d7323638 authored by Corey Minyard's avatar Corey Minyard
Browse files

ipmi: Add the i2c-addr property for SSIF interfaces 



This is required for SSIF to work.

There was no way to know if the interface being added was SI
or SSIF from the platform data, but that was required so the
i2c-addr is only added for SSIF interfaces.  So add a field
for that.

Also rework the logic a bit so that ipmi-type is not set
for SSIF interfaces, as it is not necessary for that.

Fixes: 3cd83bac ("ipmi: Consolidate the adding of platform devices")
Reported-by: default avatarKamlakant Patel <kamlakantp@marvell.com>
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Cc: stable@vger.kernel.org # 5.1
parent b779cead

drivers/char/ipmi/ipmi_dmi.c

+2 −0
Original line number Diff line number Diff line
@@ -47,9 +47,11 @@ static void __init dmi_add_platform_ipmi(unsigned long base_addr, 
	memset(&p, 0, sizeof(p));



	name = "dmi-ipmi-si";

	p.iftype = IPMI_PLAT_IF_SI;

	switch (type) {

	case IPMI_DMI_TYPE_SSIF:

		name = "dmi-ipmi-ssif";

		p.iftype = IPMI_PLAT_IF_SSIF;

		p.type = SI_TYPE_INVALID;

		break;

	case IPMI_DMI_TYPE_BT:

drivers/char/ipmi/ipmi_plat_data.c

+15 −12
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst, 
					  struct ipmi_plat_data *p)

{

	struct platform_device *pdev;

	unsigned int num_r = 1, size, pidx = 0;

	unsigned int num_r = 1, size = 0, pidx = 0;

	struct resource r[4];

	struct property_entry pr[6];

	u32 flags;
@@ -21,11 +21,10 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst, 
	memset(pr, 0, sizeof(pr));

	memset(r, 0, sizeof(r));



	if (p->iftype == IPMI_PLAT_IF_SI) {

		if (p->type == SI_BT)

			size = 3;

	else if (p->type == SI_TYPE_INVALID)

		size = 0;

	else

		else if (p->type != SI_TYPE_INVALID)

			size = 2;



		if (p->regsize == 0)
@@ -34,6 +33,10 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst, 
			p->regspacing = p->regsize;



		pr[pidx++] = PROPERTY_ENTRY_U8("ipmi-type", p->type);

	} else if (p->iftype == IPMI_PLAT_IF_SSIF) {

		pr[pidx++] = PROPERTY_ENTRY_U16("i2c-addr", p->addr);

	}



	if (p->slave_addr)

		pr[pidx++] = PROPERTY_ENTRY_U8("slave-addr", p->slave_addr);

	pr[pidx++] = PROPERTY_ENTRY_U8("addr-source", p->addr_source);

drivers/char/ipmi/ipmi_plat_data.h

+3 −0
Original line number Diff line number Diff line
@@ -6,7 +6,10 @@ 


#include <linux/ipmi.h>



enum ipmi_plat_interface_type { IPMI_PLAT_IF_SI, IPMI_PLAT_IF_SSIF };



struct ipmi_plat_data {

	enum ipmi_plat_interface_type iftype;

	unsigned int type; /* si_type for si, SI_INVALID for others */

	unsigned int space; /* addr_space for si, intf# for ssif. */

	unsigned long addr;

drivers/char/ipmi/ipmi_si_hardcode.c

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static void __init ipmi_hardcode_init_one(const char *si_type_str, 


	memset(&p, 0, sizeof(p));



	p.iftype = IPMI_PLAT_IF_SI;

	if (!si_type_str || !*si_type_str || strcmp(si_type_str, "kcs") == 0) {

		p.type = SI_KCS;

	} else if (strcmp(si_type_str, "smic") == 0) {

drivers/char/ipmi/ipmi_si_hotmod.c

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static int parse_hotmod_str(const char *curr, enum hotmod_op *op, 
	int rv;

	unsigned int ival;



	h->iftype = IPMI_PLAT_IF_SI;

	rv = parse_str(hotmod_ops, &ival, "operation", &curr);

	if (rv)

		return rv;

CRA Git | Maintained and supported by SUSTech CRA and CCSE