lsi: small cleanup and add 53C810 variant
v2 cover lsi: small cleanup and add 53C810 variant
Hi,
This small patchset fixes a few issues I encountered while trying to add support for the IBM RS/6000 40p.
Patches 1 to 4 are small cleanups.
Patch 5 may be more controversial, as it adds support for an older (albeit compatible) SCSI adapter, without removing emulation of newer features.
Changes since v1:
- added patch 4 (lsi emulation has been tested on big-endian guest)
- added a comment in patch 5 (remark from Paolo Bonzini)
Hervé Poussineau (5):
lsi: use constant name instead of its value
lsi: check ssid versus sdid only if ssid is valid
lsi: ignore write accesses to CTEST0 registers
lsi: remove todo
lsi: add 53C810 variant
hw/scsi/lsi53c895a.c | 32 +++++++++++++++++++++++++++----- include/hw/pci/pci_ids.h | 1 + 2 files changed, 28 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.10.4
PATCH v2 2/5 lsi: check ssid versus sdid only if ssid is valid
This prevents some (invalid) error messages on console.
--- hw/scsi/lsi53c895a.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/scsi/lsi53c895a.c +2 -1
@@ -1705,8 +1705,9 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) s->sxfer = val;break ;case 0x06 :/* SDID */ -if ((val &0xf ) != (s->ssid &0xf )) +if ((s->ssid &0x80 ) && (val &0xf ) != (s->ssid &0xf )) {BADF ("Destination ID does not match SSID\n" ); + } s->sdid = val &0xf ;break ;case 0x07 :/* GPREG0 */
Signature · 1 line
1.7.10.4
PATCH v2 4/5 lsi: remove todo
In reply to Hervé PoussineauLSI emulation has been tested with Linux on PPC platform.
--- hw/scsi/lsi53c895a.c | 3 --- 1 file changed, 3 deletions(-)
hw/scsi/lsi53c895a.c +0 -3
@@ -7,9 +7,6 @@* This code is licensed under the LGPL. */ -/* ??? Need to check if the {read,write}[wl] routines work properly on -big-endian targets. */ -#include <assert.h> #include "hw/hw.h"
Signature · 1 line
1.7.10.4
PATCH v2 1/5 lsi: use constant name instead of its value
In reply to Hervé Poussineau--- hw/scsi/lsi53c895a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/scsi/lsi53c895a.c +2 -2
@@ -1521,7 +1521,7 @@ static uint8_t lsi_reg_readb(LSIState *s, int offset)used for diagnostics, so should be ok. */ return 0 ;case 0xc :/* DSTAT */ - tmp = s->dstat |0x80 ; + tmp = s->dstat |LSI_DSTAT_DFE ;if ((s->istat0 &LSI_ISTAT0_INTF ) ==0 ) s->dstat =0 ;lsi_update_irq (s);
@@ -2113,7 +2113,7 @@ static int lsi_scsi_init(PCIDevice *dev) "lsi-io", 256);pci_register_bar (dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &s->io_io); -pci_register_bar (dev,1 ,0 , &s->mmio_io); +pci_register_bar (dev,1 ,PCI_BASE_ADDRESS_SPACE_MEMORY , &s->mmio_io);pci_register_bar (dev,2 ,PCI_BASE_ADDRESS_SPACE_MEMORY , &s->ram_io);QTAILQ_INIT (&s->queue);
Signature · 1 line
1.7.10.4
PATCH v2 3/5 lsi: ignore write accesses to CTEST0 registers
In reply to Hervé Poussineau53C895A datasheet says that this register is read/write, and that the value returned on read access is dependant of DMA FIFO state. However, nothing is said for written value.
53C810A datasheet gives more insight about this register:
"This was a general purpose read/write register in previous SYM53C8XX family chips. Although it is still a read/write register, Symbios reserves the right to use these bits for future 53C8XX family enhancements."
This prevents going to the default case, which prints an error message.
--- hw/scsi/lsi53c895a.c | 3 +++ 1 file changed, 3 insertions(+)
hw/scsi/lsi53c895a.c +3 -0
@@ -1749,6 +1749,9 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val)case 0x17 :/* MBOX1 */ s->mbox1 = val;break ; +case 0x18 :/* CTEST0 */ +/* nothing to do */ +break ;case 0x1a :/* CTEST2 */ s->ctest2 = val &LSI_CTEST2_PCICIE ;break ;
Signature · 1 line
1.7.10.4
PATCH v2 5/5 lsi: add 53C810 variant
In reply to Hervé PoussineauCurrently, treat it exactly as a 53C895A.
53C895A is a 53C810 with more capabilities, so this should work.
However, this lets us test different code paths on Linux, which don't use lastest features if it detect a 810, or on some OSes which only support 810 and not 895A (like very old Windows NT versions).
--- hw/scsi/lsi53c895a.c | 21 +++++++++++++++++++++ include/hw/pci/pci_ids.h | 1 + 2 files changed, 22 insertions(+)
hw/scsi/lsi53c895a.c +21 -0
@@ -7,6 +7,12 @@* This code is licensed under the LGPL. */ +/* Note: +* LSI53C810 emulation is incorrect, in the sense that it supports +* features added in later evolutions. This should not be a problem, +* as well-behaved operating systems will not try to use them. +*/ +#include <assert.h> #include "hw/hw.h"
@@ -275,6 +281,7 @@ typedef struct {uint32_t script_ram[2048 ]; } LSIState; +#define TYPE_LSI53C810 "lsi53c810"#define TYPE_LSI53C895A "lsi53c895a"#define LSI53C895A (obj) \
@@ -2152,9 +2159,23 @@ static const TypeInfo lsi_info = { .class_init = lsi_class_init, }; +static void lsi53c810_class_init (ObjectClass *klass,void *data) +{ +PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); + + k->device_id =PCI_DEVICE_ID_LSI_53C810 ; +} + +static TypeInfo lsi53c810_info = { + .name =TYPE_LSI53C810 , + .parent =TYPE_LSI53C895A , + .class_init = lsi53c810_class_init, +}; +static void lsi53c895a_register_types (void ) {type_register_static (&lsi_info); +type_register_static (&lsi53c810_info); }type_init (lsi53c895a_register_types)
include/hw/pci/pci_ids.h +1 -0
@@ -53,6 +53,7 @@/* Vendors and devices. Sort key: vendor first, device next. */ #define PCI_VENDOR_ID_LSI_LOGIC 0x1000 +#define PCI_DEVICE_ID_LSI_53C810 0x0001#define PCI_DEVICE_ID_LSI_53C895A 0x0012#define PCI_DEVICE_ID_LSI_SAS1078 0x0060
Signature · 1 line
1.7.10.4
Paolo Bonzini
AppliedIl 14/09/2013 17:51, Hervé Poussineau ha scritto:
Quoted 21 lines
Hi,
This small patchset fixes a few issues I encountered while trying to add support for the IBM RS/6000 40p.
Patches 1 to 4 are small cleanups.
Patch 5 may be more controversial, as it adds support for an older (albeit compatible) SCSI adapter, without removing emulation of newer features.Changes since v1:
- added patch 4 (lsi emulation has been tested on big-endian guest)
- added a comment in patch 5 (remark from Paolo Bonzini)Hervé Poussineau (5):
lsi: use constant name instead of its value
lsi: check ssid versus sdid only if ssid is valid
lsi: ignore write accesses to CTEST0 registers
lsi: remove todo
lsi: add 53C810 variant
Quoted 4 lines
hw/scsi/lsi53c895a.c | 32 +++++++++++++++++++++++++++----- include/hw/pci/pci_ids.h | 1 + 2 files changed, 28 insertions(+), 5 deletions(-)
Applied to scsi-next, thanks.
Paolo