From patchwork Wed Mar 25 18:44:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1261597 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=P5ffuNwN; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48ncYS1Mrmz9sQt for ; Thu, 26 Mar 2020 05:47:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F4BA817C3; Wed, 25 Mar 2020 19:46:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1585162011; bh=zwEzgWQkV8ZRzbjIu2Qx/7u/RHSZKPhNar0lL1QgpTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=P5ffuNwNAFtHY3h7NMvWCVXA0xsf0t3S2XUyhUowM8eTqD0OIXJKN1YEWIJL2c1ho kr4q17MoisQ/LDQ2GN5T6qFLMHWAh7qcZL3Y+kUTVtHSxFgm0wCcCTEn9mWLEApqS0 MXtsQeLLn+F0voXzLJrVd4cDrIEGjvkZxmq4qJFPYaSm+nUB0oO3GWmqq8YAP2woCE NFxi6+liVxu4jgY/nqpSG5H8MQbRfzoEUPKVOLZO18yJjR4jPPWUexcgYeXCtp3riX C7Tbprd04SudkY5rcynWd2/otJHjg7XRSsYSWuCDq3ah4X9qdVIlK6rcu1A51f5ww8 6ZfRutUvQaD8w== Received: by phobos.denx.de (Postfix, from userid 109) id CCEA781851; Wed, 25 Mar 2020 19:45:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C58A581869 for ; Wed, 25 Mar 2020 19:45:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marex@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 48ncWC3nG6z1sJHX; Wed, 25 Mar 2020 19:45:27 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 48ncWC3QkFz1qqkZ; Wed, 25 Mar 2020 19:45:27 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id W_yaNkvgthRD; Wed, 25 Mar 2020 19:45:26 +0100 (CET) X-Auth-Info: ERw/KZfHzqfCuVjxPlxLdn9HBO16qqjM0zRh4ty0uPM= Received: from desktop.lan (ip-86-49-35-8.net.upcbroadband.cz [86.49.35.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Wed, 25 Mar 2020 19:45:26 +0100 (CET) From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Eugen Hristev , Joe Hershberger Subject: [PATCH 09/12] net: ks8851: Split non-DM specific bits from common code Date: Wed, 25 Mar 2020 19:44:58 +0100 Message-Id: <20200325184501.200580-9-marex@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200325184501.200580-1-marex@denx.de> References: <20200325184501.200580-1-marex@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean Split network handling functions into non-DM specific parts and common code in preparation for conversion to DM. Signed-off-by: Marek Vasut Cc: Eugen Hristev Cc: Joe Hershberger --- drivers/net/ks8851_mll.c | 60 +++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index a59ce0e81a..d70f0a4dc2 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c @@ -393,10 +393,8 @@ static void ks8851_mll_enable(struct ks_net *ks) ks_enable_qmu(ks); } -static int ks8851_mll_init(struct eth_device *dev, bd_t *bd) +static int ks8851_mll_init_common(struct ks_net *ks) { - struct ks_net *ks = container_of(dev, struct ks_net, dev); - if (ks_read_selftest(ks)) { printf(DRIVERNAME ": Selftest failed\n"); return -1; @@ -435,9 +433,8 @@ static void ks_write_qmu(struct ks_net *ks, u8 *pdata, u16 len) do { } while (ks_rdreg16(ks, KS_TXQCR) & TXQCR_METFE); } -static int ks8851_mll_send(struct eth_device *dev, void *packet, int length) +static int ks8851_mll_send_common(struct ks_net *ks, void *packet, int length) { - struct ks_net *ks = container_of(dev, struct ks_net, dev); u8 *data = (u8 *)packet; u16 tmplen = (u16)length; u16 retv; @@ -456,10 +453,8 @@ static int ks8851_mll_send(struct eth_device *dev, void *packet, int length) return -1; } -static void ks8851_mll_halt(struct eth_device *dev) +static void ks8851_mll_halt_common(struct ks_net *ks) { - struct ks_net *ks = container_of(dev, struct ks_net, dev); - ks8851_mll_reset(ks); } @@ -469,9 +464,8 @@ static void ks8851_mll_halt(struct eth_device *dev) * needs to be enough to prevent a packet being discarded while * we are processing the previous one. */ -static int ks8851_mll_recv(struct eth_device *dev) +static int ks8851_mll_recv_common(struct ks_net *ks, uchar **data) { - struct ks_net *ks = container_of(dev, struct ks_net, dev); u16 status; status = ks_rdreg16(ks, KS_ISR); @@ -479,7 +473,7 @@ static int ks8851_mll_recv(struct eth_device *dev) ks_wrreg16(ks, KS_ISR, status); if (status & IRQ_RXI) - ks_rcv(ks, (uchar **)net_rx_packets); + ks_rcv(ks, data); if (status & IRQ_LDI) { u16 pmecr = ks_rdreg16(ks, KS_PMECR); @@ -491,18 +485,52 @@ static int ks8851_mll_recv(struct eth_device *dev) return 0; } -static int ks8851_mll_write_hwaddr(struct eth_device *dev) +static void ks8851_mll_write_hwaddr_common(struct ks_net *ks, u8 enetaddr[6]) { - struct ks_net *ks = container_of(dev, struct ks_net, dev); u16 addrl, addrm, addrh; - addrh = (ks->dev.enetaddr[0] << 8) | ks->dev.enetaddr[1]; - addrm = (ks->dev.enetaddr[2] << 8) | ks->dev.enetaddr[3]; - addrl = (ks->dev.enetaddr[4] << 8) | ks->dev.enetaddr[5]; + addrh = (enetaddr[0] << 8) | enetaddr[1]; + addrm = (enetaddr[2] << 8) | enetaddr[3]; + addrl = (enetaddr[4] << 8) | enetaddr[5]; ks_wrreg16(ks, KS_MARH, addrh); ks_wrreg16(ks, KS_MARM, addrm); ks_wrreg16(ks, KS_MARL, addrl); +} + +static int ks8851_mll_init(struct eth_device *dev, bd_t *bd) +{ + struct ks_net *ks = container_of(dev, struct ks_net, dev); + + return ks8851_mll_init_common(ks); +} + +static void ks8851_mll_halt(struct eth_device *dev) +{ + struct ks_net *ks = container_of(dev, struct ks_net, dev); + + ks8851_mll_halt_common(ks); +} + +static int ks8851_mll_send(struct eth_device *dev, void *packet, int length) +{ + struct ks_net *ks = container_of(dev, struct ks_net, dev); + + return ks8851_mll_send_common(ks, packet, length); +} + +static int ks8851_mll_recv(struct eth_device *dev) +{ + struct ks_net *ks = container_of(dev, struct ks_net, dev); + + return ks8851_mll_recv_common(ks, (uchar **)net_rx_packets); +} + +static int ks8851_mll_write_hwaddr(struct eth_device *dev) +{ + struct ks_net *ks = container_of(dev, struct ks_net, dev); + + ks8851_mll_write_hwaddr_common(ks, ks->dev.enetaddr); return 0; }