summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/phy/et131x.c309
-rw-r--r--sys/dev/random/chacha20.c97
-rw-r--r--sys/dev/random/entropy.c2
-rw-r--r--sys/dev/random/random.c4
-rw-r--r--sys/dev/random/siphash.c116
5 files changed, 312 insertions, 216 deletions
diff --git a/sys/dev/phy/et131x.c b/sys/dev/phy/et131x.c
new file mode 100644
index 0000000..f8a8ed5
--- /dev/null
+++ b/sys/dev/phy/et131x.c
@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * This driver is the product of reverse engineering
+ * work done by Ian Marco Moffett and the OSMORA team.
+ *
+ * Please refer to share/docs/hw/et131x.txt
+ */
+
+#include <sys/types.h>
+#include <sys/driver.h>
+#include <sys/errno.h>
+#include <sys/syslog.h>
+#include <sys/mmio.h>
+#include <dev/pci/pci.h>
+#include <dev/pci/pciregs.h>
+#include <dev/phy/et131xregs.h>
+#include <dev/timer.h>
+#include <net/if_var.h>
+
+#define VENDOR_ID 0x11C1 /* Agere */
+#define DEVICE_ID 0xED00
+
+#define pr_trace(fmt, ...) kprintf("et131x: " fmt, ##__VA_ARGS__)
+#define pr_error(...) pr_trace(__VA_ARGS__)
+
+/* Helpful constants */
+#define ETHERFRAME_LEN 1518 /* Length of ethernet frame */
+#define ETHER_FCS_LEN 4 /* Length of frame check seq */
+
+struct netcard {
+ struct et131x_iospace *io;
+};
+
+static struct pci_device *dev;
+static struct netcard g_card;
+static struct timer tmr;
+
+/*
+ * Software reset the ET131X
+ *
+ * @io: Register space
+ */
+static void
+et131x_soft_reset(struct netcard *card)
+{
+ struct et131x_iospace *io = card->io;
+ uint32_t tmp;
+
+ tmp = (
+ MAC_CFG1_RESET_TXMC |
+ MAC_CFG1_RESET_RXMC |
+ MAC_CFG1_RESET_TXFUNC |
+ MAC_CFG1_RESET_RXFUNC |
+ MAC_CFG1_SOFTRST |
+ MAC_CFG1_SIMRST
+ );
+
+ /*
+ * Reset the MAC core, bring it down. After that,
+ * we perform a global reset to bring the whole
+ * chip down.
+ */
+ mmio_write32(&io->mac.cfg1, tmp);
+ mmio_write32(&io->global.sw_reset, GBL_RESET_ALL);
+
+ /*
+ * Reset the MAC again for good measure, but
+ * this time a little softer. We already slammed
+ * the poor thing.
+ */
+ tmp &= ~(MAC_CFG1_SOFTRST | MAC_CFG1_SIMRST);
+ mmio_write32(&io->mac.cfg1, tmp);
+ mmio_write32(&io->mac.cfg1, 0);
+}
+
+/*
+ * Write to the PHY through MII
+ *
+ * @io: Register space
+ * @addr: PHY address
+ * @reg: PHY register
+ * @v: Value to write
+ */
+static int
+et131x_mii_write(struct netcard *card, uint8_t addr, uint8_t reg, uint16_t v)
+{
+ struct et131x_iospace *io = card->io;
+ uint16_t mii_addr;
+ uint32_t tmp, mgmt_addr_old;
+ uint32_t mgmt_cmd_old;
+ uint8_t ndelay = 0;
+ int retval = 0;
+
+ /* Save MII management regs state */
+ mgmt_cmd_old = mmio_read32(&io->mac.mii_mgmt_cmd);
+ mgmt_addr_old = mmio_read32(&io->mac.mii_mgmt_addr);
+ mii_addr = MAC_MII_ADDR(addr, reg);
+
+ /*
+ * Stop any transactions that are currently
+ * happening on the MDIO bus and prepare the
+ * write.
+ */
+ mmio_write32(&io->mac.mii_mgmt_cmd, 0);
+ mmio_write32(&io->mac.mii_mgmt_addr, mii_addr);
+ mmio_write32(&io->mac.mii_mgmt_ctrl, v);
+
+ for (;;) {
+ tmr.usleep(50);
+ ++ndelay;
+
+ tmp = mmio_read32(&io->mac.mii_mgmt_indicator);
+ if (!ISSET(tmp, MAC_MGMT_BUSY))
+ break;
+ if (ndelay >= 50)
+ break;
+ }
+
+ if (ndelay >= 50) {
+ pr_error("could not write PHY reg %x (status=%x)\n", reg, tmp);
+ retval = -EIO;
+ goto done;
+ }
+
+done:
+ /* Stop operations and restore state */
+ mmio_write32(&io->mac.mii_mgmt_cmd, 0);
+ mmio_write32(&io->mac.mii_mgmt_addr, mgmt_addr_old);
+ mmio_write32(&io->mac.mii_mgmt_cmd, mgmt_cmd_old);
+ return retval;
+}
+
+/*
+ * Initialize PCI related things for the
+ * chip.
+ */
+static void
+et131x_init_pci(void)
+{
+ uint32_t tmp;
+
+ /* Enable bus mastering and MMIO */
+ tmp = pci_readl(dev, PCIREG_CMDSTATUS);
+ tmp |= (PCI_BUS_MASTERING | PCI_MEM_SPACE);
+ pci_writel(dev, PCIREG_CMDSTATUS, tmp);
+}
+
+/*
+ * Blink both LEDs of the card
+ *
+ * @io: Register space
+ * @count: Number of times to blink
+ * @delay: Millisecond delay between blinks
+ */
+static void
+et131x_blink(struct netcard *card, uint32_t count, uint16_t delay)
+{
+ uint16_t on_val;
+
+ on_val = (LED_ON << LED_LINK_SHIFT);
+ on_val |= (LED_ON << LED_TXRX_SHIFT);
+ for (uint32_t i = 0; i < count; ++i) {
+ et131x_mii_write(card, 0, PHY_LED2, on_val);
+ tmr.msleep(delay);
+ et131x_mii_write(card, 0, PHY_LED2, LED_ALL_OFF);
+ tmr.msleep(delay);
+ }
+}
+
+/*
+ * Initialize the MAC into a functional
+ * state.
+ *
+ * @io: Register space.
+ */
+static void
+et131x_mac_init(struct netcard *card)
+{
+ struct et131x_iospace *io = card->io;
+ struct mac_regs *mac = &io->mac;
+ struct netif_addr addr;
+ uint32_t ipg_tmp, tmp;
+
+ /*
+ * Okay so we need to reset the card so it doesn't
+ * do undefined bullshit. God forbid we get undefined
+ * behaviour without having a fucking official datasheet.
+ * Most would end themselves right then and there.
+ *
+ * Now, after we've done that, we must ensure that any
+ * packets larger than ETHERFRAME_LEN are truncated by
+ * the MAC. Again, something like an internal buffer
+ * overrun during TX/RX would be quite fucking horrible.
+ *
+ * We also want to clear the MAC interface control and MII
+ * clock to ensure it is in a known state.
+ */
+ et131x_soft_reset(card);
+ mmio_write32(&mac->max_fm_len, ETHERFRAME_LEN);
+ mmio_write32(&mac->if_ctrl, 0);
+ mmio_write32(&mac->mii_mgmt_cfg, MAC_MIIMGMT_CLK_RST);
+
+ /*
+ * Set up half duplex config
+ *
+ * - BEB trunc (0xA)
+ * - Excess defer
+ * - Re-transmit (0xF)
+ * - Collision window
+ */
+ mmio_write32(&mac->hfdp, 0x00A1F037);
+
+ /*
+ * Setup the MAC interpacket gap register
+ *
+ * - IPG1 (0x38)
+ * - IPG2 (0x58)
+ * - B2B (0x60)
+ */
+ ipg_tmp = ((0x50 << 8) | 0x38005860);
+ mmio_write32(&mac->ipg, ipg_tmp);
+
+ /* MAC address dword 0 */
+ tmp = pci_readl(dev, PCI_MAC_ADDRESS);
+ addr.data[0] = tmp & 0xFF;
+ addr.data[1] = (tmp >> 8) & 0xFF;
+ addr.data[2] = (tmp >> 16) & 0xFF;
+ addr.data[3] = (tmp >> 24) & 0xFF;
+
+ /* MAC address word 1 */
+ tmp = pci_readl(dev, PCI_MAC_ADDRESS + 4);
+ addr.data[4] = tmp & 0xFF;
+ addr.data[5] = (tmp >> 8) & 0xFF;
+
+ /* Print out the MAC address */
+ pr_trace("MAC address: %x:%x:%x:%x:%x:%x\n",
+ (uint64_t)addr.data[0], (uint64_t)addr.data[1],
+ (uint64_t)addr.data[2], (uint64_t)addr.data[3],
+ (uint64_t)addr.data[4], (uint64_t)addr.data[5]);
+}
+
+static int
+et131x_init(void)
+{
+ struct pci_lookup lookup;
+ int error;
+
+ lookup.vendor_id = VENDOR_ID;
+ lookup.device_id = DEVICE_ID;
+ dev = pci_get_device(lookup, PCI_VENDOR_ID | PCI_DEVICE_ID);
+ if (dev == NULL) {
+ return -ENODEV;
+ }
+
+ pr_trace("Agere ET1310 Ethernet ctl <phy? at pci%d:%x.%x.%d>\n",
+ dev->bus, dev->device_id, dev->func,
+ dev->slot);
+
+ /* Try to request a general purpose timer */
+ if (req_timer(TIMER_GP, &tmr) != TMRR_SUCCESS) {
+ pr_error("failed to fetch general purpose timer\n");
+ return -ENODEV;
+ }
+
+ /* Ensure it has get_time_usec() */
+ if (tmr.usleep == NULL) {
+ pr_error("general purpose timer has no usleep()\n");
+ return -ENODEV;
+ }
+
+ if ((error = pci_map_bar(dev, 0, (void *)&g_card.io)) != 0) {
+ return error;
+ }
+
+ et131x_init_pci();
+ et131x_mac_init(&g_card);
+ et131x_blink(&g_card, 4, 150);
+ return 0;
+}
+
+DRIVER_DEFER(et131x_init, "et131x");
diff --git a/sys/dev/random/chacha20.c b/sys/dev/random/chacha20.c
deleted file mode 100644
index 41f823c..0000000
--- a/sys/dev/random/chacha20.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Hyra nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <dev/random/chacha20.h>
-
-static const char sigma[16] = "expand 32-byte k";
-
-void chacha20_init(uint32_t state[16], const uint8_t key[32],
- const uint8_t nonce[12], uint32_t counter)
-{
- state[0] = ((uint32_t *)sigma)[0];
- state[1] = ((uint32_t *)sigma)[1];
- state[2] = ((uint32_t *)sigma)[2];
- state[3] = ((uint32_t *)sigma)[3];
-
- for (int i = 0; i < 8; ++i) {
- state[4 + i] = ((uint32_t *)key)[i];
- }
-
- state[12] = counter;
- state[13] = ((uint32_t *)nonce)[0];
- state[14] = ((uint32_t *)nonce)[1];
- state[15] = ((uint32_t *)nonce)[2];
-}
-
-void
-chacha20_block(uint32_t state[16], uint8_t out[64])
-{
- uint32_t x[16];
- memcpy(x, state, sizeof(x));
-
- for (int i = 0; i < 10; i++) {
-
- QR(x[0], x[4], x[8], x[12]);
- QR(x[1], x[5], x[9], x[13]);
- QR(x[2], x[6], x[10], x[14]);
- QR(x[3], x[7], x[11], x[15]);
-
- QR(x[0], x[5], x[10], x[15]);
- QR(x[1], x[6], x[11], x[12]);
- QR(x[2], x[7], x[8], x[13]);
- QR(x[3], x[4], x[9], x[14]);
- }
-
- for (int i = 0; i < 16; ++i) {
- x[i] += state[i];
- ((uint32_t *)out)[i] = x[i];
- }
-
- state[12]++;
-}
-
-void
-chacha20_encrypt(uint32_t state[16], uint8_t *in,
- uint8_t *out, size_t len)
-{
- uint8_t block[64];
- size_t offset = 0;
-
- while (len > 0) {
- chacha20_block(state, block);
- size_t n = len > 64 ? 64 : len;
-
- for (size_t i = 0; i < n; ++i) {
- out[offset + i] = in ? in[offset + i] ^ block[i] : block[i];
- }
-
- offset += n;
- len -= n;
- }
-}
diff --git a/sys/dev/random/entropy.c b/sys/dev/random/entropy.c
index d392b9c..4e723a4 100644
--- a/sys/dev/random/entropy.c
+++ b/sys/dev/random/entropy.c
@@ -30,7 +30,7 @@
#include <stdint.h>
#include <string.h>
#include <dev/random/entropy.h>
-#include <dev/random/siphash.h>
+#include <crypto/siphash.h>
void
mix_entropy(struct entropy_pool *ep, const uint8_t *input,
diff --git a/sys/dev/random/random.c b/sys/dev/random/random.c
index d79df69..9bca719 100644
--- a/sys/dev/random/random.c
+++ b/sys/dev/random/random.c
@@ -30,9 +30,9 @@
#include <sys/sio.h>
#include <sys/device.h>
#include <sys/driver.h>
-#include <dev/random/chacha20.h>
-#include <dev/random/siphash.h>
#include <dev/random/entropy.h>
+#include <crypto/chacha20.h>
+#include <crypto/siphash.h>
#include <fs/devfs.h>
#include <string.h>
diff --git a/sys/dev/random/siphash.c b/sys/dev/random/siphash.c
deleted file mode 100644
index 2b2243f..0000000
--- a/sys/dev/random/siphash.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* <MIT License>
- Copyright (c) 2013 Marek Majkowski <marek@popcount.org>
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- </MIT License>
-
- Original location:
- https://github.com/majek/csiphash/
-
- Solution inspired by code from:
- Samuel Neves (supercop/crypto_auth/siphash24/little)
- djb (supercop/crypto_auth/siphash24/little2)
- Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c)
-*/
-
-#include <dev/random/siphash.h>
-#include <stdint.h>
-
-#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
- __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-# define _le64toh(x) ((uint64_t)(x))
-#elif defined(_WIN32)
-/* Windows is always little endian, unless you're on xbox360
- http://msdn.microsoft.com/en-us/library/b0084kay(v=vs.80).aspx */
-# define _le64toh(x) ((uint64_t)(x))
-#elif defined(__APPLE__)
-# include <libkern/OSByteOrder.h>
-# define _le64toh(x) OSSwapLittleToHostInt64(x)
-#else
-
-/* See: http://sourceforge.net/p/predef/wiki/Endianness/ */
-# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-# include <sys/endian.h>
-# else
-# include <endian.h>
-# endif
-# if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
- __BYTE_ORDER == __LITTLE_ENDIAN
-# define _le64toh(x) ((uint64_t)(x))
-# else
-# define _le64toh(x) le64toh(x)
-# endif
-
-#endif
-
-
-#define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) )
-
-#define HALF_ROUND(a,b,c,d,s,t) \
- a += b; c += d; \
- b = ROTATE(b, s) ^ a; \
- d = ROTATE(d, t) ^ c; \
- a = ROTATE(a, 32);
-
-#define DOUBLE_ROUND(v0,v1,v2,v3) \
- HALF_ROUND(v0,v1,v2,v3,13,16); \
- HALF_ROUND(v2,v1,v0,v3,17,21); \
- HALF_ROUND(v0,v1,v2,v3,13,16); \
- HALF_ROUND(v2,v1,v0,v3,17,21);
-
-
-uint64_t siphash24(const void *src, unsigned long src_sz, const char key[16]) {
- const uint64_t *_key = (uint64_t *)key;
- uint64_t k0 = _le64toh(_key[0]);
- uint64_t k1 = _le64toh(_key[1]);
- uint64_t b = (uint64_t)src_sz << 56;
- const uint64_t *in = (uint64_t*)src;
-
- uint64_t v0 = k0 ^ 0x736f6d6570736575ULL;
- uint64_t v1 = k1 ^ 0x646f72616e646f6dULL;
- uint64_t v2 = k0 ^ 0x6c7967656e657261ULL;
- uint64_t v3 = k1 ^ 0x7465646279746573ULL;
-
- while (src_sz >= 8) {
- uint64_t mi = _le64toh(*in);
- in += 1; src_sz -= 8;
- v3 ^= mi;
- DOUBLE_ROUND(v0,v1,v2,v3);
- v0 ^= mi;
- }
-
- uint64_t t = 0; uint8_t *pt = (uint8_t *)&t; uint8_t *m = (uint8_t *)in;
- switch (src_sz) {
- case 7: pt[6] = m[6];
- case 6: pt[5] = m[5];
- case 5: pt[4] = m[4];
- case 4: *((uint32_t*)&pt[0]) = *((uint32_t*)&m[0]); break;
- case 3: pt[2] = m[2];
- case 2: pt[1] = m[1];
- case 1: pt[0] = m[0];
- }
- b |= _le64toh(t);
-
- v3 ^= b;
- DOUBLE_ROUND(v0,v1,v2,v3);
- v0 ^= b; v2 ^= 0xff;
- DOUBLE_ROUND(v0,v1,v2,v3);
- DOUBLE_ROUND(v0,v1,v2,v3);
- return (v0 ^ v1) ^ (v2 ^ v3);
-}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-16 14:41:12 +0000