Commit 830c7df4 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

ssb: move functions specific to SoC hosted bus to separated file 



This cleans main.c a bit and will allow us to compile SoC related code
conditionally in the future.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 399500da

drivers/ssb/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ ssb-$(CONFIG_SSB_SPROM) += sprom.o 
ssb-$(CONFIG_SSB_PCIHOST)		+= pci.o pcihost_wrapper.o

ssb-$(CONFIG_SSB_PCMCIAHOST)		+= pcmcia.o bridge_pcmcia_80211.o

ssb-$(CONFIG_SSB_SDIOHOST)		+= sdio.o

ssb-y					+= host_soc.o



# built-in drivers

ssb-y					+= driver_chipcommon.o

drivers/ssb/host_soc.c

0 → 100644
+173 −0
Original line number Diff line number Diff line 
/*

 * Sonics Silicon Backplane SoC host related functions.

 * Subsystem core

 *

 * Copyright 2005, Broadcom Corporation

 * Copyright 2006, 2007, Michael Buesch <m@bues.ch>

 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include <linux/ssb/ssb.h>



#include "ssb_private.h"



static u8 ssb_host_soc_read8(struct ssb_device *dev, u16 offset)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	return readb(bus->mmio + offset);

}



static u16 ssb_host_soc_read16(struct ssb_device *dev, u16 offset)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	return readw(bus->mmio + offset);

}



static u32 ssb_host_soc_read32(struct ssb_device *dev, u16 offset)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	return readl(bus->mmio + offset);

}



#ifdef CONFIG_SSB_BLOCKIO

static void ssb_host_soc_block_read(struct ssb_device *dev, void *buffer,

				    size_t count, u16 offset, u8 reg_width)

{

	struct ssb_bus *bus = dev->bus;

	void __iomem *addr;



	offset += dev->core_index * SSB_CORE_SIZE;

	addr = bus->mmio + offset;



	switch (reg_width) {

	case sizeof(u8): {

		u8 *buf = buffer;



		while (count) {

			*buf = __raw_readb(addr);

			buf++;

			count--;

		}

		break;

	}

	case sizeof(u16): {

		__le16 *buf = buffer;



		SSB_WARN_ON(count & 1);

		while (count) {

			*buf = (__force __le16)__raw_readw(addr);

			buf++;

			count -= 2;

		}

		break;

	}

	case sizeof(u32): {

		__le32 *buf = buffer;



		SSB_WARN_ON(count & 3);

		while (count) {

			*buf = (__force __le32)__raw_readl(addr);

			buf++;

			count -= 4;

		}

		break;

	}

	default:

		SSB_WARN_ON(1);

	}

}

#endif /* CONFIG_SSB_BLOCKIO */



static void ssb_host_soc_write8(struct ssb_device *dev, u16 offset, u8 value)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	writeb(value, bus->mmio + offset);

}



static void ssb_host_soc_write16(struct ssb_device *dev, u16 offset, u16 value)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	writew(value, bus->mmio + offset);

}



static void ssb_host_soc_write32(struct ssb_device *dev, u16 offset, u32 value)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	writel(value, bus->mmio + offset);

}



#ifdef CONFIG_SSB_BLOCKIO

static void ssb_host_soc_block_write(struct ssb_device *dev, const void *buffer,

				     size_t count, u16 offset, u8 reg_width)

{

	struct ssb_bus *bus = dev->bus;

	void __iomem *addr;



	offset += dev->core_index * SSB_CORE_SIZE;

	addr = bus->mmio + offset;



	switch (reg_width) {

	case sizeof(u8): {

		const u8 *buf = buffer;



		while (count) {

			__raw_writeb(*buf, addr);

			buf++;

			count--;

		}

		break;

	}

	case sizeof(u16): {

		const __le16 *buf = buffer;



		SSB_WARN_ON(count & 1);

		while (count) {

			__raw_writew((__force u16)(*buf), addr);

			buf++;

			count -= 2;

		}

		break;

	}

	case sizeof(u32): {

		const __le32 *buf = buffer;



		SSB_WARN_ON(count & 3);

		while (count) {

			__raw_writel((__force u32)(*buf), addr);

			buf++;

			count -= 4;

		}

		break;

	}

	default:

		SSB_WARN_ON(1);

	}

}

#endif /* CONFIG_SSB_BLOCKIO */



/* Ops for the plain SSB bus without a host-device (no PCI or PCMCIA). */

const struct ssb_bus_ops ssb_host_soc_ops = {

	.read8		= ssb_host_soc_read8,

	.read16		= ssb_host_soc_read16,

	.read32		= ssb_host_soc_read32,

	.write8		= ssb_host_soc_write8,

	.write16	= ssb_host_soc_write16,

	.write32	= ssb_host_soc_write32,

#ifdef CONFIG_SSB_BLOCKIO

	.block_read	= ssb_host_soc_block_read,

	.block_write	= ssb_host_soc_block_write,

#endif

};

drivers/ssb/main.c

+1 −161
Original line number Diff line number Diff line
@@ -596,166 +596,6 @@ static int ssb_attach_queued_buses(void) 
	return err;

}



static u8 ssb_ssb_read8(struct ssb_device *dev, u16 offset)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	return readb(bus->mmio + offset);

}



static u16 ssb_ssb_read16(struct ssb_device *dev, u16 offset)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	return readw(bus->mmio + offset);

}



static u32 ssb_ssb_read32(struct ssb_device *dev, u16 offset)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	return readl(bus->mmio + offset);

}



#ifdef CONFIG_SSB_BLOCKIO

static void ssb_ssb_block_read(struct ssb_device *dev, void *buffer,

			       size_t count, u16 offset, u8 reg_width)

{

	struct ssb_bus *bus = dev->bus;

	void __iomem *addr;



	offset += dev->core_index * SSB_CORE_SIZE;

	addr = bus->mmio + offset;



	switch (reg_width) {

	case sizeof(u8): {

		u8 *buf = buffer;



		while (count) {

			*buf = __raw_readb(addr);

			buf++;

			count--;

		}

		break;

	}

	case sizeof(u16): {

		__le16 *buf = buffer;



		SSB_WARN_ON(count & 1);

		while (count) {

			*buf = (__force __le16)__raw_readw(addr);

			buf++;

			count -= 2;

		}

		break;

	}

	case sizeof(u32): {

		__le32 *buf = buffer;



		SSB_WARN_ON(count & 3);

		while (count) {

			*buf = (__force __le32)__raw_readl(addr);

			buf++;

			count -= 4;

		}

		break;

	}

	default:

		SSB_WARN_ON(1);

	}

}

#endif /* CONFIG_SSB_BLOCKIO */



static void ssb_ssb_write8(struct ssb_device *dev, u16 offset, u8 value)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	writeb(value, bus->mmio + offset);

}



static void ssb_ssb_write16(struct ssb_device *dev, u16 offset, u16 value)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	writew(value, bus->mmio + offset);

}



static void ssb_ssb_write32(struct ssb_device *dev, u16 offset, u32 value)

{

	struct ssb_bus *bus = dev->bus;



	offset += dev->core_index * SSB_CORE_SIZE;

	writel(value, bus->mmio + offset);

}



#ifdef CONFIG_SSB_BLOCKIO

static void ssb_ssb_block_write(struct ssb_device *dev, const void *buffer,

				size_t count, u16 offset, u8 reg_width)

{

	struct ssb_bus *bus = dev->bus;

	void __iomem *addr;



	offset += dev->core_index * SSB_CORE_SIZE;

	addr = bus->mmio + offset;



	switch (reg_width) {

	case sizeof(u8): {

		const u8 *buf = buffer;



		while (count) {

			__raw_writeb(*buf, addr);

			buf++;

			count--;

		}

		break;

	}

	case sizeof(u16): {

		const __le16 *buf = buffer;



		SSB_WARN_ON(count & 1);

		while (count) {

			__raw_writew((__force u16)(*buf), addr);

			buf++;

			count -= 2;

		}

		break;

	}

	case sizeof(u32): {

		const __le32 *buf = buffer;



		SSB_WARN_ON(count & 3);

		while (count) {

			__raw_writel((__force u32)(*buf), addr);

			buf++;

			count -= 4;

		}

		break;

	}

	default:

		SSB_WARN_ON(1);

	}

}

#endif /* CONFIG_SSB_BLOCKIO */



/* Ops for the plain SSB bus without a host-device (no PCI or PCMCIA). */

static const struct ssb_bus_ops ssb_ssb_ops = {

	.read8		= ssb_ssb_read8,

	.read16		= ssb_ssb_read16,

	.read32		= ssb_ssb_read32,

	.write8		= ssb_ssb_write8,

	.write16	= ssb_ssb_write16,

	.write32	= ssb_ssb_write32,

#ifdef CONFIG_SSB_BLOCKIO

	.block_read	= ssb_ssb_block_read,

	.block_write	= ssb_ssb_block_write,

#endif

};



static int ssb_fetch_invariants(struct ssb_bus *bus,

				ssb_invariants_func_t get_invariants)

{
@@ -927,7 +767,7 @@ int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr, 
	int err;



	bus->bustype = SSB_BUSTYPE_SSB;

	bus->ops = &ssb_ssb_ops;

	bus->ops = &ssb_host_soc_ops;



	err = ssb_bus_register(bus, get_invariants, baseaddr);

	if (!err) {

drivers/ssb/ssb_private.h

+5 −0
Original line number Diff line number Diff line
@@ -157,6 +157,11 @@ static inline int ssb_sdio_init(struct ssb_bus *bus) 
}

#endif /* CONFIG_SSB_SDIOHOST */



/**************************************************

 * host_soc.c

 **************************************************/



extern const struct ssb_bus_ops ssb_host_soc_ops;



/* scan.c */

extern const char *ssb_core_name(u16 coreid);