You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
190 lines
4.9 KiB
Diff
190 lines
4.9 KiB
Diff
Add support for 8bit reads/writes to SSB.
|
|
--- a/drivers/ssb/main.c
|
|
+++ b/drivers/ssb/main.c
|
|
@@ -508,6 +508,14 @@
|
|
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;
|
|
@@ -524,6 +532,14 @@
|
|
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;
|
|
@@ -542,8 +558,10 @@
|
|
|
|
/* 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,
|
|
};
|
|
--- a/drivers/ssb/pci.c
|
|
+++ b/drivers/ssb/pci.c
|
|
@@ -577,6 +577,19 @@
|
|
}
|
|
#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;
|
|
@@ -603,6 +616,19 @@
|
|
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;
|
|
@@ -631,8 +657,10 @@
|
|
|
|
/* 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,
|
|
};
|
|
--- a/drivers/ssb/pcmcia.c
|
|
+++ b/drivers/ssb/pcmcia.c
|
|
@@ -172,6 +172,22 @@
|
|
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 @@
|
|
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 @@
|
|
|
|
/* 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,
|
|
};
|
|
--- a/include/linux/ssb/ssb.h
|
|
+++ b/include/linux/ssb/ssb.h
|
|
@@ -72,8 +72,10 @@
|
|
/* 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);
|
|
};
|
|
@@ -348,6 +350,10 @@
|
|
|
|
|
|
/* 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);
|
|
@@ -356,6 +362,10 @@
|
|
{
|
|
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);
|