Commit 4077a387 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

x86/platform/iosf_mbi: Remove duplicate definitions 



The read and write opcodes are global for all units on SoC and even across
Intel SoCs. Remove duplication of corresponding constants. At the same time
convert all current users.

No functional change.

Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBoon Leong Ong <boon.leong.ong@intel.com>
Acked-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 527e9316

arch/x86/include/asm/iosf_mbi.h

+11 −38
Original line number Diff line number Diff line 
/*

 * iosf_mbi.h: Intel OnChip System Fabric MailBox access support

 * Intel OnChip System Fabric MailBox access support

 */



#ifndef IOSF_MBI_SYMS_H
@@ -16,6 +16,16 @@ 
#define MBI_MASK_LO		0x000000FF

#define MBI_ENABLE		0xF0



/* IOSF SB read/write opcodes */

#define MBI_MMIO_READ		0x00

#define MBI_MMIO_WRITE		0x01

#define MBI_CR_READ		0x06

#define MBI_CR_WRITE		0x07

#define MBI_REG_READ		0x10

#define MBI_REG_WRITE		0x11

#define MBI_ESRAM_READ		0x12

#define MBI_ESRAM_WRITE		0x13



/* Baytrail available units */

#define BT_MBI_UNIT_AUNIT	0x00

#define BT_MBI_UNIT_SMC		0x01
@@ -28,50 +38,13 @@ 
#define BT_MBI_UNIT_SATA	0xA3

#define BT_MBI_UNIT_PCIE	0xA6



/* Baytrail read/write opcodes */

#define BT_MBI_AUNIT_READ	0x10

#define BT_MBI_AUNIT_WRITE	0x11

#define BT_MBI_SMC_READ		0x10

#define BT_MBI_SMC_WRITE	0x11

#define BT_MBI_CPU_READ		0x10

#define BT_MBI_CPU_WRITE	0x11

#define BT_MBI_BUNIT_READ	0x10

#define BT_MBI_BUNIT_WRITE	0x11

#define BT_MBI_PMC_READ		0x06

#define BT_MBI_PMC_WRITE	0x07

#define BT_MBI_GFX_READ		0x00

#define BT_MBI_GFX_WRITE	0x01

#define BT_MBI_SMIO_READ	0x06

#define BT_MBI_SMIO_WRITE	0x07

#define BT_MBI_USB_READ		0x06

#define BT_MBI_USB_WRITE	0x07

#define BT_MBI_SATA_READ	0x00

#define BT_MBI_SATA_WRITE	0x01

#define BT_MBI_PCIE_READ	0x00

#define BT_MBI_PCIE_WRITE	0x01



/* Quark available units */

#define QRK_MBI_UNIT_HBA	0x00

#define QRK_MBI_UNIT_HB		0x03

#define QRK_MBI_UNIT_RMU	0x04

#define QRK_MBI_UNIT_MM		0x05

#define QRK_MBI_UNIT_MMESRAM	0x05

#define QRK_MBI_UNIT_SOC	0x31



/* Quark read/write opcodes */

#define QRK_MBI_HBA_READ	0x10

#define QRK_MBI_HBA_WRITE	0x11

#define QRK_MBI_HB_READ		0x10

#define QRK_MBI_HB_WRITE	0x11

#define QRK_MBI_RMU_READ	0x10

#define QRK_MBI_RMU_WRITE	0x11

#define QRK_MBI_MM_READ		0x10

#define QRK_MBI_MM_WRITE	0x11

#define QRK_MBI_MMESRAM_READ	0x12

#define QRK_MBI_MMESRAM_WRITE	0x13

#define QRK_MBI_SOC_READ	0x06

#define QRK_MBI_SOC_WRITE	0x07



#if IS_ENABLED(CONFIG_IOSF_MBI)



bool iosf_mbi_available(void);

arch/x86/platform/atom/punit_atom_debug.c

+2 −5
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <asm/cpu_device_id.h>

#include <asm/iosf_mbi.h>



/* Side band Interface port */

#define PUNIT_PORT		0x04

/* Power gate status reg */

#define PWRGT_STATUS		0x61

/* Subsystem config/status Video processor */
@@ -85,9 +83,8 @@ static int punit_dev_state_show(struct seq_file *seq_file, void *unused) 


	seq_puts(seq_file, "\n\nPUNIT NORTH COMPLEX DEVICES :\n");

	while (punit_devp->name) {

		status = iosf_mbi_read(PUNIT_PORT, BT_MBI_PMC_READ,

				       punit_devp->reg,

				       &punit_pwr_status);

		status = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ,

				       punit_devp->reg, &punit_pwr_status);

		if (status) {

			seq_printf(seq_file, "%9s : Read Failed\n",

				   punit_devp->name);

arch/x86/platform/intel-quark/imr.c

+10 −18
Original line number Diff line number Diff line
@@ -111,23 +111,19 @@ static int imr_read(struct imr_device *idev, u32 imr_id, struct imr_regs *imr) 
	u32 reg = imr_id * IMR_NUM_REGS + idev->reg_base;

	int ret;



	ret = iosf_mbi_read(QRK_MBI_UNIT_MM, QRK_MBI_MM_READ,

				reg++, &imr->addr_lo);

	ret = iosf_mbi_read(QRK_MBI_UNIT_MM, MBI_REG_READ, reg++, &imr->addr_lo);

	if (ret)

		return ret;



	ret = iosf_mbi_read(QRK_MBI_UNIT_MM, QRK_MBI_MM_READ,

				reg++, &imr->addr_hi);

	ret = iosf_mbi_read(QRK_MBI_UNIT_MM, MBI_REG_READ, reg++, &imr->addr_hi);

	if (ret)

		return ret;



	ret = iosf_mbi_read(QRK_MBI_UNIT_MM, QRK_MBI_MM_READ,

				reg++, &imr->rmask);

	ret = iosf_mbi_read(QRK_MBI_UNIT_MM, MBI_REG_READ, reg++, &imr->rmask);

	if (ret)

		return ret;



	return iosf_mbi_read(QRK_MBI_UNIT_MM, QRK_MBI_MM_READ,

				reg++, &imr->wmask);

	return iosf_mbi_read(QRK_MBI_UNIT_MM, MBI_REG_READ, reg++, &imr->wmask);

}



/**
@@ -151,30 +147,26 @@ static int imr_write(struct imr_device *idev, u32 imr_id, 


	local_irq_save(flags);



	ret = iosf_mbi_write(QRK_MBI_UNIT_MM, QRK_MBI_MM_WRITE, reg++,

				imr->addr_lo);

	ret = iosf_mbi_write(QRK_MBI_UNIT_MM, MBI_REG_WRITE, reg++, imr->addr_lo);

	if (ret)

		goto failed;



	ret = iosf_mbi_write(QRK_MBI_UNIT_MM, QRK_MBI_MM_WRITE,

				reg++, imr->addr_hi);

	ret = iosf_mbi_write(QRK_MBI_UNIT_MM, MBI_REG_WRITE, reg++, imr->addr_hi);

	if (ret)

		goto failed;



	ret = iosf_mbi_write(QRK_MBI_UNIT_MM, QRK_MBI_MM_WRITE,

				reg++, imr->rmask);

	ret = iosf_mbi_write(QRK_MBI_UNIT_MM, MBI_REG_WRITE, reg++, imr->rmask);

	if (ret)

		goto failed;



	ret = iosf_mbi_write(QRK_MBI_UNIT_MM, QRK_MBI_MM_WRITE,

				reg++, imr->wmask);

	ret = iosf_mbi_write(QRK_MBI_UNIT_MM, MBI_REG_WRITE, reg++, imr->wmask);

	if (ret)

		goto failed;



	/* Lock bit must be set separately to addr_lo address bits. */

	if (lock) {

		imr->addr_lo |= IMR_LOCK;

		ret = iosf_mbi_write(QRK_MBI_UNIT_MM, QRK_MBI_MM_WRITE,

		ret = iosf_mbi_write(QRK_MBI_UNIT_MM, MBI_REG_WRITE,

				     reg - IMR_NUM_REGS, imr->addr_lo);

		if (ret)

			goto failed;

drivers/i2c/busses/i2c-designware-baytrail.c

+6 −11
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ static int get_sem(struct device *dev, u32 *sem) 
	u32 data;

	int ret;



	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, BT_MBI_BUNIT_READ, PUNIT_SEMAPHORE,

				&data);

	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, PUNIT_SEMAPHORE, &data);

	if (ret) {

		dev_err(dev, "iosf failed to read punit semaphore\n");

		return ret;
@@ -50,21 +49,19 @@ static void reset_semaphore(struct device *dev) 
{

	u32 data;



	if (iosf_mbi_read(BT_MBI_UNIT_PMC, BT_MBI_BUNIT_READ,

				PUNIT_SEMAPHORE, &data)) {

	if (iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, PUNIT_SEMAPHORE, &data)) {

		dev_err(dev, "iosf failed to reset punit semaphore during read\n");

		return;

	}



	data &= ~PUNIT_SEMAPHORE_BIT;

	if (iosf_mbi_write(BT_MBI_UNIT_PMC, BT_MBI_BUNIT_WRITE,

				PUNIT_SEMAPHORE, data))

	if (iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, PUNIT_SEMAPHORE, data))

		dev_err(dev, "iosf failed to reset punit semaphore during write\n");

}



static int baytrail_i2c_acquire(struct dw_i2c_dev *dev)

{

	u32 sem;

	u32 sem = PUNIT_SEMAPHORE_ACQUIRE;

	int ret;

	unsigned long start, end;
@@ -77,8 +74,7 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) 
		return 0;



	/* host driver writes to side band semaphore register */

	ret = iosf_mbi_write(BT_MBI_UNIT_PMC, BT_MBI_BUNIT_WRITE,

				PUNIT_SEMAPHORE, PUNIT_SEMAPHORE_ACQUIRE);

	ret = iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, PUNIT_SEMAPHORE, sem);

	if (ret) {

		dev_err(dev->dev, "iosf punit semaphore request failed\n");

		return ret;
@@ -102,8 +98,7 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) 
	dev_err(dev->dev, "punit semaphore timed out, resetting\n");

	reset_semaphore(dev->dev);



	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, BT_MBI_BUNIT_READ,

				PUNIT_SEMAPHORE, &sem);

	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, PUNIT_SEMAPHORE, &sem);

	if (ret)

		dev_err(dev->dev, "iosf failed to read punit semaphore\n");

	else

drivers/powercap/intel_rapl.c

+5 −5
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ static void set_floor_freq_atom(struct rapl_domain *rd, bool enable) 
	}



	if (!power_ctrl_orig_val)

		iosf_mbi_read(BT_MBI_UNIT_PMC, BT_MBI_PMC_READ,

		iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_CR_READ,

			      rapl_defaults->floor_freq_reg_addr,

			      &power_ctrl_orig_val);

	mdata = power_ctrl_orig_val;
@@ -996,7 +996,7 @@ static void set_floor_freq_atom(struct rapl_domain *rd, bool enable) 
		mdata &= ~(0x7f << 8);

		mdata |= 1 << 8;

	}

	iosf_mbi_write(BT_MBI_UNIT_PMC, BT_MBI_PMC_WRITE,

	iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_CR_WRITE,

		       rapl_defaults->floor_freq_reg_addr, mdata);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE