diff options
Diffstat (limited to 'gpxe/src/drivers/nvs')
-rw-r--r-- | gpxe/src/drivers/nvs/nvs.c | 149 | ||||
-rw-r--r-- | gpxe/src/drivers/nvs/spi.c | 140 | ||||
-rw-r--r-- | gpxe/src/drivers/nvs/threewire.c | 131 |
3 files changed, 0 insertions, 420 deletions
diff --git a/gpxe/src/drivers/nvs/nvs.c b/gpxe/src/drivers/nvs/nvs.c deleted file mode 100644 index 7252808b..00000000 --- a/gpxe/src/drivers/nvs/nvs.c +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (C) 2006 Michael Brown <mbrown@fensystems.co.uk>. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -FILE_LICENCE ( GPL2_OR_LATER ); - -#include <stdint.h> -#include <string.h> -#include <errno.h> -#include <assert.h> -#include <gpxe/nvs.h> - -/** @file - * - * Non-volatile storage - * - */ - -/** - * Read from non-volatile storage device - * - * @v nvs NVS device - * @v address Address from which to read - * @v data Data buffer - * @v len Length of data buffer - * @ret rc Return status code - */ -int nvs_read ( struct nvs_device *nvs, unsigned int address, - void *data, size_t len ) { - size_t frag_len; - int rc; - - /* We don't even attempt to handle buffer lengths that aren't - * an integral number of words. - */ - assert ( ( len & ( ( 1 << nvs->word_len_log2 ) - 1 ) ) == 0 ); - - while ( len ) { - - /* Calculate space remaining up to next block boundary */ - frag_len = ( ( nvs->block_size - - ( address & ( nvs->block_size - 1 ) ) ) - << nvs->word_len_log2 ); - - /* Limit to space remaining in buffer */ - if ( frag_len > len ) - frag_len = len; - - /* Read this portion of the buffer from the device */ - if ( ( rc = nvs->read ( nvs, address, data, frag_len ) ) != 0 ) - return rc; - - /* Update parameters */ - data += frag_len; - address += ( frag_len >> nvs->word_len_log2 ); - len -= frag_len; - } - - return 0; -} - -/** - * Verify content of non-volatile storage device - * - * @v nvs NVS device - * @v address Address from which to read - * @v data Data to compare against - * @v len Length of data buffer - * @ret rc Return status code - */ -static int nvs_verify ( struct nvs_device *nvs, unsigned int address, - const void *data, size_t len ) { - uint8_t read_data[len]; - int rc; - - /* Read data into temporary buffer */ - if ( ( rc = nvs_read ( nvs, address, read_data, len ) ) != 0 ) - return rc; - - /* Compare data */ - if ( memcmp ( data, read_data, len ) != 0 ) { - DBG ( "NVS %p verification failed at %#04x+%zd\n", - nvs, address, len ); - return -EIO; - } - - return 0; -} - -/** - * Write to non-volatile storage device - * - * @v nvs NVS device - * @v address Address to which to write - * @v data Data buffer - * @v len Length of data buffer - * @ret rc Return status code - */ -int nvs_write ( struct nvs_device *nvs, unsigned int address, - const void *data, size_t len ) { - size_t frag_len; - int rc; - - /* We don't even attempt to handle buffer lengths that aren't - * an integral number of words. - */ - assert ( ( len & ( ( 1 << nvs->word_len_log2 ) - 1 ) ) == 0 ); - - while ( len ) { - - /* Calculate space remaining up to next block boundary */ - frag_len = ( ( nvs->block_size - - ( address & ( nvs->block_size - 1 ) ) ) - << nvs->word_len_log2 ); - - /* Limit to space remaining in buffer */ - if ( frag_len > len ) - frag_len = len; - - /* Write this portion of the buffer to the device */ - if ( ( rc = nvs->write ( nvs, address, data, frag_len ) ) != 0) - return rc; - - /* Read back and verify data */ - if ( ( rc = nvs_verify ( nvs, address, data, frag_len ) ) != 0) - return rc; - - /* Update parameters */ - data += frag_len; - address += ( frag_len >> nvs->word_len_log2 ); - len -= frag_len; - } - - return 0; -} diff --git a/gpxe/src/drivers/nvs/spi.c b/gpxe/src/drivers/nvs/spi.c deleted file mode 100644 index 793080a0..00000000 --- a/gpxe/src/drivers/nvs/spi.c +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (C) 2006 Michael Brown <mbrown@fensystems.co.uk>. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -FILE_LICENCE ( GPL2_OR_LATER ); - -#include <stddef.h> -#include <errno.h> -#include <unistd.h> -#include <gpxe/spi.h> - -/** @file - * - * SPI devices - * - */ - -/** - * Munge SPI device address into command - * - * @v command SPI command - * @v address Address - * @v munge_address Device requires address munging - * @ret command Actual SPI command to use - * - * Some devices with 9-bit addresses (e.g. AT25040A EEPROM) use bit 3 - * of the command byte as address bit A8, rather than having a - * two-byte address. This function takes care of generating the - * appropriate command. - */ -static inline unsigned int spi_command ( unsigned int command, - unsigned int address, - int munge_address ) { - return ( command | ( ( ( address >> 8 ) & munge_address ) << 3 ) ); -} - -/** - * Wait for SPI device to complete operation - * - * @v device SPI device - * @ret rc Return status code - */ -static int spi_wait ( struct spi_device *device ) { - struct spi_bus *bus = device->bus; - uint8_t status; - int i; - int rc; - - for ( i = 0 ; i < 50 ; i++ ) { - udelay ( 20 ); - if ( ( rc = bus->rw ( bus, device, SPI_RDSR, -1, NULL, - &status, sizeof ( status ) ) ) != 0 ) - return rc; - if ( ! ( status & SPI_STATUS_NRDY ) ) - return 0; - } - DBG ( "SPI %p timed out\n", device ); - return -ETIMEDOUT; -} - -/** - * Read data from SPI device - * - * @v nvs NVS device - * @v address Address from which to read - * @v data Data buffer - * @v len Length of data buffer - * @ret rc Return status code - */ -int spi_read ( struct nvs_device *nvs, unsigned int address, - void *data, size_t len ) { - struct spi_device *device = nvs_to_spi ( nvs ); - struct spi_bus *bus = device->bus; - unsigned int command = spi_command ( SPI_READ, address, - device->munge_address ); - int rc; - - DBG ( "SPI %p reading %zd bytes from %#04x\n", device, len, address ); - if ( ( rc = bus->rw ( bus, device, command, address, - NULL, data, len ) ) != 0 ) { - DBG ( "SPI %p failed to read data from device\n", device ); - return rc; - } - - return 0; -} - -/** - * Write data to SPI device - * - * @v nvs NVS device - * @v address Address from which to read - * @v data Data buffer - * @v len Length of data buffer - * @ret rc Return status code - */ -int spi_write ( struct nvs_device *nvs, unsigned int address, - const void *data, size_t len ) { - struct spi_device *device = nvs_to_spi ( nvs ); - struct spi_bus *bus = device->bus; - unsigned int command = spi_command ( SPI_WRITE, address, - device->munge_address ); - int rc; - - DBG ( "SPI %p writing %zd bytes to %#04x\n", device, len, address ); - - if ( ( rc = bus->rw ( bus, device, SPI_WREN, -1, - NULL, NULL, 0 ) ) != 0 ) { - DBG ( "SPI %p failed to write-enable device\n", device ); - return rc; - } - - if ( ( rc = bus->rw ( bus, device, command, address, - data, NULL, len ) ) != 0 ) { - DBG ( "SPI %p failed to write data to device\n", device ); - return rc; - } - - if ( ( rc = spi_wait ( device ) ) != 0 ) { - DBG ( "SPI %p failed to complete write operation\n", device ); - return rc; - } - - return 0; -} - diff --git a/gpxe/src/drivers/nvs/threewire.c b/gpxe/src/drivers/nvs/threewire.c deleted file mode 100644 index 8e521389..00000000 --- a/gpxe/src/drivers/nvs/threewire.c +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (C) 2006 Michael Brown <mbrown@fensystems.co.uk>. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -FILE_LICENCE ( GPL2_OR_LATER ); - -#include <stddef.h> -#include <string.h> -#include <assert.h> -#include <unistd.h> -#include <gpxe/threewire.h> - -/** @file - * - * Three-wire serial devices - * - */ - -/** - * Read data from three-wire device - * - * @v nvs NVS device - * @v address Address from which to read - * @v data Data buffer - * @v len Length of data buffer - * @ret rc Return status code - */ -int threewire_read ( struct nvs_device *nvs, unsigned int address, - void *data, size_t len ) { - struct spi_device *device = nvs_to_spi ( nvs ); - struct spi_bus *bus = device->bus; - int rc; - - assert ( bus->mode == SPI_MODE_THREEWIRE ); - - DBGC ( device, "3wire %p reading %zd bytes at %04x\n", - device, len, address ); - - if ( ( rc = bus->rw ( bus, device, THREEWIRE_READ, address, - NULL, data, len ) ) != 0 ) { - DBGC ( device, "3wire %p could not read: %s\n", - device, strerror ( rc ) ); - return rc; - } - - return 0; -} - -/** - * Write data to three-wire device - * - * @v nvs NVS device - * @v address Address from which to read - * @v data Data buffer - * @v len Length of data buffer - * @ret rc Return status code - */ -int threewire_write ( struct nvs_device *nvs, unsigned int address, - const void *data, size_t len ) { - struct spi_device *device = nvs_to_spi ( nvs ); - struct spi_bus *bus = device->bus; - int rc; - - assert ( bus->mode == SPI_MODE_THREEWIRE ); - - DBGC ( device, "3wire %p writing %zd bytes at %04x\n", - device, len, address ); - - /* Enable device for writing */ - if ( ( rc = bus->rw ( bus, device, THREEWIRE_EWEN, - THREEWIRE_EWEN_ADDRESS, NULL, NULL, 0 ) ) != 0 ){ - DBGC ( device, "3wire %p could not enable writing: %s\n", - device, strerror ( rc ) ); - return rc; - } - - /* Write data */ - if ( ( rc = bus->rw ( bus, device, THREEWIRE_WRITE, address, - data, NULL, len ) ) != 0 ) { - DBGC ( device, "3wire %p could not write: %s\n", - device, strerror ( rc ) ); - return rc; - } - - /* Our model of an SPI bus doesn't provide a mechanism for - * "assert CS, wait for MISO to become high, so just wait for - * long enough to ensure that the write has completed. - */ - mdelay ( THREEWIRE_WRITE_MDELAY ); - - return 0; -} - -/** - * Autodetect device address length - * - * @v device SPI device - * @ret rc Return status code - */ -int threewire_detect_address_len ( struct spi_device *device ) { - struct nvs_device *nvs = &device->nvs; - int rc; - - DBGC ( device, "3wire %p autodetecting address length\n", device ); - - device->address_len = SPI_AUTODETECT_ADDRESS_LEN; - if ( ( rc = threewire_read ( nvs, 0, NULL, - ( 1 << nvs->word_len_log2 ) ) ) != 0 ) { - DBGC ( device, "3wire %p could not autodetect address " - "length: %s\n", device, strerror ( rc ) ); - return rc; - } - - DBGC ( device, "3wire %p autodetected address length %d\n", - device, device->address_len ); - return 0; -} |