Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sis19x: Add glue mechanism for get_mac_addr_apc.

Browse Source 
The PCI enumeration functions are not implemented in the compat layer,
so we need a glue function that performs the Haiku equivalent here.
This code existed in the old Haiku-native driver, so it's just
copied from there.
This commit is contained in:
Augustin Cavalier 2019-12-23 16:34:45 -05:00
parent 21a5c628fb
commit ca869f7df6
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/add-ons/kernel/drivers/network/sis19x/dev/sge/if_sge.c
View File

@ -254,7 +254,14 @@ sge_get_mac_addr_eeprom(struct sge_softc *sc, uint8_t *dest)
static int
sge_get_mac_addr_apc(struct sge_softc *sc, uint8_t *dest)
{
#if (defined(__amd64__) || defined(__i386__)) && !defined(__HAIKU__)
#if defined(__HAIKU__)
int rgmii = 0;
int res = haiku_sge_get_mac_addr_apc(sc->sge_dev, dest, &rgmii);
if (rgmii != 0)
sc->sge_flags |= SGE_FLAG_RGMII;
return res;
#else
#if defined(__amd64__) || defined(__i386__)
devclass_t pci;
device_t bus, dev = NULL;
device_t *kids;
@ -316,6 +323,7 @@ apc_found:
#else
return (EINVAL);
#endif
#endif
}
static int

54
src/add-ons/kernel/drivers/network/sis19x/glue.c
View File

@ -4,6 +4,8 @@
*/
#include <PCI.h>
#include <sys/bus.h>
#include <sys/rman.h>
#include <sys/systm.h>
@ -13,6 +15,7 @@
#include <net/if.h>
#include <net/if_media.h>
#include <dev/pci/pcivar.h>
#include <dev/sge/if_sgereg.h>
@ -21,6 +24,7 @@ HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
NO_HAIKU_REENABLE_INTERRUPTS();
extern pci_module_info *gPci;
extern driver_t* DRIVER_MODULE_NAME(ukphy, miibus);
@ -56,3 +60,53 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
sc->haiku_interrupt_status = status;
return 1;
}
int
haiku_sge_get_mac_addr_apc(device_t dev, uint8_t* dest, int* rgmii)
{
// SiS96x can use APC CMOS RAM to store MAC address,
// this is accessed through ISA bridge.
// look for PCI-ISA bridge
uint16 ids[] = { 0x0965, 0x0966, 0x0968 };
pci_info pciInfo = {0};
for (long i = 0; B_OK == (*gPci->get_nth_pci_info)(i, &pciInfo); i++) {
if (pciInfo.vendor_id != 0x1039)
continue;
for (size_t idx = 0; idx < B_COUNT_OF(ids); idx++) {
if (pciInfo.device_id == ids[idx]) {
// enable ports 0x78 0x79 to access APC registers
uint32 reg = gPci->read_pci_config(pciInfo.bus,
pciInfo.device, pciInfo.function, 0x48, 1);
reg &= ~0x02;
gPci->write_pci_config(pciInfo.bus,
pciInfo.device, pciInfo.function, 0x48, 1, reg);
snooze(50);
reg = gPci->read_pci_config(pciInfo.bus,
pciInfo.device, pciInfo.function, 0x48, 1);
// read factory MAC address
for (size_t i = 0; i < 6; i++) {
gPci->write_io_8(0x78, 0x09 + i);
dest[i] = gPci->read_io_8(0x79);
}
// check MII/RGMII
gPci->write_io_8(0x78, 0x12);
if ((gPci->read_io_8(0x79) & 0x80) != 0)
*rgmii = 1;
// close access to APC registers
gPci->write_pci_config(pciInfo.bus,
pciInfo.device, pciInfo.function, 0x48, 1, reg);
return B_OK;
}
}
}
return B_ERROR;
}