Commit ec6f0cf1 authored by Andrew Jeffery's avatar Andrew Jeffery Committed by Corey Minyard
Browse files

ipmi: kcs_bmc: Make status update atomic 



Enable more efficient implementation of read-modify-write sequences.
Both device drivers for the KCS BMC stack use regmaps. The new callback
allows us to exploit regmap_update_bits().

Signed-off-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Reviewed-by: default avatarZev Weiss <zweiss@equinix.com>
Message-Id: <20210608104757.582199-3-andrew@aj.id.au>
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent 78ca0c05

drivers/char/ipmi/kcs_bmc.c

+1 −6
Original line number Diff line number Diff line
@@ -67,12 +67,7 @@ static inline void write_status(struct kcs_bmc *kcs_bmc, u8 data) 


static void update_status_bits(struct kcs_bmc *kcs_bmc, u8 mask, u8 val)

{

	u8 tmp = read_status(kcs_bmc);



	tmp &= ~mask;

	tmp |= val & mask;



	write_status(kcs_bmc, tmp);

	kcs_bmc->io_updateb(kcs_bmc, kcs_bmc->ioreg.str, mask, val);

}



static inline void set_state(struct kcs_bmc *kcs_bmc, u8 state)

drivers/char/ipmi/kcs_bmc.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct kcs_bmc { 
	struct kcs_ioreg ioreg;

	u8 (*io_inputb)(struct kcs_bmc *kcs_bmc, u32 reg);

	void (*io_outputb)(struct kcs_bmc *kcs_bmc, u32 reg, u8 b);

	void (*io_updateb)(struct kcs_bmc *kcs_bmc, u32 reg, u8 mask, u8 val);



	enum kcs_phases phase;

	enum kcs_errors error;

drivers/char/ipmi/kcs_bmc_aspeed.c

+9 −0
Original line number Diff line number Diff line
@@ -90,6 +90,14 @@ static void aspeed_kcs_outb(struct kcs_bmc *kcs_bmc, u32 reg, u8 data) 
	WARN(rc != 0, "regmap_write() failed: %d\n", rc);

}



static void aspeed_kcs_updateb(struct kcs_bmc *kcs_bmc, u32 reg, u8 mask, u8 val)

{

	struct aspeed_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc);

	int rc;



	rc = regmap_update_bits(priv->map, reg, mask, val);

	WARN(rc != 0, "regmap_update_bits() failed: %d\n", rc);

}



/*

 * AST_usrGuide_KCS.pdf
@@ -345,6 +353,7 @@ static int aspeed_kcs_probe(struct platform_device *pdev) 
	kcs_bmc->ioreg = ast_kcs_bmc_ioregs[channel - 1];

	kcs_bmc->io_inputb = aspeed_kcs_inb;

	kcs_bmc->io_outputb = aspeed_kcs_outb;

	kcs_bmc->io_updateb = aspeed_kcs_updateb;



	addr = ops->get_io_address(pdev);

	if (addr < 0)

drivers/char/ipmi/kcs_bmc_npcm7xx.c

+10 −0
Original line number Diff line number Diff line
@@ -97,6 +97,15 @@ static void npcm7xx_kcs_outb(struct kcs_bmc *kcs_bmc, u32 reg, u8 data) 
	WARN(rc != 0, "regmap_write() failed: %d\n", rc);

}



static void npcm7xx_kcs_updateb(struct kcs_bmc *kcs_bmc, u32 reg, u8 mask, u8 data)

{

	struct npcm7xx_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc);

	int rc;



	rc = regmap_update_bits(priv->map, reg, mask, data);

	WARN(rc != 0, "regmap_update_bits() failed: %d\n", rc);

}



static void npcm7xx_kcs_enable_channel(struct kcs_bmc *kcs_bmc, bool enable)

{

	struct npcm7xx_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc);
@@ -163,6 +172,7 @@ static int npcm7xx_kcs_probe(struct platform_device *pdev) 
	kcs_bmc->ioreg.str = priv->reg->sts;

	kcs_bmc->io_inputb = npcm7xx_kcs_inb;

	kcs_bmc->io_outputb = npcm7xx_kcs_outb;

	kcs_bmc->io_updateb = npcm7xx_kcs_updateb;



	dev_set_drvdata(dev, kcs_bmc);