summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2020-12-05 20:25:27 +0100
committerAngel Pons <th3fanbus@gmail.com>2020-12-10 15:54:46 +0000
commit244cf7d3a6d8db2a2ea5541815a0bd4e564c8195 (patch)
tree95155cb287a1c204faef0a95960286c5ccd087b4 /src
parentbb19d39487e4c71c29313e711bf3684d815263e6 (diff)
downloadcoreboot-244cf7d3a6d8db2a2ea5541815a0bd4e564c8195.tar.xz
sb/intel/x/smbus.c: Add block read/write support
Copy and paste the i82801gx code onto all newer southbridges. This will be factored out into common code in a follow-up. Change-Id: Ic4b7d657865f61703e4310423c565786badf6f40 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48363 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src')
-rw-r--r--src/southbridge/intel/bd82x6x/smbus.c27
-rw-r--r--src/southbridge/intel/i82801ix/smbus.c27
-rw-r--r--src/southbridge/intel/i82801jx/smbus.c8
-rw-r--r--src/southbridge/intel/ibexpeak/smbus.c27
-rw-r--r--src/southbridge/intel/lynxpoint/smbus.c26
5 files changed, 107 insertions, 8 deletions
diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c
index 4255a47396..0da3b76030 100644
--- a/src/southbridge/intel/bd82x6x/smbus.c
+++ b/src/southbridge/intel/bd82x6x/smbus.c
@@ -49,13 +49,38 @@ static int lsmbus_write_byte(struct device *dev, u8 address, u8 data)
device = dev->path.i2c.device;
pbus = get_pbus_smbus(dev);
res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
-
return do_smbus_write_byte(res->base, device, address, data);
}
+static int lsmbus_block_write(struct device *dev, u8 cmd, u8 bytes, const u8 *buf)
+{
+ u16 device;
+ struct resource *res;
+ struct bus *pbus;
+
+ device = dev->path.i2c.device;
+ pbus = get_pbus_smbus(dev);
+ res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
+ return do_smbus_block_write(res->base, device, cmd, bytes, buf);
+}
+
+static int lsmbus_block_read(struct device *dev, u8 cmd, u8 bytes, u8 *buf)
+{
+ u16 device;
+ struct resource *res;
+ struct bus *pbus;
+
+ device = dev->path.i2c.device;
+ pbus = get_pbus_smbus(dev);
+ res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
+ return do_smbus_block_read(res->base, device, cmd, bytes, buf);
+}
+
static struct smbus_bus_operations lops_smbus_bus = {
.read_byte = lsmbus_read_byte,
.write_byte = lsmbus_write_byte,
+ .block_read = lsmbus_block_read,
+ .block_write = lsmbus_block_write,
};
static void smbus_read_resources(struct device *dev)
diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c
index 4f46217a2a..8daaf2ecf1 100644
--- a/src/southbridge/intel/i82801ix/smbus.c
+++ b/src/southbridge/intel/i82801ix/smbus.c
@@ -38,13 +38,38 @@ static int lsmbus_write_byte(struct device *dev, u8 address, u8 data)
device = dev->path.i2c.device;
pbus = get_pbus_smbus(dev);
res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
-
return do_smbus_write_byte(res->base, device, address, data);
}
+static int lsmbus_block_write(struct device *dev, u8 cmd, u8 bytes, const u8 *buf)
+{
+ u16 device;
+ struct resource *res;
+ struct bus *pbus;
+
+ device = dev->path.i2c.device;
+ pbus = get_pbus_smbus(dev);
+ res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
+ return do_smbus_block_write(res->base, device, cmd, bytes, buf);
+}
+
+static int lsmbus_block_read(struct device *dev, u8 cmd, u8 bytes, u8 *buf)
+{
+ u16 device;
+ struct resource *res;
+ struct bus *pbus;
+
+ device = dev->path.i2c.device;
+ pbus = get_pbus_smbus(dev);
+ res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
+ return do_smbus_block_read(res->base, device, cmd, bytes, buf);
+}
+
static struct smbus_bus_operations lops_smbus_bus = {
.read_byte = lsmbus_read_byte,
.write_byte = lsmbus_write_byte,
+ .block_read = lsmbus_block_read,
+ .block_write = lsmbus_block_write,
};
static void smbus_read_resources(struct device *dev)
diff --git a/src/southbridge/intel/i82801jx/smbus.c b/src/southbridge/intel/i82801jx/smbus.c
index c3a798a4e4..2e2491aad5 100644
--- a/src/southbridge/intel/i82801jx/smbus.c
+++ b/src/southbridge/intel/i82801jx/smbus.c
@@ -38,12 +38,10 @@ static int lsmbus_write_byte(struct device *dev, u8 address, u8 data)
device = dev->path.i2c.device;
pbus = get_pbus_smbus(dev);
res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
-
return do_smbus_write_byte(res->base, device, address, data);
}
-static int lsmbus_block_write(struct device *dev, u8 cmd, u8 bytes,
- const u8 *buf)
+static int lsmbus_block_write(struct device *dev, u8 cmd, u8 bytes, const u8 *buf)
{
u16 device;
struct resource *res;
@@ -70,8 +68,8 @@ static int lsmbus_block_read(struct device *dev, u8 cmd, u8 bytes, u8 *buf)
static struct smbus_bus_operations lops_smbus_bus = {
.read_byte = lsmbus_read_byte,
.write_byte = lsmbus_write_byte,
- .block_read = lsmbus_block_read,
- .block_write = lsmbus_block_write,
+ .block_read = lsmbus_block_read,
+ .block_write = lsmbus_block_write,
};
static void smbus_read_resources(struct device *dev)
diff --git a/src/southbridge/intel/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c
index 331021fab2..7e976e0c2e 100644
--- a/src/southbridge/intel/ibexpeak/smbus.c
+++ b/src/southbridge/intel/ibexpeak/smbus.c
@@ -48,13 +48,38 @@ static int lsmbus_write_byte(struct device *dev, u8 address, u8 data)
device = dev->path.i2c.device;
pbus = get_pbus_smbus(dev);
res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
-
return do_smbus_write_byte(res->base, device, address, data);
}
+static int lsmbus_block_write(struct device *dev, u8 cmd, u8 bytes, const u8 *buf)
+{
+ u16 device;
+ struct resource *res;
+ struct bus *pbus;
+
+ device = dev->path.i2c.device;
+ pbus = get_pbus_smbus(dev);
+ res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
+ return do_smbus_block_write(res->base, device, cmd, bytes, buf);
+}
+
+static int lsmbus_block_read(struct device *dev, u8 cmd, u8 bytes, u8 *buf)
+{
+ u16 device;
+ struct resource *res;
+ struct bus *pbus;
+
+ device = dev->path.i2c.device;
+ pbus = get_pbus_smbus(dev);
+ res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
+ return do_smbus_block_read(res->base, device, cmd, bytes, buf);
+}
+
static struct smbus_bus_operations lops_smbus_bus = {
.read_byte = lsmbus_read_byte,
.write_byte = lsmbus_write_byte,
+ .block_read = lsmbus_block_read,
+ .block_write = lsmbus_block_write,
};
static void smbus_read_resources(struct device *dev)
diff --git a/src/southbridge/intel/lynxpoint/smbus.c b/src/southbridge/intel/lynxpoint/smbus.c
index d0a621eea1..a173b4366d 100644
--- a/src/southbridge/intel/lynxpoint/smbus.c
+++ b/src/southbridge/intel/lynxpoint/smbus.c
@@ -51,9 +51,35 @@ static int lsmbus_write_byte(struct device *dev, u8 address, u8 data)
return do_smbus_write_byte(res->base, device, address, data);
}
+static int lsmbus_block_write(struct device *dev, u8 cmd, u8 bytes, const u8 *buf)
+{
+ u16 device;
+ struct resource *res;
+ struct bus *pbus;
+
+ device = dev->path.i2c.device;
+ pbus = get_pbus_smbus(dev);
+ res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
+ return do_smbus_block_write(res->base, device, cmd, bytes, buf);
+}
+
+static int lsmbus_block_read(struct device *dev, u8 cmd, u8 bytes, u8 *buf)
+{
+ u16 device;
+ struct resource *res;
+ struct bus *pbus;
+
+ device = dev->path.i2c.device;
+ pbus = get_pbus_smbus(dev);
+ res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4);
+ return do_smbus_block_read(res->base, device, cmd, bytes, buf);
+}
+
static struct smbus_bus_operations lops_smbus_bus = {
.read_byte = lsmbus_read_byte,
.write_byte = lsmbus_write_byte,
+ .block_read = lsmbus_block_read,
+ .block_write = lsmbus_block_write,
};
static void smbus_read_resources(struct device *dev)