From patchwork Tue Mar 16 08:12:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1453754 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=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=gmtgmAEx; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F05rW0qghz9sSC for ; Tue, 16 Mar 2021 19:22:51 +1100 (AEDT) Received: from localhost ([::1]:48474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM4yX-0001bC-4K for incoming@patchwork.ozlabs.org; Tue, 16 Mar 2021 04:22:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM4pu-0002xh-CF for qemu-devel@nongnu.org; Tue, 16 Mar 2021 04:13:54 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:36841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM4ps-00085d-Lw for qemu-devel@nongnu.org; Tue, 16 Mar 2021 04:13:54 -0400 Received: by mail-ed1-x52b.google.com with SMTP id o19so20409055edc.3 for ; Tue, 16 Mar 2021 01:13:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UoAb4yJF98pSKNLLX7tPArXkVMkWUA3vT/8Fn5PTXcw=; b=gmtgmAExrFOcZ6wisy/vEJQ+O3MTY9AziZNAlRkjJl1JahauzHBqbtFpvG3+tCHoI4 3jhx/Y+ZsXEA/BA4EsocbJA/0ajJBiG/vJr30ndaXpoRuwOWLE+gCCNN9LdFz5YRLm9/ YQFKBuTOK5dnZjwJfRpVPl5urcK+kf9mAbRIsqdm2B9eAYibp076ZK7BHzfkQkav8DXV HvxUQAPAPtCntYK+1dPJccSg+92Ld033k8FRkkxhiYTNTCJTTutP+UBoHlphtyqfvn3C Fju5UkCCLLccuC6c3o4bDpV5gp4nqfWr2fB7ZmgYe4WK7SM2Gky4mlCMBQT388qjzmaD 0iHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UoAb4yJF98pSKNLLX7tPArXkVMkWUA3vT/8Fn5PTXcw=; b=jqi7DGUuhJBOl6dW6rY/7Gu0zHiA0qyDxrVJRLcvyJo4RTNGYcL2VkAE6HS3c9HsOk fs2zTYlB4884rx9jjU2xx91Ak467Zhf9MYHDKcFar+3tc18oN4HrKbTe1fFr9NBokYa3 ghZdrvg+lZ/ic+9oBVtW6EXTo/v408vCVOHxqnWBFLIVuX4/Zk2q8pqpjj5dBQuYQGE1 A73GOw/hEnsCiWnGDwNxnWXZ0Ay3fznbZTjIMli396g/cZf7960h8vcO1HAl8hVLyGRv YLTzvdbCJt4jNDRDplToKxeogVlzXxqX+WbNPpARmARpGYdVwtTyqW6/QfOxjOUC4lJ6 5xBg== X-Gm-Message-State: AOAM533fBGjJQQURI7MAtFIBKDpJXY+wtuWNbujI1C77yUSJA2fL9rCc 6cwKY0Yx70B14Ne9qKKiuo0= X-Google-Smtp-Source: ABdhPJyEa4o1k9l4WBFCteLxmZNaZPiemAbj/rR6OKGeJP92A4EkKYAwRC2NFCDVX2Y1CufeoBsvIg== X-Received: by 2002:aa7:cf02:: with SMTP id a2mr34192323edy.59.1615882431443; Tue, 16 Mar 2021 01:13:51 -0700 (PDT) Received: from pek-vx-bsp9.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id a17sm5620333ejf.20.2021.03.16.01.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 01:13:51 -0700 (PDT) From: Bin Meng To: Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 13/13] hw/net: sunhme: Remove the logic of padding short frames in the receive path Date: Tue, 16 Mar 2021 16:12:54 +0800 Message-Id: <20210316081254.72684-14-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210316081254.72684-1-bmeng.cn@gmail.com> References: <20210316081254.72684-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=bmeng.cn@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Now that we have implemented unified short frames padding in the QEMU networking codes, remove the same logic in the NIC codes. Signed-off-by: Bin Meng --- (no changes since v1) hw/net/sunhme.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c index fc34905f87..6971796e57 100644 --- a/hw/net/sunhme.c +++ b/hw/net/sunhme.c @@ -714,8 +714,6 @@ static inline void sunhme_set_rx_ring_nr(SunHMEState *s, int i) s->erxregs[HME_ERXI_RING >> 2] = ring; } -#define MIN_BUF_SIZE 60 - static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf, size_t size) { @@ -724,7 +722,6 @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf, dma_addr_t rb, addr; uint32_t intstatus, status, buffer, buffersize, sum; uint16_t csum; - uint8_t buf1[60]; int nr, cr, len, rxoffset, csum_offset; trace_sunhme_rx_incoming(size); @@ -775,14 +772,6 @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf, trace_sunhme_rx_filter_accept(); - /* If too small buffer, then expand it */ - if (size < MIN_BUF_SIZE) { - memcpy(buf1, buf, size); - memset(buf1 + size, 0, MIN_BUF_SIZE - size); - buf = buf1; - size = MIN_BUF_SIZE; - } - rb = s->erxregs[HME_ERXI_RING >> 2] & HME_ERXI_RING_ADDR; nr = sunhme_get_rx_ring_count(s); cr = sunhme_get_rx_ring_nr(s);