Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffc7689d authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

ssb: Add support for 8bit register access 



This adds support for 8bit wide register reads/writes.
This is needed in order to support the gigabit ethernet core.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 004c872e

drivers/ssb/main.c

+18 −0
Original line number Diff line number Diff line
@@ -505,6 +505,14 @@ 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;
@@ -521,6 +529,14 @@ static u32 ssb_ssb_read32(struct ssb_device *dev, u16 offset) 
	return readl(bus->mmio + offset);

}



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;
@@ -539,8 +555,10 @@ static void ssb_ssb_write32(struct ssb_device *dev, u16 offset, u32 value) 


/* 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,

};

drivers/ssb/pci.c

+28 −0
Original line number Diff line number Diff line
@@ -572,6 +572,19 @@ static inline int ssb_pci_assert_buspower(struct ssb_bus *bus) 
}

#endif /* DEBUG */



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

{

	struct ssb_bus *bus = dev->bus;



	if (unlikely(ssb_pci_assert_buspower(bus)))

		return 0xFF;

	if (unlikely(bus->mapped_device != dev)) {

		if (unlikely(ssb_pci_switch_core(bus, dev)))

			return 0xFF;

	}

	return ioread8(bus->mmio + offset);

}



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

{

	struct ssb_bus *bus = dev->bus;
@@ -598,6 +611,19 @@ static u32 ssb_pci_read32(struct ssb_device *dev, u16 offset) 
	return ioread32(bus->mmio + offset);

}



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

{

	struct ssb_bus *bus = dev->bus;



	if (unlikely(ssb_pci_assert_buspower(bus)))

		return;

	if (unlikely(bus->mapped_device != dev)) {

		if (unlikely(ssb_pci_switch_core(bus, dev)))

			return;

	}

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

}



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

{

	struct ssb_bus *bus = dev->bus;
@@ -626,8 +652,10 @@ static void ssb_pci_write32(struct ssb_device *dev, u16 offset, u32 value) 


/* Not "static", as it's used in main.c */

const struct ssb_bus_ops ssb_pci_ops = {

	.read8		= ssb_pci_read8,

	.read16		= ssb_pci_read16,

	.read32		= ssb_pci_read32,

	.write8		= ssb_pci_write8,

	.write16	= ssb_pci_write16,

	.write32	= ssb_pci_write32,

};

drivers/ssb/pcmcia.c

+32 −0
Original line number Diff line number Diff line
@@ -172,6 +172,22 @@ static int select_core_and_segment(struct ssb_device *dev, 
	return 0;

}



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

{

	struct ssb_bus *bus = dev->bus;

	unsigned long flags;

	int err;

	u8 value = 0xFF;



	spin_lock_irqsave(&bus->bar_lock, flags);

	err = select_core_and_segment(dev, &offset);

	if (likely(!err))

		value = readb(bus->mmio + offset);

	spin_unlock_irqrestore(&bus->bar_lock, flags);



	return value;

}



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

{

	struct ssb_bus *bus = dev->bus;
@@ -206,6 +222,20 @@ static u32 ssb_pcmcia_read32(struct ssb_device *dev, u16 offset) 
	return (lo | (hi << 16));

}



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

{

	struct ssb_bus *bus = dev->bus;

	unsigned long flags;

	int err;



	spin_lock_irqsave(&bus->bar_lock, flags);

	err = select_core_and_segment(dev, &offset);

	if (likely(!err))

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

	mmiowb();

	spin_unlock_irqrestore(&bus->bar_lock, flags);

}



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

{

	struct ssb_bus *bus = dev->bus;
@@ -238,8 +268,10 @@ static void ssb_pcmcia_write32(struct ssb_device *dev, u16 offset, u32 value) 


/* Not "static", as it's used in main.c */

const struct ssb_bus_ops ssb_pcmcia_ops = {

	.read8		= ssb_pcmcia_read8,

	.read16		= ssb_pcmcia_read16,

	.read32		= ssb_pcmcia_read32,

	.write8		= ssb_pcmcia_write8,

	.write16	= ssb_pcmcia_write16,

	.write32	= ssb_pcmcia_write32,

};

include/linux/ssb/ssb.h

+10 −0
Original line number Diff line number Diff line
@@ -72,8 +72,10 @@ struct ssb_device; 
/* Lowlevel read/write operations on the device MMIO.

 * Internal, don't use that outside of ssb. */

struct ssb_bus_ops {

	u8 (*read8)(struct ssb_device *dev, u16 offset);

	u16 (*read16)(struct ssb_device *dev, u16 offset);

	u32 (*read32)(struct ssb_device *dev, u16 offset);

	void (*write8)(struct ssb_device *dev, u16 offset, u8 value);

	void (*write16)(struct ssb_device *dev, u16 offset, u16 value);

	void (*write32)(struct ssb_device *dev, u16 offset, u32 value);

};
@@ -344,6 +346,10 @@ void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags); 




/* Device MMIO register read/write functions. */

static inline u8 ssb_read8(struct ssb_device *dev, u16 offset)

{

	return dev->ops->read8(dev, offset);

}

static inline u16 ssb_read16(struct ssb_device *dev, u16 offset)

{

	return dev->ops->read16(dev, offset);
@@ -352,6 +358,10 @@ static inline u32 ssb_read32(struct ssb_device *dev, u16 offset) 
{

	return dev->ops->read32(dev, offset);

}

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

{

	dev->ops->write8(dev, offset, value);

}

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

{

	dev->ops->write16(dev, offset, value);