Let me add my 2 cents as main author of that code:
Michael Schmitz wrote:
> Am 08.06.2018 um 02:36 schrieb Geert Uytterhoeven:
>> So I was wondering: why is this file included, as XSURF100 selects
>> AX88796,
>> while ax88796.c includes lib8390.c anyway?
>>
>> Apparently lib8390.c is included for register definitions (provided by
>> 8390.h, and can easily be fixed), and for the __NS8390_init()
>> implementation, called below.
>
> Mostly the latter.
>
>>
>>> +static void xs100_block_output(struct net_device *dev, int count,
>>> + const unsigned char *buf, const int
>>> start_page)
>>> +{
>>
>> [...]
>>
>>> + while ((ei_inb(nic_base + EN0_ISR) & ENISR_RDC) == 0) {
>>> + if (jiffies - dma_start > 2 * HZ / 100) { /* 20ms
>>> */
>>> + netdev_warn(dev, "timeout waiting for Tx
>>> RDC.\n");
>>> + ei_local->reset_8390(dev);
>>> + ax_NS8390_init(dev, 1);
>>> + break;
>>> + }
>>> + }
>>> +
>>> + ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
>>> + ei_local->dmaing &= ~0x01;
>>> +}
actually, the the block_input / block_output functions were the reason I
included the lib8390.c file. Except for xs100_write / xs100_read, they are
a verbatim copy from ax88796.c I'm not that enthusiastic about that idea
anymore, but did not get around to improve it. I added a customization
point to ax88796 for a custom block_input / block_output, because the 8390
core already provides that customization point. What I really need is a
customization point just for the 8390-remote-DMA-via-MMIO functions (i.e.
xs100_write, xs100_read) instead of the whole block transfer core that
also sets up the remote DMA engine and tries to re-initialize the card in
case of unexplained problems.
This should get rid of
- xs100_block_output
- xs100_block_input (which has the calls to ax_reset_8390 and
ax_NS8390_init)
- ax_reset_8390
- and thus the include of lib8390.c (which should be included only by
ax88796.c, not by xsurf100.c)
Regards,
Michael Karcher
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
